From: Vincent Vanwaelscappel Date: Thu, 20 Jul 2023 18:35:50 +0000 (+0200) Subject: wip #6145 @0.25 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e748c3430331337e1623f7d026e9322c6865e9da;p=server-backup.git wip #6145 @0.25 --- diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3b83c90..f60c228 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,6 +5,8 @@ + + - { + "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" } -}]]> +} @@ -99,7 +101,8 @@ diff --git a/README.md b/README.md index 8aa846e..0e0e87b 100644 --- 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 6958d2a..8f26f06 100755 --- 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