Move stuff to config subdir

jafner-tools/config/5etools/.env

@@ -0,0 +1 @@
+DOCKER_DATA=/root/data/5etools

jafner-tools/config/5etools/docker-compose.yml

@@ -5,7 +5,7 @@ services:
     image: jafner/5etools-docker
     restart: always
     volumes:
-      - ./htdocs:/usr/local/apache2/htdocs
+      - $DOCKER_DATA/htdocs:/usr/local/apache2/htdocs
     environment:
       # using defaults
       - IMG=false

jafner-tools/config/joplin/.env

@@ -0,0 +1,9 @@
+DOCKER_DATA=/root/data/joplin
+POSTGRES_HOST_AUTH_METHOD=trust
+APP_BASE_URL=https://joplin.jafner.tools
+APP_PORT=22300
+POSTGRES_PASSWORD=joplin
+POSTGRES_USER=joplin
+POSTGRES_DB=joplin
+POSTGRES_PORT=5432
+

jafner-tools/config/joplin/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     labels:
       - traefik.http.routers.joplin.rule=Host(`joplin.jafner.tools`)
       - traefik.http.routers.joplin.tls.certresolver=lets-encrypt
-      - traefik.http.middlewares.joplin.headers.customrequestheaders.X-Forwarded-Proto = http
+      #- traefik.http.middlewares.joplin.headers.customrequestheaders.X-Forwarded-Proto = http
       - traefik.http.services.joplin.loadbalancer.server.port=22300
       - traefik.http.services.joplin.loadbalancer.passhostheader=true
   joplin_db:
@@ -24,7 +24,7 @@ services:
     env_file:
       - .env
     volumes:
-      - ./db:/var/lib/postgresql/data
+      - $DOCKER_DATA/db:/var/lib/postgresql/data
     networks:
       - joplin
 

jafner-tools/config/traefik/.env

@@ -0,0 +1 @@
+DOCKER_DATA=/root/data/traefik

jafner-tools/config/traefik/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ./traefik.toml:/traefik.toml
-      - ./acme.json:/acme.json
+      - $DOCKER_DATA/acme.json:/acme.json
 networks:
   web:
     external: true

jafner-tools/config/uptime-kuma/.env

@@ -0,0 +1 @@
+DOCKER_DATA=/root/data/uptime-kuma

jafner-tools/config/uptime-kuma/docker-compose.yml

@@ -5,7 +5,7 @@ services:
         container_name: uptime-kuma
         restart: always
         volumes:
-            - ./data:/app/data
+            - $DOCKER_DATA/data:/app/data
         networks:
             - web
         labels:

jafner-tools/config/vaultwarden/.env

@@ -0,0 +1,2 @@
+DOCKER_DATA=/root/data/vaultwarden
+ADMIN_TOKEN=7YK43TxKdHNqb696GPNibAvrindZxE7m6nbDsx3purhkgRsRReUiDXPw4HTSBrVN

jafner-tools/config/vaultwarden/docker-compose.yml

@@ -4,10 +4,12 @@ services:
     image: vaultwarden/server:latest
     container_name: vaultwarden
     restart: unless-stopped
+    env_file:
+      - .env
     networks:
       - web
     volumes:
-      - ./data:/data
+      - $DOCKER_DATA/data:/data
     labels:
       - traefik.http.routers.vaultwarden.rule=Host(`bitwarden.jafner.tools`)
       - traefik.http.routers.vaultwarden.tls.certresolver=lets-encrypt

jafner-tools/joplin/.env

@@ -1,10 +0,0 @@
-DB_CLIENT=pg
-POSTGRES_PASSWORD=postgres
-POSTGRES_DATABASE=joplin
-POSTGRES_DB=joplin
-POSTGRES_USER=postgres
-POSTGRES_PORT=5432
-POSTGRES_HOST=joplin_db
-
-APP_BASE_URL=https://joplin.jafner.tools
-APP_PORT=22300