From 50418914c9cd817fefbb684aa6e3952eb2e06537 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Jun 2021 20:50:03 +0200 Subject: [PATCH] Added postgres tuner and fixed backups cron --- docker-compose-parts/backup.yml | 2 +- docker-compose-parts/pgtuner.yml | 10 ++++++++++ docker/haproxy/docker-entrypoint.sh | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 docker-compose-parts/pgtuner.yml diff --git a/docker-compose-parts/backup.yml b/docker-compose-parts/backup.yml index c6fedfd..298730c 100644 --- a/docker-compose-parts/backup.yml +++ b/docker-compose-parts/backup.yml @@ -18,7 +18,7 @@ services: - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_EXTRA_OPTS=-Z9 --schema=public --blobs - - SCHEDULE=@every 0h30m00s + - SCHEDULE=@every 24h00m00s - BACKUP_KEEP_DAYS=7 - BACKUP_KEEP_WEEKS=4 - BACKUP_KEEP_MONTHS=6 diff --git a/docker-compose-parts/pgtuner.yml b/docker-compose-parts/pgtuner.yml new file mode 100644 index 0000000..f85aaa6 --- /dev/null +++ b/docker-compose-parts/pgtuner.yml @@ -0,0 +1,10 @@ +--- +version: '3.7' +services: + isard-sso-pgtuner: + image: jfcoz/postgresqltuner + container_name: isard-sso-pgtuner + restart: "no" + command: --host isard-apps-postgresql --user ${NEXTCLOUD_POSTGRES_USER} --password ${NEXTCLOUD_POSTGRES_PASSWORD} --database nextcloud + networks: + isard_net: {} diff --git a/docker/haproxy/docker-entrypoint.sh b/docker/haproxy/docker-entrypoint.sh index 4475cf9..c9a5934 100644 --- a/docker/haproxy/docker-entrypoint.sh +++ b/docker/haproxy/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e # Set debug path password -PASSWD=$(python3 -c 'import os,crypt,getpass; print(crypt.crypt(os.environ["ADMINAPP_PASSWORD"], crypt.mksalt(crypt.METHOD_SHA512)))') +PASSWD=$(python3 -c 'import os,crypt,getpass; print(crypt.crypt(os.environ["KEYCLOAK_PASSWORD"], crypt.mksalt(crypt.METHOD_SHA512)))') sed -i "/^ user admin password/c\ user admin password $PASSWD" /usr/local/etc/haproxy/haproxy.cfg LETSENCRYPT_DOMAIN="$DOMAIN" letsencrypt.sh