wip #6145 @0.5

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f60c2283980510ea3a0efa456ada7dbd16e44f66..ad7c996a2df7d1c02a5b9451fb3bb041f188b858 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e5700431-afd3-4ff1-ac7a-d36eb3434c35" name="Changes" comment="wip #6145">
+    <list default="true" id="e5700431-afd3-4ff1-ac7a-d36eb3434c35" name="Changes" comment="wip #6145 @0.25">
       <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" />
+      <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 +102,7 @@
       <updated>1689791641269</updated>
       <workItem from="1689791642478" duration="2059000" />
       <workItem from="1689794000136" duration="2007000" />
-      <workItem from="1689877892154" duration="189000" />
+      <workItem from="1689877892154" duration="1414000" />
     </task>
     <task id="LOCAL-00001" summary="wip #6145 @2">
       <option name="closed" value="true" />
@@ -184,7 +184,15 @@
       <option name="project" value="LOCAL" />
       <updated>1689796020897</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="wip #6145 @0.25">
+      <option name="closed" value="true" />
+      <created>1689878153542</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1689878153542</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -194,8 +202,8 @@
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
     <MESSAGE value="wip #6145 @2" />
-    <MESSAGE value="wip #6145 @0.25" />
     <MESSAGE value="wip #6145" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #6145" />
+    <MESSAGE value="wip #6145 @0.25" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #6145 @0.25" />
   </component>
 </project>
\ No newline at end of file

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

diff --git a/docker-compose.yml b/docker-compose.yml
index d19bcdecba8fbe3aa74bb6e4af00dbcba087f364..ef6779c976e37ea27fd96af8b90d289949ac6365 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       - '/etc/hostname:/etc/backup-hostname'
       - './exclude:/etc/backup.exclude'
       - './backup:/usr/local/bin/backup'
+      - './log/:/var/log/'
       - './ssh/id_rsa:/home/user/.ssh/id_rsa:ro'
       - './ssh/id_rsa.pub:/home/user/.ssh/id_rsa.pub:ro'
       - './ssh/id_rsa:/root/.ssh/id_rsa:ro'
@@ -15,4 +16,5 @@ services:
     build: .
     environment:
       - CRON_TASK_1="0 */6 * * * /usr/local/bin/backup"
+      - TZ=Europe/Paris
     command: client