Update refactor and compose consistency to templates

README.md

@@ -252,8 +252,8 @@ A huge thank you to all our contributors! ScaleTail wouldn’t be what it is tod
 
 <!-- readme: contributors -start -->
 <table>
- <tbody>
-  <tr>
+	<tbody>
+		<tr>
             <td align="center">
                 <a href="https://github.com/crypt0rr">
                     <img src="https://avatars.githubusercontent.com/u/57799908?v=4" width="100;" alt="crypt0rr"/>
@@ -282,29 +282,22 @@ A huge thank you to all our contributors! ScaleTail wouldn’t be what it is tod
                     <sub><b>michaelhodges</b></sub>
                 </a>
             </td>
-            <td align="center">
-                <a href="https://github.com/LaijieJi">
-                    <img src="https://avatars.githubusercontent.com/u/108839952?v=4" width="100;" alt="LaijieJi"/>
-                    <br />
-                    <sub><b>LaijieJi</b></sub>
-                </a>
-            </td>
             <td align="center">
                 <a href="https://github.com/adamsthws">
                     <img src="https://avatars.githubusercontent.com/u/52178922?v=4" width="100;" alt="adamsthws"/>
                     <br />
                     <sub><b>adamsthws</b></sub>
                 </a>
             </td>
-  </tr>
-  <tr>
             <td align="center">
                 <a href="https://github.com/theryukverse">
                     <img src="https://avatars.githubusercontent.com/u/22323518?v=4" width="100;" alt="theryukverse"/>
                     <br />
                     <sub><b>theryukverse</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/KhaaL">
                     <img src="https://avatars.githubusercontent.com/u/692524?v=4" width="100;" alt="KhaaL"/>
@@ -320,10 +313,17 @@ A huge thank you to all our contributors! ScaleTail wouldn’t be what it is tod
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/jpmurray">
-                    <img src="https://avatars.githubusercontent.com/u/1550428?v=4" width="100;" alt="jpmurray"/>
+                <a href="https://github.com/onlykshitij">
+                    <img src="https://avatars.githubusercontent.com/u/30444410?v=4" width="100;" alt="onlykshitij"/>
                     <br />
-                    <sub><b>jpmurray</b></sub>
+                    <sub><b>onlykshitij</b></sub>
+                </a>
+            </td>
+            <td align="center">
+                <a href="https://github.com/LaijieJi">
+                    <img src="https://avatars.githubusercontent.com/u/108839952?v=4" width="100;" alt="LaijieJi"/>
+                    <br />
+                    <sub><b>LaijieJi</b></sub>
                 </a>
             </td>
             <td align="center">
@@ -340,8 +340,8 @@ A huge thank you to all our contributors! ScaleTail wouldn’t be what it is tod
                     <sub><b>mikkotor</b></sub>
                 </a>
             </td>
-  </tr>
-  <tr>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/NI-R0">
                     <img src="https://avatars.githubusercontent.com/u/98448863?v=4" width="100;" alt="NI-R0"/>
@@ -384,15 +384,22 @@ A huge thank you to all our contributors! ScaleTail wouldn’t be what it is tod
                     <sub><b>pjv</b></sub>
                 </a>
             </td>
-  </tr>
-  <tr>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/wedge22">
                     <img src="https://avatars.githubusercontent.com/u/34723349?v=4" width="100;" alt="wedge22"/>
                     <br />
                     <sub><b>wedge22</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/jpmurray">
+                    <img src="https://avatars.githubusercontent.com/u/1550428?v=4" width="100;" alt="jpmurray"/>
+                    <br />
+                    <sub><b>jpmurray</b></sub>
+                </a>
+            </td>
             <td align="center">
                 <a href="https://github.com/Jacob-JA-Shanks">
                     <img src="https://avatars.githubusercontent.com/u/44290899?v=4" width="100;" alt="Jacob-JA-Shanks"/>
@@ -421,15 +428,15 @@ A huge thank you to all our contributors! ScaleTail wouldn’t be what it is tod
                     <sub><b>dfilvtov</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/cdkooistra">
                     <img src="https://avatars.githubusercontent.com/u/70811244?v=4" width="100;" alt="cdkooistra"/>
                     <br />
                     <sub><b>cdkooistra</b></sub>
                 </a>
             </td>
-  </tr>
-  <tr>
             <td align="center">
                 <a href="https://github.com/Aurorainic">
                     <img src="https://avatars.githubusercontent.com/u/88829187?v=4" width="100;" alt="Aurorainic"/>
@@ -458,8 +465,8 @@ A huge thank you to all our contributors! ScaleTail wouldn’t be what it is tod
                     <sub><b>orchard0</b></sub>
                 </a>
             </td>
-  </tr>
- <tbody>
+		</tr>
+	<tbody>
 </table>
 <!-- readme: contributors -end -->
 

services/actual-budget/.env

@@ -20,3 +20,12 @@ TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_tim
 # PUID=1000
 
 #EXAMPLE_VAR="Environment varibale"
+
+# Uncomment any of the lines below to set configuration options.
+#ACTUAL_HTTPS_KEY=/data/selfhost.key
+#ACTUAL_HTTPS_CERT=/data/selfhost.crt
+ACTUAL_PORT=5006
+ACTUAL_UPLOAD_FILE_SYNC_SIZE_LIMIT_MB=20
+ACTUAL_UPLOAD_SYNC_ENCRYPTED_FILE_SYNC_SIZE_LIMIT_MB=50
+ACTUAL_UPLOAD_FILE_SIZE_LIMIT_MB=20
+# See all options and more details at https://actualbudget.org/docs/config/

services/actual-budget/compose.yaml

@@ -56,15 +56,12 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=${TZ}
-      # Uncomment any of the lines below to set configuration options.
-      # - ACTUAL_HTTPS_KEY=/data/selfhost.key
-      # - ACTUAL_HTTPS_CERT=/data/selfhost.crt
-      # - ACTUAL_PORT=5006
-      # - ACTUAL_UPLOAD_FILE_SYNC_SIZE_LIMIT_MB=20
-      # - ACTUAL_UPLOAD_SYNC_ENCRYPTED_FILE_SYNC_SIZE_LIMIT_MB=50
-      # - ACTUAL_UPLOAD_FILE_SIZE_LIMIT_MB=20
-      # See all options and more details at https://actualbudget.org/docs/config/
-      # !! If you are not using any of these options, remove the 'environment:' tag entirely.
+      - ACTUAL_HTTPS_KEY=${ACTUAL_HTTPS_KEY}
+      - ACTUAL_HTTPS_CERT=${ACTUAL_HTTPS_CERT}
+      - ACTUAL_PORT=${ACTUAL_PORT}
+      - ACTUAL_UPLOAD_FILE_SYNC_SIZE_LIMIT_MB=${ACTUAL_UPLOAD_FILE_SYNC_SIZE_LIMIT_MB}
+      - ACTUAL_UPLOAD_SYNC_ENCRYPTED_FILE_SYNC_SIZE_LIMIT_MB=${ACTUAL_UPLOAD_SYNC_ENCRYPTED_FILE_SYNC_SIZE_LIMIT_MB}
+      - ACTUAL_UPLOAD_FILE_SIZE_LIMIT_MB=${ACTUAL_UPLOAD_FILE_SIZE_LIMIT_MB}
     volumes:
       - ./${SERVICE}-data:/data
     depends_on:

services/adguardhome-sync/.env

@@ -20,3 +20,27 @@ TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_tim
 # PUID=1000
 
 #EXAMPLE_VAR="Environment varibale"
+
+# Origin AdGuardHome
+ORIGIN_URL=http://192.168.1.1:3000 #Your origin Adguard Home instance -> change as necessary
+ORIGIN_USERNAME=username #change as necessary
+ORIGIN_PASSWORD=password #change as necessary
+
+# First replication target
+REPLICA1_URL=http://192.168.1.2 #Your destination Adguard Home instance change as necessary
+REPLICA1_USERNAME=dbtech #change as necessary
+REPLICA1_PASSWORD=password #change as necessary
+
+# Second replication target (optional)
+#REPLICA2_URL=http://192.168.1.3 #change as necessary
+#REPLICA2_USERNAME=username #change as necessary
+#REPLICA2_PASSWORD=password #change as necessary
+
+# Third replication target (optional)
+#REPLICA3_URL=http://192.168.1.4 #change as necessary
+#REPLICA3_USERNAME=username #change as necessary
+#REPLICA3_PASSWORD=password #change as necessary
+
+# Options
+CRON=*/1 * * * * # run every 1 minute
+RUN_ON_START=true

services/adguardhome-sync/compose.yaml

@@ -43,29 +43,20 @@ services:
     command: run
     environment:
       - TZ=${TZ}
-      # Origin AdGuardHome
-      - ORIGIN_URL=http://192.168.1.1:3000 #Your origin Adguard Home instance -> change as necessary
-      - ORIGIN_USERNAME=username #change as necessary
-      - ORIGIN_PASSWORD=password #change as necessary
-
-      # First replication target
-      - REPLICA1_URL=http://192.168.1.2 #Your destination Adguard Home instance change as necessary
-      - REPLICA1_USERNAME=dbtech #change as necessary
-      - REPLICA1_PASSWORD=password #change as necessary
-
-      # Second replication target (optional)
-      #- REPLICA2_URL=http://192.168.1.3 #change as necessary
-      #- REPLICA2_USERNAME=username #change as necessary
-      #- REPLICA2_PASSWORD=password #change as necessary
-
-      # Third replication target (optional)
-      #- REPLICA3_URL=http://192.168.1.4 #change as necessary
-      #- REPLICA3_USERNAME=username #change as necessary
-      #- REPLICA3_PASSWORD=password #change as necessary
-
-      # Options
-      - CRON=*/1 * * * * # run every 1 minute
-      - RUN_ON_START=true
+      - ORIGIN_URL=${ORIGIN_URL}
+      - ORIGIN_USERNAME=${ORIGIN_USERNAME}
+      - ORIGIN_PASSWORD=${ORIGIN_PASSWORD}
+      - REPLICA1_URL=${REPLICA1_URL}
+      - REPLICA1_USERNAME=${REPLICA1_USERNAME}
+      - REPLICA1_PASSWORD=${REPLICA1_PASSWORD}
+      - REPLICA2_URL=${REPLICA2_URL}
+      - REPLICA2_USERNAME=${REPLICA2_USERNAME}
+      - REPLICA2_PASSWORD=${REPLICA2_PASSWORD}
+      - REPLICA3_URL=${REPLICA3_URL}
+      - REPLICA3_USERNAME=${REPLICA3_USERNAME}
+      - REPLICA3_PASSWORD=${REPLICA3_PASSWORD}
+      - CRON=${CRON}
+      - RUN_ON_START=${RUN_ON_START}
     depends_on:
       tailscale:
         condition: service_healthy

services/affine/.env

@@ -28,6 +28,6 @@ AFFINE_REVISION=stable
 AFFINE_SERVER_EXTERNAL_URL=https://affine.<YOUR_TS_DOMAIN>.ts.net
 
 # database credentials
-DB_USERNAME=affine
-DB_PASSWORD=affine
-DB_DATABASE=affine
+POSTGRES_USER=affine
+POSTGRES_PASSWORD=affine
+DB_DATABASE=affine

services/affine/compose.yml

@@ -61,14 +61,14 @@ services:
         condition: service_completed_successfully
     volumes:
       # custom configurations
-      - ./${SERVICE}-storage:/root/.affine/storage
-      - ./${SERVICE}-config:/root/.affine/config
+      - ./${SERVICE}-data/storage:/root/.affine/storage
+      - ./${SERVICE}-data/config:/root/.affine/config
     env_file:
       - .env
     environment:
       # Varibles are delared in .env file.
       - REDIS_SERVER_HOST=redis
-      - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@postgres:5432/${postgres:-affine}
+      - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${postgres:-affine}
       - AFFINE_INDEXER_ENABLED=false
       #- EXAMPLE_VAR=${EXAMPLE_VAR}
     restart: always
@@ -78,15 +78,15 @@ services:
     container_name: affine_migration_job # Name for local container management
     volumes:
       # custom configurations
-      - ./${SERVICE}-storage:/root/.affine/storage
-      - ./${SERVICE}-config:/root/.affine/config
+      - ./${SERVICE}-data/storage:/root/.affine/storage
+      - ./${SERVICE}-data/config:/root/.affine/config
     command: [ 'sh', '-c', 'node ./scripts/self-host-predeploy.js' ]
     env_file:
       - .env
     environment:
       # Varibles are delared in .env file.
       - REDIS_SERVER_HOST=redis
-      - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@postgres:5432/${postgres:-affine}
+      - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${postgres:-affine}
       - AFFINE_INDEXER_ENABLED=false
       #- EXAMPLE_VAR=${EXAMPLE_VAR}
     depends_on:
@@ -109,16 +109,16 @@ services:
     image: pgvector/pgvector:pg16 # Image to be used
     container_name: affine_postgres # Name for local container management
     volumes:
-      - ./postgres:/var/lib/postgresql/data
+      - ./${SERVICE}-data/postgres:/var/lib/postgresql/data
     environment:
       # Varibles are delared in .env file.
-      POSTGRES_USER: ${DB_USERNAME}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_DB: ${postgres:-affine}
-      POSTGRES_INITDB_ARGS: '--data-checksums'
+     - POSTGRES_USER=${POSTGRES_USER}
+     - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+     - POSTGRES_DB=${postgres:-affine}
+     - POSTGRES_INITDB_ARGS='--data-checksums'
       # you better set a password for you database
       # or you may add 'POSTGRES_HOST_AUTH_METHOD=trust' to ignore postgres security policy
-      POSTGRES_HOST_AUTH_METHOD: trust
+     - POSTGRES_HOST_AUTH_METHOD=trust
       #- EXAMPLE_VAR=${EXAMPLE_VAR}
     healthcheck:
       test: [ 'CMD', 'pg_isready', '-U', "${DB_USERNAME}", '-d', "${postgres:-affine}" ] # Check if postgres process is running

services/arcane/.env

@@ -20,3 +20,11 @@ TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_tim
 TAILNET_NAME= # for example: tail-scale
 
 #EXAMPLE_VAR="Environment varibale"
+
+#ENCRYPTION_KEY must be 32 bytes (raw/base64/hex). Use 'openssl rand -base64 32' in your CLI to generate a secure random key.
+ENCRYPTION_KEY=verysecretkeythatshouldbereplaced
+#JWT_SECRET should be a secure random string. Use 'openssl rand -base64 32' in your CLI to generate another secure random key.
+JWT_SECRET=verysecretkeythatshouldbereplaced
+LOG_LEVEL=info # Optional
+LOG_JSON=false # Optional
+OIDC_ENABLED=false # Optional

services/arcane/compose.yaml

@@ -56,15 +56,15 @@ services:
       - APP_URL=https://arcane.${TAILNET_NAME}.ts.net
       - PUID=1000
       - PGID=1000
-      - ENCRYPTION_KEY=verysecretkeythatshouldbereplaced # ENCRYPTION_KEY must be 32 bytes (raw/base64/hex). Use 'openssl rand -base64 32' in your CLI to generate a secure random key.
-      - JWT_SECRET=verysecretkeythatshouldbereplaced # JWT_SECRET should be a secure random string. Use 'openssl rand -base64 32' in your CLI to generate another secure random key.
-      - LOG_LEVEL=info # Optional
-      - LOG_JSON=false # Optional
-      - OIDC_ENABLED=false # Optional
+      - ENCRYPTION_KEY=${ENCRYPTION_KEY}
+      - JWT_SECRET=${JWT_SECRET}
+      - LOG_LEVEL=${LOG_LEVEL}
+      - LOG_JSON=${LOG_JSON}
+      - OIDC_ENABLED=${OIDC_ENABLED}
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./${SERVICE}-data:/app/data
-      - ./opt/dockerdata:/app/data/projects # Optional volume for an existing Docker Compose directory.
+      - ./${SERVICE}-data/opt/dockerdata:/app/data/projects # Optional volume for an existing Docker Compose directory.
     depends_on:
       tailscale:
         condition: service_healthy

services/beszel-agent/.env

@@ -20,3 +20,7 @@ TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_tim
 # PUID=1000
 
 #EXAMPLE_VAR="Environment varibale"
+
+PORT=45876
+KEY: "ssh-ed25519 <ADD-YOUR-beszel-agent-KEY-HERE>"
+

services/beszel-agent/compose.yaml

@@ -39,8 +39,8 @@ services:
     network_mode: service:tailscale # Sidecar configuration to route ${SERVICE} through Tailscale
     container_name: app-${SERVICE} # Name for local container management
     environment:
-      PORT: 45876
-      KEY: "ssh-ed25519 <ADD-YOUR-beszel-agent-KEY-HERE>"
+      - PORT=${PORT}
+      - KEY=${KEY}
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro # Read-only access to the docker.sock
     depends_on:

services/booklore/.env

@@ -16,15 +16,12 @@ TS_AUTHKEY= # Add your TS authkey
 # Time Zone setting for containers 
 TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
+#EXAMPLE_VAR="Environment varibale"
+
 # Optional Service variables
 
 # MariaDB Credentials
 MYSQL_ROOT_PASSWORD= # Use a strong password for the databases root user, should be different from MYSQL_PASSWORD
 MYSQL_DATABASE=booklore
 MYSQL_USER=booklore
 MYSQL_PASSWORD= # Use a strong password; must match DATABASE_PASSWORD defined in the booklore container
-
-# To set a timezone, uncomment the next line and change Etc/UTC to a TZ identifier from this list: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
-TZ=Europe/Paris
-
-#EXAMPLE_VAR="Environment varibale"