From 5274fa82099d31ed9a0ca65047e64bc52c04ca5c Mon Sep 17 00:00:00 2001 From: Ilya Mukhortov Date: Sun, 24 Mar 2024 20:20:16 +1000 Subject: [PATCH] pass --- Readme.md | 24 +++++++++----------- medicine-remd/crontab.txt | 2 -- medicine-remd/docker-compose.yml | 2 -- medicine/crontab.txt | 2 -- medicine/default.docker-compose.override.yml | 14 ------------ 5 files changed, 11 insertions(+), 33 deletions(-) delete mode 100755 medicine-remd/crontab.txt delete mode 100755 medicine/crontab.txt delete mode 100644 medicine/default.docker-compose.override.yml diff --git a/Readme.md b/Readme.md index 1ed08d9..b4e8bb2 100644 --- a/Readme.md +++ b/Readme.md @@ -1,17 +1,4 @@ -### Установка - -> git clone https://ilya_muhortov@bitbucket.org/med-logic/medicine-config.git - -> chmod +x ~/medicine-config/bash_scripts/docker-install.sh ~/medicine-config/bash_scripts/install.sh ~/medicine-config/medicine/run.sh - - -### Установка ssh сервера и git - -> apt update - -> apt install --assume-yes openssh-server - ### Решение проблем > Error saving credentials: error storing credentials - err: exit status 1, out: `Cannot autolaunch D-Bus without X11 $DISPLAY` @@ -55,3 +42,14 @@ на доступном сервере ssh localhost -p 40022 + + +### Crontab tasks + +30 13 * * * /root/medicine-config/medicine-remd/update.sh + +50 13 * * * /root/medicine-config/cron-tasks/backup_database_medicine_remd.sh + +20 13 * * * /root/medicine-config/medicine/update.sh + +55 13 * * * /root/medicine-config/cron-tasks/backup_database_medicine.sh diff --git a/medicine-remd/crontab.txt b/medicine-remd/crontab.txt deleted file mode 100755 index 0c2f524..0000000 --- a/medicine-remd/crontab.txt +++ /dev/null @@ -1,2 +0,0 @@ -30 13 * * * /root/medicine-config/medicine-remd/update.sh -50 13 * * * /root/medicine-config/cron-tasks/backup_database_medicine_remd.sh \ No newline at end of file diff --git a/medicine-remd/docker-compose.yml b/medicine-remd/docker-compose.yml index 94a91ca..07b84cb 100644 --- a/medicine-remd/docker-compose.yml +++ b/medicine-remd/docker-compose.yml @@ -19,8 +19,6 @@ services: - ./public:/app/public networks: - medicine-network - extra_hosts: - - "host.docker.internal:host-gateway" logging: driver: "json-file" options: diff --git a/medicine/crontab.txt b/medicine/crontab.txt deleted file mode 100755 index c4d3cb3..0000000 --- a/medicine/crontab.txt +++ /dev/null @@ -1,2 +0,0 @@ -20 13 * * * /root/medicine-config/medicine/update.sh -55 13 * * * /root/medicine-config/cron-tasks/backup_database_medicine.sh \ No newline at end of file diff --git a/medicine/default.docker-compose.override.yml b/medicine/default.docker-compose.override.yml deleted file mode 100644 index 2a3f004..0000000 --- a/medicine/default.docker-compose.override.yml +++ /dev/null @@ -1,14 +0,0 @@ - -version: '3' - -services: - - app: - external_links: - - "tfoms-patient:patient-search-host" - - "service-thumbgen:service-thumbgen-host" - - tasks: - external_links: - - "tfoms-patient:patient-search-host" - - "service-thumbgen:service-thumbgen-host"