]> _ Git - server-backup.git/commitdiff
.
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 3 Dec 2025 14:37:54 +0000 (15:37 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 3 Dec 2025 14:37:54 +0000 (15:37 +0100)
.idea/workspace.xml
backup
update

index f9bd951a37a7180b5c3cb11f1cfcf810c583f682..9d498fadcb801a5c37124f465c97c647529925f7 100644 (file)
@@ -6,6 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="e5700431-afd3-4ff1-ac7a-d36eb3434c35" name="Changes" comment=".">
       <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$/update" beforeDir="false" afterPath="$PROJECT_DIR$/update" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ASKED_ADD_EXTERNAL_FILES": "true",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "Shell Script.Update all.executor": "Run",
-    "WebServerToolWindowFactoryState": "true",
-    "git-widget-placeholder": "master",
-    "ignore.virus.scanning.warn.message": "true",
-    "junie.onboarding.icon.badge.shown": "true",
-    "kotlin-language-version-configured": "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;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;SHELLCHECK.PATH&quot;: &quot;C:\\Users\\vince\\AppData\\Roaming\\JetBrains\\IntelliJIdea2025.2\\plugins\\Shell Script\\shellcheck.exe&quot;,
+    &quot;Shell Script.Update all.executor&quot;: &quot;Run&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;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
+    &quot;kotlin-language-version-configured&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" />
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-fbdcb00ec9e3-intellij.indexing.shared.core-IU-251.25410.129" />
-        <option value="bundled-js-predefined-d6986cc7102b-6a121458b545-JavaScript-IU-251.25410.129" />
+        <option value="bundled-jdk-9823dce3aa75-bf35d07a577b-intellij.indexing.shared.core-IU-252.28238.7" />
+        <option value="bundled-js-predefined-d6986cc7102b-a71380e98a7c-JavaScript-IU-252.28238.7" />
       </set>
     </attachedChunks>
   </component>
       <workItem from="1741084102775" duration="534000" />
       <workItem from="1741193242135" duration="125000" />
       <workItem from="1747816110176" duration="3663000" />
-      <workItem from="1749038811728" duration="1932000" />
+      <workItem from="1749038811728" duration="2341000" />
+      <workItem from="1758034098381" duration="686000" />
+      <workItem from="1764770735739" duration="844000" />
     </task>
     <task id="LOCAL-00001" summary="wip #6145 @2">
       <option name="closed" value="true" />
       <option name="project" value="LOCAL" />
       <updated>1749039440527</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary=".">
+      <option name="closed" value="true" />
+      <created>1749045364212</created>
+      <option name="number" value="00042" />
+      <option name="presentableId" value="LOCAL-00042" />
+      <option name="project" value="LOCAL" />
+      <updated>1749045364212</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/backup b/backup
index ff8b4e635804d3cd0f8c8e681e89d5925be8cd56..3829d8102ef9659b117592e59f154e79da7466c8 100755 (executable)
--- a/backup
+++ b/backup
@@ -8,7 +8,9 @@ gzip /var/log/*.log
 name=`cat /etc/backup-hostname`
 d=$(date +%Y%m%d%H%i)
 defaultStorage=root@dobermann.cubedesigners.com:/home/serversbackup/
+defaultPort=22
 s="${STORAGE:=$defaultStorage}"
+port="${PORT:=$defaultPort}"
 dest="$s$name/"
 echo $dest
-/usr/bin/rsync -av --links --delete --max-delete=1 --no-whole-file --delete-excluded --exclude-from='/etc/backup.exclude' -e 'ssh -oStrictHostKeyChecking=no' /data/ "$dest" > "/var/log/backup.$d.log" 2>&1
\ No newline at end of file
+/usr/bin/rsync -av --links --delete --max-delete=1 --no-whole-file --delete-excluded --exclude-from='/etc/backup.exclude' -e 'ssh -p $port -oStrictHostKeyChecking=no' /data/ "$dest" > "/var/log/backup.$d.log" 2>&1
\ No newline at end of file
diff --git a/update b/update
index 3cbd2584ba6cccb0fb0c0f2ecaee639a5e98e501..d9b2dcd9d2711043f0a2bf4f69e79c46ca101b5a 100755 (executable)
--- a/update
+++ b/update
@@ -2,7 +2,7 @@
 cd /docker/server-backup
 if [ ! -f ./env ]
 then
-    printf "CRON_TASK_1=\"0 */6 * * * /usr/local/bin/backup\"\nSTORAGE=root@dobermann.cubedesigners.com:/home/serversbackup/" > ./env
+    printf "CRON_TASK_1=\"0 */6 * * * /usr/local/bin/backup\"\nPORT=22\nSTORAGE=root@dobermann.cubedesigners.com:/home/serversbackup/" > ./env
 fi
 git config --global --add safe.directory /docker/server-backup
 git fetch --all