wip #6145 @0.25

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3b83c903c55057820eadd02891f29687d2740898..f60c2283980510ea3a0efa456ada7dbd16e44f66 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,6 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e5700431-afd3-4ff1-ac7a-d36eb3434c35" name="Changes" comment="wip #6145">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/backup" beforeDir="false" afterPath="$PROJECT_DIR$/backup" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -27,21 +29,21 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "true",
-    "git-widget-placeholder": "master",
-    "ignore.virus.scanning.warn.message": "true",
-    "last_opened_file_path": "D:/Works/server-backup",
-    "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 name="PropertiesComponent">{
+  &quot;keyToString&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/server-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>
+}</component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\Works\server-backup\ssh" />
@@ -99,7 +101,8 @@
       <option name="presentableId" value="Default" />
       <updated>1689791641269</updated>
       <workItem from="1689791642478" duration="2059000" />
-      <workItem from="1689794000136" duration="1850000" />
+      <workItem from="1689794000136" duration="2007000" />
+      <workItem from="1689877892154" duration="189000" />
     </task>
     <task id="LOCAL-00001" summary="wip #6145 @2">
       <option name="closed" value="true" />
@@ -173,7 +176,15 @@
       <option name="project" value="LOCAL" />
       <updated>1689795764012</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="wip #6145">
+      <option name="closed" value="true" />
+      <created>1689796020896</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1689796020897</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/README.md b/README.md
index 8aa846ea4257a889e1bbfe25fe5aa6d0c2dbc45d..0e0e87b0cfd2f934787792c61f4a243c5e9dd070 100644 (file)
--- a/README.md
+++ b/README.md
@@ -6,4 +6,4 @@ Fill correctly `/etc/hostname`, the name will be used as the destination folder
 
 If docker is not installed : `wget https://get.docker.com -O get-docker.sh && sh get-docker.sh`
 
-`apt install -y git docker-composer-plugin;mkdir -p /docker/server-backup;cd /docker/server-backup;git clone git://git.cubedesigners.com/server-backup.git .;chmod 755 update;./update`
\ No newline at end of file
+`apt install -y git;mkdir -p /docker/server-backup;cd /docker/server-backup;git clone git://git.cubedesigners.com/server-backup.git .;chmod 755 update;./update`
\ No newline at end of file

diff --git a/backup b/backup
index 6958d2a1be85e65e25be02dfede7598ed5101fba..8f26f064408f65412d674f0a80537f1902b6b5b5 100755 (executable)
--- a/backup
+++ b/backup
@@ -1,4 +1,4 @@
 #!/bin/sh
 killall -9 /usr/bin/rsync
 name=`cat /etc/backup-hostname`
-/usr/bin/rsync -av --links --no-whole-file --exclude-from='/etc/backup.exclude' -e 'ssh -oStrictHostKeyChecking=no' /data/ "serversbackup@dobermann.cubedesigners.com:/home/serversbackup/$name/" 2> /proc/self/fd/2 1> /proc/self/fd/1
+/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/" 2> /proc/self/fd/2 1> /proc/self/fd/1