diff --git a/docker/haproxy/docker-entrypoint.sh b/docker/haproxy/docker-entrypoint.sh index 4b209d6..555daf1 100644 --- a/docker/haproxy/docker-entrypoint.sh +++ b/docker/haproxy/docker-entrypoint.sh @@ -2,8 +2,8 @@ set -e # Set debug path password -PASSWD=$(python3 -c 'import os,crypt,getpass; print(crypt.crypt(os.environ["ADMIN_PWD"], crypt.mksalt(crypt.METHOD_SHA512)))') -sed -i "/^ user admin password/c\ user admin password $ADMIN_PWD" /usr/local/etc/haproxy/haproxy.cfg +PASSWD=$(python3 -c 'import os,crypt,getpass; print(crypt.crypt(os.environ["ADMINAPP_PASSWORD"], crypt.mksalt(crypt.METHOD_SHA512)))') +sed -i "/^ user admin password/c\ user admin password $ADMINAPP_PASSWORD" /usr/local/etc/haproxy/haproxy.cfg #/bin/sh /letsencrypt.sh diff --git a/docker/haproxy/haproxy.yml b/docker/haproxy/haproxy.yml index f56d92a..5bbc6b5 100644 --- a/docker/haproxy/haproxy.yml +++ b/docker/haproxy/haproxy.yml @@ -9,7 +9,7 @@ services: container_name: isard-apps-haproxy restart: unless-stopped environment: - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - ADMINAPP_PASSWORD=${ADMINAPP_PASSWORD} volumes: - /etc/localtime:/etc/localtime:ro - ${SRC_FOLDER}/haproxy:/certs:rw diff --git a/docker/nextcloud/nextcloud.yml b/docker/nextcloud/nextcloud.yml index ef691f7..2a45486 100644 --- a/docker/nextcloud/nextcloud.yml +++ b/docker/nextcloud/nextcloud.yml @@ -27,6 +27,8 @@ services: - REDIS_HOST=isard-apps-redis - NC_overwriteprotocol=https - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.${DOMAIN} + - DDADMIN_USER=${DDADMIN_USER} + - DDADMIN_PASSWORD=${DDADMIN_PASSWORD} #- REDIS_HOST_PORT: 6379 #- REDIS_HOST_PASSWORD: networks: