variables d’environnement fixes dans les docker-compose, fix #70

cloud/README.md

@@ -5,8 +5,6 @@ https://nextcloud.com/
 ## Configure
 ```
 echo POSTGRES_PASSWORD=$(openssl rand -base64 32) >> .env
-echo POSTGRES_USER=nextcloud >> .env
-echo POSTGRES_HOST=db >> .env
 ```
 
 ## Deploy

cloud/docker-compose.yml

@@ -10,6 +10,7 @@ services:
     restart: unless-stopped
     environment:
       - POSTGRES_DB=workaround  # nextcloud wants to create the db itself
+      - POSTGRES_USER=nextcloud
     env_file:
       - .env
     volumes:
@@ -20,6 +21,8 @@ services:
     restart: unless-stopped
     environment:
       - POSTGRES_DB=nextcloud
+      - POSTGRES_USER=nextcloud
+      - POSTGRES_HOST=db
     env_file:
       - .env
     volumes:

pad/README.md

@@ -5,14 +5,9 @@ http://etherpad.org/
 ## Configure
 ```
 export DB_PASSWORD=$(openssl rand -base64 32)
+echo POSTGRES_PASSWORD=$DB_PASSWORD >> .env
 echo ETHERPAD_DB_PASSWORD=$DB_PASSWORD >> .env
 echo ETHERPAD_TITLE=Bloc Note >> .env
-echo ETHERPAD_DB_HOST=db >> .env
-echo ETHERPAD_DB_TYPE=postgres >> .env
-echo ETHERPAD_DB_USER=etherpad >> .env
-echo ETHERPAD_DB_PORT=5432 >> .env
-echo POSTGRES_USER=etherpad >> .env
-echo POSTGRES_PASSWORD=$DB_PASSWORD >> .env
 ```
 
 ## Deploy

pad/docker-compose.yml

@@ -8,6 +8,8 @@ services:
   db:
     image: postgres:10-alpine
     restart: unless-stopped
+    environment:
+      - POSTGRES_USER=etherpad
     env_file:
       - .env
     volumes:
@@ -16,6 +18,11 @@ services:
   app:
     build: .
     restart: unless-stopped
+    environment:
+      - POSTGRES_DB_HOST=db
+      - ETHERPAD_DB_TYPE=postgres
+      - ETHERPAD_DB_USER=etherpad
+      - ETHERPAD_DB_PORT=5432
     env_file:
       - .env
     labels:

peertube/README.md

@@ -8,22 +8,15 @@ https://framagit.org/chocobozzz/PeerTube
 
 ```
 export DB_PASSWORD=$(openssl rand -base64 32)
-echo POSTGRES_USER=postgres_user >> .env
 echo POSTGRES_PASSWORD=$DB_PASSWORD >> .env
-echo POSTGRES_DB=peertube >> .env
-echo PEERTUBE_WEBSERVER_PORT=80 >> .env
-echo PEERTUBE_WEBSERVER_HTTPS=false >> .env
-echo PEERTUBE_DB_HOSTNAME=db >> .env
-echo PEERTUBE_DB_USERNAME=postgres_user >> .env
 echo PEERTUBE_DB_PASSWORD=$DB_PASSWORD >> .env
-echo PEERTUBE_REDIS_HOSTNAME=redis >> .env
 echo PEERTUBE_SMTP_PASSWORD=null >> .env
 echo PEERTUBE_SMTP_HOSTNAME=null >> .env
 echo PEERTUBE_SMTP_PORT=465 >> .env
 echo PEERTUBE_SMTP_TLS=true >> .env
-echo PEERTUBE_SMTP_USERNAME=peertube@${CHATONS_DOMAIN:-localhost} >> .env
-echo PEERTUBE_SMTP_FROM=peertube@${CHATONS_DOMAIN:-localhost} >> .env
-echo PEERTUBE_ADMIN_EMAIL=peertube@${CHATONS_DOMAIN:-localhost} >> .env
+echo PEERTUBE_SMTP_USERNAME=${CHATONS_SERVICE:-peertube}@${CHATONS_DOMAIN:-localhost} >> .env
+echo PEERTUBE_SMTP_FROM=${CHATONS_SERVICE:-peertube}@${CHATONS_DOMAIN:-localhost} >> .env
+echo PEERTUBE_ADMIN_EMAIL=${CHATONS_SERVICE:-peertube}@${CHATONS_DOMAIN:-localhost} >> .env
 ```
 
 If you want to use HTTPS, you will have to add:

peertube/docker-compose.yml

@@ -12,6 +12,11 @@ services:
       - .env
     environment:
       - PEERTUBE_WEBSERVER_HOSTNAME=${CHATONS_SERVICE:-peertube}.${CHATONS_DOMAIN:-localhost}
+      - PEERTUBE_WEBSERVER_PORT=80
+      - PEERTUBE_WEBSERVER_HTTPS=false
+      - PEERTUBE_DB_HOSTNAME=db
+      - PEERTUBE_DB_USERNAME=postgres_user
+      - PEERTUBE_REDIS_HOSTNAME=redis
     labels:
       traefik.enable: "true"
       traefik.frontend.rule: "Host: ${CHATONS_SERVICE:-peertube}.${CHATONS_DOMAIN:-localhost}, www.${CHATONS_SERVICE:-peertube}.${CHATONS_DOMAIN:-localhost}"
@@ -25,6 +30,9 @@ services:
   db:
     image: postgres:10-alpine
     restart: unless-stopped
+    environment:
+      - POSTGRES_USER=postgres_user
+      - POSTGRES_DB=peertube
     env_file:
       - .env
     volumes:

sentry/README.md

@@ -1,4 +1,4 @@
-# Sentry on proxyta.net
+# Sentry
 
 Sentry is an error tracking software:
 https://sentry.io
@@ -7,11 +7,11 @@ https://sentry.io
 
 ```bash
 echo SENTRY_SECRET_KEY=$(openssl rand -base64 32) >> .env
-echo SENTRY_EMAIL_HOST= >> .env
-echo SENTRY_EMAIL_PORT= >> .env
-echo SENTRY_EMAIL_USER= >> .env
-echo SENTRY_EMAIL_PASSWORD= >> .env
-echo SENTRY_EMAIL_USE_TLS= >> .env
+echo SENTRY_EMAIL_HOST=changeme >> .env
+echo SENTRY_EMAIL_PORT=changeme >> .env
+echo SENTRY_EMAIL_USER=changeme >> .env
+echo SENTRY_EMAIL_PASSWORD=changeme >> .env
+echo SENTRY_EMAIL_USE_TLS=changeme >> .env
 ```
 
 ## Deploy