EDUCATIC
/
digitaldemocratic
mirror of https://gitlab.com/digitaldemocratic/digitaldemocratic
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updated configuration

root 2021-05-29 10:06:50 +02:00
parent 7a6b416e46
commit 19a6569e24
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/haproxy/docker-entrypoint.sh
View File

@ -2,8 +2,8 @@
set -e set -e
# Set debug path password # Set debug path password
PASSWD=$(python3 -c 'import os,crypt,getpass; print(crypt.crypt(os.environ["ADMIN_PWD"], crypt.mksalt(crypt.METHOD_SHA512)))') 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 $ADMIN_PWD" /usr/local/etc/haproxy/haproxy.cfg sed -i "/^ user admin password/c\ user admin password $ADMINAPP_PASSWORD" /usr/local/etc/haproxy/haproxy.cfg
#/bin/sh /letsencrypt.sh #/bin/sh /letsencrypt.sh

2
docker/haproxy/haproxy.yml
View File

@ -9,7 +9,7 @@ services:
container_name: isard-apps-haproxy container_name: isard-apps-haproxy
restart: unless-stopped restart: unless-stopped
environment: environment:
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - ADMINAPP_PASSWORD=${ADMINAPP_PASSWORD}
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- ${SRC_FOLDER}/haproxy:/certs:rw - ${SRC_FOLDER}/haproxy:/certs:rw

2
docker/nextcloud/nextcloud.yml
View File

@ -27,6 +27,8 @@ services:
- REDIS_HOST=isard-apps-redis - REDIS_HOST=isard-apps-redis
- NC_overwriteprotocol=https - NC_overwriteprotocol=https
- NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.${DOMAIN} - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.${DOMAIN}
- DDADMIN_USER=${DDADMIN_USER}
- DDADMIN_PASSWORD=${DDADMIN_PASSWORD}
#- REDIS_HOST_PORT: 6379 #- REDIS_HOST_PORT: 6379
#- REDIS_HOST_PASSWORD: #- REDIS_HOST_PASSWORD:
networks: networks: