diff --git a/WAPT/control b/WAPT/control index 79c52de..85e5094 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,5 +1,5 @@ package : fws-backuppc-agent -version : 1.3.4-20 +version : 1.3.4-21 architecture : all section : base priority : optional diff --git a/WAPT/wapt.psproj b/WAPT/wapt.psproj index 29acc4b..394be80 100644 --- a/WAPT/wapt.psproj +++ b/WAPT/wapt.psproj @@ -1,5 +1,5 @@ [PyScripter] -Version=3.3.2.0 +Version=3.4.2.0 [Project] ClassName=TProjectRootNode @@ -23,11 +23,11 @@ FileName=C:\Program Files (x86)\wapt\setuphelpers.py [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2] ClassName=TProjectFileNode -FileName=C:\Program Files (x86)\wapt\wapt-get.ini +FileName=C:\Program Files (x86)\wapt\wapt-get.py [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3] ClassName=TProjectFileNode -FileName=C:\Program Files (x86)\wapt\wapt-get.py +FileName=C:\Program Files (x86)\wapt\wapt-get.ini [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4] ClassName=TProjectFileNode @@ -46,10 +46,14 @@ FileName=$[Project-Path]control [Project\ChildNodes\Node0\ChildNodes\Node3] ClassName=TProjectFileNode +FileName=C:\waptdev\wapt-backuppc-agent\deploy_keys.bat.j2 + +[Project\ChildNodes\Node0\ChildNodes\Node4] +ClassName=TProjectFileNode FileName=$[Project-Path]..\setup.py [Project\ChildNodes\Node0\ChildNodes] -Count=4 +Count=5 [Project\ChildNodes\Node1] ClassName=TProjectRunConfiguationsNode @@ -74,8 +78,6 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node1] ClassName=TProjectRunConfiguationNode @@ -97,8 +99,6 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node2] ClassName=TProjectRunConfiguationNode @@ -120,8 +120,6 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node3] ClassName=TProjectRunConfiguationNode @@ -143,8 +141,6 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node4] ClassName=TProjectRunConfiguationNode @@ -166,8 +162,6 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node5] ClassName=TProjectRunConfiguationNode @@ -189,8 +183,6 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node6] ClassName=TProjectRunConfiguationNode @@ -212,8 +204,6 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node7] ClassName=TProjectRunConfiguationNode @@ -235,8 +225,6 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[Project-Path].. -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node8] ClassName=TProjectRunConfiguationNode @@ -258,8 +246,6 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node9] ClassName=TProjectRunConfiguationNode @@ -281,8 +267,6 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes] Count=10 diff --git a/deploy_keys.bat.j2 b/deploy_keys.bat.j2 index 03bafaa..b407458 100644 --- a/deploy_keys.bat.j2 +++ b/deploy_keys.bat.j2 @@ -4,4 +4,9 @@ IF NOT EXIST "%USERPROFILE%\.ssh" mkdir "%USERPROFILE%\.ssh" IF EXIST "%USERPROFILE%\.ssh\authorized_keys" del /q "%USERPROFILE%\.ssh\authorized_keys" {% for key in ssh_keys %} echo {{ key }} >> "%USERPROFILE%\.ssh\authorized_keys" -{% endfor %} \ No newline at end of file +{% endfor %} +{% if ssh_keys | length > 0 %} +icacls.exe "%USERPROFILE%\.ssh\authorized_keys" /grant:r lbkp:F +icacls.exe "%USERPROFILE%\.ssh\authorized_keys" /grant:r SYSTEM:F +icacls.exe "%USERPROFILE%\.ssh\authorized_keys" /inheritance:r +{% endif %} \ No newline at end of file