From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 21 Jul 2023 08:00:51 +0000 (+0200)
Subject: wip #6145
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1e4fd6d00ec94f74b0a9da53c702e51e571a844e;p=server-backup.git

wip #6145
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 65beff2..6282cea 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +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.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" />
+    <list default="true" id="e5700431-afd3-4ff1-ac7a-d36eb3434c35" name="Changes" comment="wip #6145">
+      <change beforePath="$PROJECT_DIR$/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker-compose.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/update" beforeDir="false" afterPath="$PROJECT_DIR$/update" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -24,6 +24,9 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 8.2" />
   <component name="ProjectId" id="2SnoKOOy1tHgkeJ6POfvUHIc1OI" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -101,7 +104,7 @@
       <updated>1689791641269</updated>
       <workItem from="1689791642478" duration="2059000" />
       <workItem from="1689794000136" duration="2007000" />
-      <workItem from="1689877892154" duration="1524000" />
+      <workItem from="1689877892154" duration="2096000" />
     </task>
     <task id="LOCAL-00001" summary="wip #6145 @2">
       <option name="closed" value="true" />
@@ -199,7 +202,15 @@
       <option name="project" value="LOCAL" />
       <updated>1689925613247</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="wip #6145">
+      <option name="closed" value="true" />
+      <created>1689925801563</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1689925801563</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -209,9 +220,9 @@
     <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" />
     <MESSAGE value="wip #6145 @0.25" />
     <MESSAGE value="wip #6145 @0.5" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #6145 @0.5" />
+    <MESSAGE value="wip #6145" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #6145" />
   </component>
 </project>
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index ef6779c..74e958d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - './ssh/id_rsa.pub:/root/.ssh/id_rsa.pub:ro'
     restart: unless-stopped
     build: .
+    env_file: env
     environment:
-      - CRON_TASK_1="0 */6 * * * /usr/local/bin/backup"
       - TZ=Europe/Paris
     command: client
diff --git a/update b/update
index 6942793..e937695 100755
--- a/update
+++ b/update
@@ -1,5 +1,9 @@
 #!/bin/bash
 cd /docker/server-backup
+if [ ! -f ./env ]
+then
+    echo 'CRON_TASK_1="0 */6 * * * /usr/local/bin/backup"' > ./env
+fi
 git config --global --add safe.directory /docker/server-backup
 git fetch --all
 git reset --hard origin/master
@@ -9,4 +13,4 @@ chmod 755 ./ssh
 chmod 600 ./ssh/id_rsa
 DOCKER_BUILDKIT=1 docker compose build
 docker compose down
-docker compose up -d
\ No newline at end of file
+docker compose up -d