wip #6720 @1.5

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0b2de99b05b6ce2be247c7edc93c057fe014b0ba..debf204a29f05c7edb483678e62344a8e5be192f 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e5700431-afd3-4ff1-ac7a-d36eb3434c35" name="Changes" comment="wait #6145">
+    <list default="true" id="e5700431-afd3-4ff1-ac7a-d36eb3434c35" name="Changes" comment="wait #6298">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/backup" beforeDir="false" afterPath="$PROJECT_DIR$/backup" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/updateall.bat" beforeDir="false" afterPath="$PROJECT_DIR$/updateall.bat" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -33,22 +35,24 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Works/office-backup&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_ADD_EXTERNAL_FILES": "true",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "true",
+    "git-widget-placeholder": "master",
+    "ignore.virus.scanning.warn.message": "true",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "D:/Works/server-backup/updateall.bat",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\Works\server-backup\ssh" />
@@ -83,6 +87,21 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="Update all" type="ShConfigurationType">
+      <option name="SCRIPT_TEXT" value="" />
+      <option name="INDEPENDENT_SCRIPT_PATH" value="false" />
+      <option name="SCRIPT_PATH" value="$PROJECT_DIR$/updateall.bat" />
+      <option name="SCRIPT_OPTIONS" value="" />
+      <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+      <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="INDEPENDENT_INTERPRETER_PATH" value="false" />
+      <option name="INTERPRETER_PATH" value="C:/Windows/System32/WindowsPowerShell/v1.0/powershell.exe" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="EXECUTE_IN_TERMINAL" value="true" />
+      <option name="EXECUTE_SCRIPT_FILE" value="true" />
+      <envs />
+      <method v="2" />
+    </configuration>
     <configuration default="true" type="TestNG">
       <option name="TEST_OBJECT" value="CLASS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -116,7 +135,8 @@
       <workItem from="1694596064618" duration="700000" />
       <workItem from="1694617304805" duration="1448000" />
       <workItem from="1695043238081" duration="597000" />
-      <workItem from="1695636960618" duration="1181000" />
+      <workItem from="1695636960618" duration="2376000" />
+      <workItem from="1707744137595" duration="1406000" />
     </task>
     <task id="LOCAL-00001" summary="wip #6145 @2">
       <option name="closed" value="true" />
@@ -310,7 +330,15 @@
       <option name="project" value="LOCAL" />
       <updated>1695637535600</updated>
     </task>
-    <option name="localTasksCounter" value="25" />
+    <task id="LOCAL-00025" summary="wait #6298">
+      <option name="closed" value="true" />
+      <created>1695645157271</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1695645157271</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -329,6 +357,7 @@
     <MESSAGE value="wip #6145" />
     <MESSAGE value="wait #6145 @0.5" />
     <MESSAGE value="wait #6145" />
-    <option name="LAST_COMMIT_MESSAGE" value="wait #6145" />
+    <MESSAGE value="wait #6298" />
+    <option name="LAST_COMMIT_MESSAGE" value="wait #6298" />
   </component>
 </project>
\ No newline at end of file

diff --git a/backup b/backup
index 01e73af4ac749d7c9b98c68f94f7f716a218a2ba..203f29031d11234fea11a339cb3515e8f3d46f9a 100755 (executable)
--- a/backup
+++ b/backup
@@ -7,4 +7,4 @@ fi
 gzip /var/log/*.log
 name=`cat /etc/backup-hostname`
 d=$(date +%Y%m%d%H%i)
-/usr/bin/rsync -av --links --no-whole-file --exclude-from='/etc/backup.exclude' -e 'ssh -oStrictHostKeyChecking=no' /data/ "root@dobermann.cubedesigners.com:/home/serversbackup/$name/" > "/var/log/backup.$d.log" 2>&1
+/usr/bin/rsync -av --links --delete --max-delete=2000 --no-whole-file --delete-excluded --exclude-from='/etc/backup.exclude' -e 'ssh -oStrictHostKeyChecking=no' /data/ "root@dobermann.cubedesigners.com:/home/serversbackup/$name/" > "/var/log/backup.$d.log" 2>&1

diff --git a/updateall.bat b/updateall.bat
index 02ab0dcc6114623c275d931085095b15d0822775..69ed36070d209189046405e5a4b406036a3eb9c8 100644 (file)
--- a/updateall.bat
+++ b/updateall.bat
@@ -1,6 +1,5 @@
 ssh root@alphaville.cubedesigners.com "/docker/server-backup/update"
 ssh root@brazil.cubedesigners.com "/docker/server-backup/update"
-ssh root@clockwork.cubedesigners.com "/docker/server-backup/update"
 ssh root@dracula.cubedesigners.com "/docker/server-backup/update"
 ssh root@192.168.10.5 -p 22822 "/docker/server-backup/update"
 ssh root@fastandfurious.cubedesigners.com -p 22822 "/docker/server-backup/update"
@@ -8,6 +7,4 @@ ssh root@godzilla.cubedesigners.com "/docker/server-backup/update"
 ssh root@her2.cubedesigners.com "/docker/server-backup/update"
 ssh root@192.168.10.16 "/docker/server-backup/update"
 ssh root@192.168.10.167 "/docker/server-backup/update"
-ssh root@kingkong.cubedesigners.com "/docker/server-backup/update"
-ssh root@matrix.cubedesigners.com "/docker/server-backup/update"
-ssh root@nakedgun.cubedesigners.com "/docker/server-backup/update"
\ No newline at end of file
+ssh root@kingkong.cubedesigners.com "/docker/server-backup/update"
\ No newline at end of file