From cc43145aedc658eed9e7399f04cd6d4aa0db4223 Mon Sep 17 00:00:00 2001 From: Ilya Mukhortov Date: Tue, 11 Jun 2024 20:56:55 +1000 Subject: [PATCH] pass --- Readme.md | 28 +++++++++++++++++----------- medicine-remd/update.sh | 7 ------- medicine/update.sh | 7 ------- scripts/crontab-check.sh | 3 +++ scripts/docker-cleanup.sh | 3 +++ 5 files changed, 23 insertions(+), 25 deletions(-) create mode 100755 scripts/crontab-check.sh create mode 100755 scripts/docker-cleanup.sh diff --git a/Readme.md b/Readme.md index a995504..2570ba1 100644 --- a/Readme.md +++ b/Readme.md @@ -45,26 +45,32 @@ ### Crontab tasks -CRON_TZ=UTC -00 13 * * * /root/medicine-config/update_repository.sh -10 13 * * * /root/medicine-config/medicine-remd/backup_database.sh -20 13 * * * /root/medicine-config/medicine-remd/update.sh -30 13 * * * /root/medicine-config/medicine/backup_database.sh -40 13 * * * /root/medicine-config/medicine/update.sh +00 21 * * * /root/medicine-config/update_repository.sh +00 22 * * * /root/medicine-config/medicine/backup_database.sh +00 23 * * * /root/medicine-config/medicine/update.sh +00 22 * * * /root/medicine-config/medicine-remd/backup_database.sh +30 23 * * * /root/medicine-config/medicine-remd/update.sh +00 00 * * * /root/medicine-config/scripts/docker-cleanup.sh +* * * * * /root/medicine-config/scripts/check-crontab.sh >> /var/log/check-crontab.log 2>&1 + +sudo timedatectl set-timezone Asia/Vladivostok 00 13 * * * /root/medicine-config/update_repository.sh >> /var/log/cron_medicine_update.log 2>&1 # /etc/hosts - -89.223.70.16 docker.med-logic.ru git.med-logic.ru sync.med-logic.ru sentry.med-logic.ru sentry.med-logic.ru +> sudo vim /etc/hosts +89.223.70.16 docker.med-logic.ru git.med-logic.ru # change git url -git remote set-url origin https://git.med-logic.ru/ilya.muhortov/medicine-config.git +git remote set-url origin https://git.med-logic.ru/ilya.muhortov/medicine-config.git && git pull ### Перенос данных -scp -r /root/medicine-config/medicine-lis-receiver/supervisor_confs root@192.168.11.121:/root/medicine-config/medicine-lis-receiver/supervisor_confs -scp -r /var/lib/docker/volumes/medicine_medicine-public-data/_data root@192.168.11.121:/var/lib/docker/volumes/medicine_medicine-public-data +scp -r /root/medicine-config/medicine-lis-receiver/supervisor_confs root@hostname:/root/medicine-config/medicine-lis-receiver/supervisor_confs +scp -r /var/lib/docker/volumes/medicine_medicine-public-data/_data root@hostname:/var/lib/docker/volumes/medicine_medicine-public-data +# Разное + +curl -iv --tlsv1.2 https://docker.med-logic.ru/ diff --git a/medicine-remd/update.sh b/medicine-remd/update.sh index 49e8e77..cc1b2ba 100755 --- a/medicine-remd/update.sh +++ b/medicine-remd/update.sh @@ -5,14 +5,7 @@ set -e echo "readonly" | docker login docker.med-logic.ru --username readonly --password-stdin docker pull docker.med-logic.ru/medicine-remd:latest -#(cd /root/medicine-config/medicine-remd && -# /usr/local/bin/docker-compose stop && -# /usr/local/bin/docker-compose up -d -#) - (cd /root/medicine-config/medicine-remd && docker-compose stop && docker-compose up -d ) - -docker rmi $(docker images -f "dangling=true" -q) diff --git a/medicine/update.sh b/medicine/update.sh index 6cff37a..8b4bd99 100755 --- a/medicine/update.sh +++ b/medicine/update.sh @@ -5,14 +5,7 @@ set -e echo "readonly" | docker login docker.med-logic.ru --username readonly --password-stdin docker pull docker.med-logic.ru/medicine:latest -#(cd /root/medicine-config/medicine && -# /usr/local/bin/docker-compose stop && -# /usr/local/bin/docker-compose up -d -#) - (cd /root/medicine-config/medicine && docker-compose stop && docker-compose up -d ) - -docker rmi $(docker images -f "dangling=true" -q) diff --git a/scripts/crontab-check.sh b/scripts/crontab-check.sh new file mode 100755 index 0000000..f024c66 --- /dev/null +++ b/scripts/crontab-check.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo $PATH; diff --git a/scripts/docker-cleanup.sh b/scripts/docker-cleanup.sh new file mode 100755 index 0000000..06071e4 --- /dev/null +++ b/scripts/docker-cleanup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker rmi $(docker images -f "dangling=true" -q)