wip #6145

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ad7c996a2df7d1c02a5b9451fb3bb041f188b858..65beff2fb36e412e0bc6004053285361c9604455 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e5700431-afd3-4ff1-ac7a-d36eb3434c35" name="Changes" comment="wip #6145 @0.25">
+    <list default="true" id="e5700431-afd3-4ff1-ac7a-d36eb3434c35" name="Changes" comment="wip #6145 @0.5">
       <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$/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker-compose.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -102,7 +101,7 @@
       <updated>1689791641269</updated>
       <workItem from="1689791642478" duration="2059000" />
       <workItem from="1689794000136" duration="2007000" />
-      <workItem from="1689877892154" duration="1414000" />
+      <workItem from="1689877892154" duration="1524000" />
     </task>
     <task id="LOCAL-00001" summary="wip #6145 @2">
       <option name="closed" value="true" />
@@ -192,7 +191,15 @@
       <option name="project" value="LOCAL" />
       <updated>1689878153542</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="wip #6145 @0.5">
+      <option name="closed" value="true" />
+      <created>1689925613247</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1689925613247</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -204,6 +211,7 @@
     <MESSAGE value="wip #6145 @2" />
     <MESSAGE value="wip #6145" />
     <MESSAGE value="wip #6145 @0.25" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #6145 @0.25" />
+    <MESSAGE value="wip #6145 @0.5" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #6145 @0.5" />
   </component>
 </project>
\ No newline at end of file

diff --git a/backup b/backup
index 8b1bb9d4a8e8805613f6b6aa2e0c46891954e586..2c5d1037b6b31b0bbb1eddc2e780164f508a5ef3 100755 (executable)
--- a/backup
+++ b/backup
@@ -2,5 +2,5 @@
 killall -9 /usr/bin/rsync
 gzip /var/log/*.log
 name=`cat /etc/backup-hostname`
-d=$(date +%Y-%m-%d)
+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