better structure

Author: kanzitelli

.env.example

@@ -3,12 +3,3 @@ DOMAIN_NAME=your-website.com
 DO_AUTH_TOKEN=xxxxxxxxxxxxxxxxxxxxx # for DNS challenge
 ACME_EMAIL=[email protected]   # for let's encrypt
 GITHUB_TOKEN=xxxxxxxxxxxxxxxxxxxxxx # (optional) for private repos
-
-# [POSTGRES]
-POSTGRESQL_USERNAME=admin
-POSTGRESQL_PASSWORD=123456qwerty
-POSTGRESQL_DATABASE=db
-
-# [REDIS]
-REDIS_PASSWORD=123456qwerty
-REDIS_DISABLE_COMMANDS=FLUSHDB,FLUSHALL

services/docker-compose.postgresql.yml

@@ -4,10 +4,8 @@ services:
   postgresql:
     image: bitnami/postgresql:latest
     restart: always
-    environment:
-      - POSTGRESQL_USERNAME=${POSTGRESQL_USERNAME}
-      - POSTGRESQL_PASSWORD=${POSTGRESQL_PASSWORD}
-      - POSTGRESQL_DATABASE=${POSTGRESQL_DATABASE}
+    env_file:
+      - ./services/postgresql/conf.env
     volumes:
       - ./services/postgresql/data:/bitnami/postgresql
     labels:

services/docker-compose.redis.yml

@@ -4,9 +4,8 @@ services:
   redis:
     image: bitnami/redis:latest
     restart: always
-    environment:
-      - REDIS_PASSWORD=${REDIS_PASSWORD}
-      - REDIS_DISABLE_COMMANDS=${REDIS_DISABLE_COMMANDS}
+    env_file:
+      - ./services/redis/conf.env
     volumes:
       - ./services/redis/data:/bitnami/redis/data
     labels:

services/plausible/conf.env

@@ -1,3 +1,4 @@
+# [PLAUSIBLE]
 ADMIN_USER_EMAIL=replace-me
 ADMIN_USER_NAME=replace-me
 ADMIN_USER_PWD=replace-me

services/postgresql/conf.env

@@ -0,0 +1,4 @@
+# [POSTGRES]
+POSTGRESQL_USERNAME=admin
+POSTGRESQL_PASSWORD=123456qwerty
+POSTGRESQL_DATABASE=db

services/redis/conf.env

@@ -0,0 +1,3 @@
+# [REDIS]
+REDIS_PASSWORD=123456qwerty
+REDIS_DISABLE_COMMANDS=FLUSHDB,FLUSHALL

setup.sh

@@ -11,4 +11,7 @@ eval "$BASH_GENERAL_FILES $BASH_FILES"
 ENVEXF=.env.example
 if [ -f "$ENVEXF" ]; then
   mv .env.example .env
+
+  echo "Don't forget to fill in .env file!"
+  echo "  > nano .env"
 fi