test

.github/workflows/main.yml

@@ -26,8 +26,6 @@ jobs:
         with:
           submodules: "recursive"
           fetch-depth: 0
-      - name: "Check compose"
-        run: make check
       - name: "Update server image"
         run: make pull
       - name: "Build server"

.github/workflows/submodule-update.yml

@@ -1,31 +0,0 @@
-name: submodule-update
-
-on:
-  schedule:
-    - cron: '0 */8 * * *'
-  workflow_dispatch:
-
-jobs:
-  image:
-    name: submodule-update
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout Code"
-        uses: actions/checkout@v5
-        with:
-          token: ${{ secrets.CI_TOKEN }}
-          repository: ${{ github.repository }}
-          submodules: 'recursive'
-          fetch-depth: 1
-      # Update references
-      - name: Git Sumbodule Update
-        run: |
-          git pull --recurse-submodules
-          git submodule update --remote --recursive
-      # Commit and push
-      - name: Commit update
-        run: |
-          git config --global user.name 'Bensuperpc'
-          git config --global user.email 'bensuperpc@gmail.com'
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
-          git commit -am "Auto updated submodule references" && git push || echo "No changes to commit"

.gitignore

@@ -1,2 +1,7 @@
 
 /*.tar.gz
+
+infrastructure/services/**/env/*.env
+infrastructure/services/**/config/*.env
+!infrastructure/services/**/env/*.env.example
+!infrastructure/services/**/config/*.env.example

Makefile

@@ -29,3 +29,11 @@ CONFIGS := ia torrent tools
 #DOCKER_PROFILES := 
 
 include DockerCompose.mk
+
+.PHONY: init
+init:
+	@bash tools/init_secrets.sh
+
+.PHONY: clean-secrets
+clean-secrets:
+	@bash tools/clean_secrets.sh

README.md

@@ -151,165 +151,73 @@ And then, caddy will generate the certificate for you and renew it automatically
 
 ### Configure the infrastructure
 
-You need to configure the infrastructure with your own configuration.
-
-You can generate a password with 32 characters:
+Every service ships a `*.env.example` file. Real `*.env` files are gitignored and never committed - generate them locally with:
 
 ```sh
-openssl rand -base64 32
+make init
 ```
 
-Or online: [passwordsgenerator.net](https://passwordsgenerator.net/)
+This copies every `*.env.example` → `*.env` and fills in randomly generated passwords, keys and tokens (including shared values that must match across services, e.g. a service and its database). Existing `.env` files are never overwritten, so re-running it later is always safe.
+
+After `make init`, a few things still need manual attention:
 
 #### Caddy
 
-For [caddy_backup.env](infrastructure/services/caddy/env/caddy_backup.env) file, you need to change the password(s) for the restic backup.
-
-```sh
-RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-```
-
-On [caddy.env](infrastructure/services/caddy/env/caddy.env) file, you need to update some variables, like the main domain, mail domain and scheme (http or https).
+Edit [caddy.env](infrastructure/services/caddy/env/caddy.env.example) to set your domain and mail address:
 
 ```sh
 MAIN_DOMAIN=bensuperpc.org
 MAIL_DOMAIN=bensuperpc@gmail.com
-# Scheme
 SCHEME=https
-# ignore_loaded_certs off
 AUTO_HTTPS_OPTIONS=ignore_loaded_certs
 ```
 
-#### Authelia
+#### Authelia - user database
 
-For [authelia.env](infrastructure/services/authelia/env/authelia.env) file, you need to change the password(s) and secret key:
-
-```sh
-AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET=ht87MVnXkXhBpDkMUHqKDqdg8UGBJt+Fx5jNIqXnN2k=
-AUTHELIA_SESSION_SECRET=nsvbXKGRXVZUCUkOapntlq/Zh+d75WacTK5Jgyh8zYk=
-AUTHELIA_STORAGE_ENCRYPTION_KEY=aWeIT74xIhGVd9nUOr4YTToTl5rpBEbzc/fv4jemuos=
-AUTHELIA_STORAGE_POSTGRES_HOST=authelia-postgres
-AUTHELIA_STORAGE_POSTGRES_PORT=5432
-AUTHELIA_STORAGE_POSTGRES_DATABASE=authelia_db
-AUTHELIA_STORAGE_POSTGRES_USERNAME=authelia
-AUTHELIA_STORAGE_POSTGRES_PASSWORD=sAdkxFW6k3GiMOrlBpl6OV76eb9cQz/uk95jmA2UpI8=
-```
-
-Same for [authelia_postgres.env](infrastructure/services/authelia/env/authelia_postgres.env) file, you need to change the password(s) and user for the database.
-
-```sh
-POSTGRES_USER=authelia
-POSTGRES_PASSWORD=sAdkxFW6k3GiMOrlBpl6OV76eb9cQz/uk95jmA2UpI8=
-POSTGRES_DB=authelia_db
-```
-
-You also need to update [users_database.yml](infrastructure/services/authelia/config/users_database.yml)
+`make init` generates all Authelia secrets automatically. [users_database.yml](infrastructure/services/authelia/config/users_database.yml) ships with a **placeholder example user** (`bensuperpc`) - replace it with your own before starting the stack, don't just add a user next to it. Generate an argon2 hash for your password:
 
 ```sh
 docker run --rm authelia/authelia:latest authelia crypto hash generate argon2 --password 'MyPassword'
 ```
 
-#### Dozzle
+Then edit the `username`, `displayname`, `password` hash and `email` fields to match.
 
-To generate a new user for dozzle, you can use the following command [users.yml](infrastructure/services/dozzle/config/users.yml):
+#### Dozzle - user account
+
+Generate a user entry for [users.yml](infrastructure/services/dozzle/config/users.yml):
 
 ```sh
 docker run -it --rm amir20/dozzle generate bensuperpc --password mypassword --email bensuperpc@gmail.com --name "bensuperpc"
 ```
 
-#### PsiTransfer
+#### OpenSSH - public key
 
-For [psitransfer.env](infrastructure/services/psitransfer/env/psitransfer.env) file, you need to change the secret key.
+Replace [id_ed25519.pub](infrastructure/services/openssh/config/authorized_keys/id_ed25519.pub) with your own public SSH key.
 
-```sh
-PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn
-```
+#### Open-WebUI - Ollama model
 
-For [projectsend_db.env](infrastructure/services/projectsend/env/projectsend_db.env) file, you need to change the password(s) and user for the database.
-
-```sh
-MARIADB_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt
-MARIADB_USER=bensuperpc
-MARIADB_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
-```
-
-#### Picoshare
-
-For [picoshare.env](infrastructure/services/picoshare/env/picoshare.env) file, you need to change the secret key.
-
-```sh
-PS_SHARED_SECRET=CBuS4DJLqIe93xF1KGYRrnhxUFBqLD2n
-```
-
-#### Dufs
-
-For [dufs.env](infrastructure/services/dufs/env/dufs.env) file, you need to change the secret key and if you want the user name.
-
-```sh
-DUFS_AUTH="admin:heqihlOfBmJDESGFlpbPi7P7Mi6F7RkV@/:rw|@/:ro"
-```
-
-#### Stirling PDF
-
-For [stirlingpdf.env](infrastructure/services/stirlingpdf/env/stirlingpdf.env) file, it's **completly optional**, you can change the password(s) and user.
-
-```sh
-# Enable security, optional
-DOCKER_ENABLE_SECURITY=true
-SECURITY_ENABLE_LOGIN=true
-# Can be disabled after initial login, optional,
-# default it admin:stirling
-SECURITY_INITIALLOGIN_USERNAME=admin
-SECURITY_INITIALLOGIN_PASSWORD=Jw9U039f5xc2mFcacvGvPD9RjwIh4DzO
-```
-
-#### OpenSSH
-
-You can need to add/change the public ssh key [id_ed25519.pub](infrastructure/services/openssh/config/authorized_keys/id_ed25519.pub) (its my public key), also change the config/password in [openssh.env](infrastructure/services/openssh/env/openssh.env):
-
-```sh
-SUDO_ACCESS=true
-#PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
-PUBLIC_KEY_DIR=/authorized_ssh_keys
-USER_PASSWORD=rdUwf36C11PLmpU9Lvq7tP5pfFBKAuCh
-
-#PUBLIC_KEY=yourpublickey
-#PUBLIC_KEY_FILE=/path/to/file
-#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
-#USER_PASSWORD_FILE=/path/to/file
-```
-
-#### Open-WebUI
-
-For [open-webui.env](infrastructure/services/open-webui/env/openwebui.env) file, you must change the secret key for the webui and configure its PostgreSQL backend.
-
-```sh
-WEBUI_SECRET_KEY=7d83b15a417d090ba5c6b899270a05dd215c60848354c0c7574226d6ff02f39e
-DATABASE_URL=postgresql://postgres:securepassword123@openwebui-postgres:5432/openwebui
-REDIS_URL=redis://:valkey_password@valkey:6379/0
-```
-
-Also update [openwebui-postgres.env](infrastructure/services/open-webui/env/openwebui-postgres.env) and [openwebui-valkey.env](infrastructure/services/open-webui/env/openwebui-valkey.env) with your own credentials.
-
-To download the model, through open-webui GUI or you can use the following command:
+After starting the stack, pull a model via the Open-WebUI GUI or with:
 
 ```sh
 docker exec -it ollama ollama run deepseek-r1:8b
 ```
 
-#### Dependency-Track
+#### Team Fortress 2 - Steam GSLT
 
-For [dependency-track.env](infrastructure/services/dependency-track/env/dependency-track.env) file, you need to set the database credentials and the API server URL.
+`make init` will remind you: set `SRCDS_TOKEN` in [teamfortress2.env](infrastructure/services/teamfortress2-server/teamfortress2/env/teamfortress2.env) with your token from [steamcommunity.com/dev/managegameservers](https://steamcommunity.com/dev/managegameservers).
+
+#### Dependency-Track - first login
+
+Default credentials are `admin` / `admin` - **change them on first login**.
+
+#### Forgejo - installation lock
+
+After the first-run installation wizard completes, set in [forgejo.env](infrastructure/services/forgejo/env/forgejo.env.example):
 
 ```sh
-POSTGRES_USER=dtrack
-POSTGRES_PASSWORD=<your_password>
-POSTGRES_DB=dtrack_db
-ALPINE_DATA_DIRECTORY=/data
+FORGEJO__security__INSTALL_LOCK=true
 ```
 
-The frontend is available at `https://dependency-track.bensuperpc.org` and the API server at `/api/*`. Default credentials are `admin` / `admin`, **change them on first login**.
-
 ### Homepage
 
 You can change the homepage config in these files:
@@ -319,16 +227,6 @@ You can change the homepage config in these files:
 - [settings.yaml](infrastructure/services/homepage/config/settings.yaml)
 - [widgets.yaml](infrastructure/services/homepage/config/widgets.yaml)
 
-### Forgejo
-
-For Forgejo installation, you must change the password(s) and user in [forgejo_db.env](infrastructure/services/forgejo/env/forgejo_db.env) file and [forgejo.env](infrastructure/services/forgejo/env/forgejo.env) file.
-
-Once the installation is complete, you need to set the installation lock:
-
-```sh
-FORGEJO__security__INSTALL_LOCK=true
-```
-
 ### Forgejo Runner (Out of date)
 
 ```sh
@@ -436,29 +334,6 @@ AUTO_HTTPS_OPTIONS=ignore_loaded_certs
 
 And remove all the `import authelia_middleware` in the caddyfiles, authelia need https to work.
 
-#### Wordpress
-
-For the [wordpress.env](infrastructure/services/wordpress/env/wordpress.env) file, you need to change the password and user for the database.
-
-```sh
-WORDPRESS_DB_USER=bensuperpc
-WORDPRESS_DB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
-```
-
-For [wordpress_db.env](infrastructure/services/wordpress/env/wordpress_db.env) file, you need to change the password(s) and user for the database.
-
-```sh
-MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-MARIADB_USER=bensuperpc
-MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
-```
-
-For [wordpress_backup.env](infrastructure/services/wordpress/env/wordpress_backup.env) file, you need to change the password(s) for the restic backup.
-
-```sh
-RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-```
-
 ## Sources
 
 - [Wordpress](https://wordpress.org/)

infrastructure/docker-compose.yml

@@ -65,3 +65,5 @@ include:
   - services/localai/docker-compose.localai.yml
 # Bentopdf
   - services/bentopdf/docker-compose.bentopdf.yml
+# Code-server
+  - services/code-server/docker-compose.vscode-server.yml

infrastructure/services/7daystodie-server/7daystodie/docker-compose.7daystodie.yml

@@ -1,7 +1,7 @@
 services:
   # 7 days to die server
   7daystodie_server:
-    image: vinanrra/7dtd-server:latest
+    image: vinanrra/7dtd-server:${SEVENDAYSTODIE_DOCKER_TAG:-latest}
     container_name: 7daystodie_server
     profiles:
       - 7daystodie_server

infrastructure/services/7daystodie-server/backup/docker-compose.backup.yml

@@ -1,19 +1,19 @@
 services:
   7daystodie_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
     container_name: 7daystodie_backup
     profiles:
       - 7daystodie_backup
     depends_on:
       - 7daystodie_server
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
     env_file:
       - ./env/7daystodie_backup.env
     volumes:
       - 7daystodie_backup:/mnt/restic
       - 7daystodie_server_save:/data:ro
-    security_opt:
-      - no-new-privileges:true
     network_mode: none
     cap_drop:
       - NET_ADMIN

infrastructure/services/7daystodie-server/backup/env/7daystodie_backup.env

@@ -1,14 +0,0 @@
-#RUN_ON_STARTUP=true
-RESTIC_REPOSITORY=/mnt/restic
-RESTIC_BACKUP_SOURCES=/data
-RESTIC_PASSWORD=SCY5cmu12Odca302EXabPA9jXYkCb2NN
-# Backup (exuclusive with Check and Prune)
-BACKUP_CRON=*/15 * * * *
-RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
-#RESTIC_FORGET_ARGS=--prune --keep-last 8 --keep-daily 7 --keep-weekly 5 --keep-monthly 12 --keep-yearly 4
-# Check (exuclusive with Check and Prune)
-#CHECK_CRON=*/15 * * * *
-#RESTIC_CHECK_ARGS=--read-data-subset=40%
-# Prune (exuclusive with Check and Prune)
-#PRUNE_CRON=*/15 * * * *
-#RESTIC_PRUNE_ARGS=

infrastructure/services/7daystodie-server/backup/env/7daystodie_backup.env.example

@@ -1,10 +1,10 @@
 #RUN_ON_STARTUP=true
 RESTIC_REPOSITORY=/mnt/restic
 RESTIC_BACKUP_SOURCES=/data
-RESTIC_PASSWORD=7xymiWBH4c56rlBXPXbgkxF2zw3f2AGs
+RESTIC_PASSWORD=__GENERATE_7DTD_RESTIC_PASSWORD__
 # Backup (exuclusive with Check and Prune)
-RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
 BACKUP_CRON=*/15 * * * *
+RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
 #RESTIC_FORGET_ARGS=--prune --keep-last 8 --keep-daily 7 --keep-weekly 5 --keep-monthly 12 --keep-yearly 4
 # Check (exuclusive with Check and Prune)
 #CHECK_CRON=*/15 * * * *

infrastructure/services/argus/docker-compose.argus.yml

@@ -1,7 +1,7 @@
 services:
   # argus
   argus:
-    image: releaseargus/argus:latest
+    image: releaseargus/argus:${ARGUS_DOCKER_TAG:-latest}
     container_name: argus
     profiles:
       - argus

infrastructure/services/authelia/config/configuration.yml

@@ -10,6 +10,9 @@ authentication_backend:
   file:
     path: /config/users_database.yml
 
+# totp:
+#   issuer: bensuperpc.org
+
 access_control:
   default_policy: deny
   rules:
@@ -69,3 +72,7 @@ storage:
 notifier:
   filesystem:
     filename: /config/notification.txt
+  # smtp:
+  #   address: "submission://smtp.example.com:587"
+  #   username: bensuperpc
+  #   sender: "Authelia <authelia@bensuperpc.org>"

infrastructure/services/authelia/docker-compose.authelia.yml

@@ -1,41 +1,41 @@
 services:
   authelia:
     container_name: authelia    
-    image: authelia/authelia:latest
+    image: authelia/authelia:${AUTHELIA_DOCKER_TAG:-4.39.20}
     profiles:
       - authelia
       - caddy
     depends_on:
       authelia-postgres:
         condition: service_healthy
+    extends:
+      file: ../common.yml
+      service: service-base
     # environment:
     #   - TZ=America/New_York
 #       - PUID=${PUID:-1000}
 #       - PGID=${PGID:-1000}
     env_file:
       - ./env/authelia.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     volumes:
       - ./config:/config
     networks:
       - caddy-infra
       - authelia-internal
-    restart: on-failure:7
 
   authelia-postgres:
-    image: postgres:17-alpine
+    image: postgres:${AUTHELIA_POSTGRES_DOCKER_TAG:-18.4-alpine3.24}
     container_name: authelia-postgres
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     volumes:
-      - authelia_db_data:/var/lib/postgresql/data
+      - authelia_db_data:/var/lib/postgresql
     env_file:
       - ./env/authelia_postgres.env
     profiles:
       - authelia
       - caddy
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}" ]
       interval: 5s

infrastructure/services/authelia/env/authelia.env

@@ -1,7 +0,0 @@
-AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET=ht87MVnXkXhBpDkMUHqKDqdg8UGBJt+Fx5jNIqXnN2k=
-AUTHELIA_SESSION_SECRET=nsvbXKGRXVZUCUkOapntlq/Zh+d75WacTK5Jgyh8zYk=
-AUTHELIA_STORAGE_ENCRYPTION_KEY=aWeIT74xIhGVd9nUOr4YTToTl5rpBEbzc/fv4jemuos=
-AUTHELIA_STORAGE_POSTGRES_ADDRESS=tcp://authelia-postgres:5432
-AUTHELIA_STORAGE_POSTGRES_DATABASE=authelia_db
-AUTHELIA_STORAGE_POSTGRES_USERNAME=authelia
-AUTHELIA_STORAGE_POSTGRES_PASSWORD=sAdkxFW6k3GiMOrlBpl6OV76eb9cQz/uk95jmA2UpI8=

infrastructure/services/authelia/env/authelia.env.example

@@ -0,0 +1,8 @@
+AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET=__GENERATE_AUTHELIA_JWT_SECRET__
+AUTHELIA_SESSION_SECRET=__GENERATE_AUTHELIA_SESSION_SECRET__
+AUTHELIA_STORAGE_ENCRYPTION_KEY=__GENERATE_AUTHELIA_STORAGE_ENCRYPTION_KEY__
+AUTHELIA_STORAGE_POSTGRES_ADDRESS=tcp://authelia-postgres:5432
+AUTHELIA_STORAGE_POSTGRES_DATABASE=authelia_db
+AUTHELIA_STORAGE_POSTGRES_USERNAME=authelia
+AUTHELIA_STORAGE_POSTGRES_PASSWORD=__GENERATE_AUTHELIA_DB_PASSWORD__
+#AUTHELIA_NOTIFIER_SMTP_PASSWORD=your-smtp-password-here

infrastructure/services/authelia/env/authelia_postgres.env

@@ -1,3 +0,0 @@
-POSTGRES_USER=authelia
-POSTGRES_PASSWORD=sAdkxFW6k3GiMOrlBpl6OV76eb9cQz/uk95jmA2UpI8=
-POSTGRES_DB=authelia_db

infrastructure/services/authelia/env/authelia_postgres.env.example

@@ -0,0 +1,3 @@
+POSTGRES_USER=authelia
+POSTGRES_PASSWORD=__GENERATE_AUTHELIA_DB_PASSWORD__
+POSTGRES_DB=authelia_db

infrastructure/services/bentopdf/docker-compose.bentopdf.yml

@@ -3,7 +3,7 @@ services:
     extends:
       file: ../common.yml
       service: service-base
-    image: ghcr.io/alam00000/bentopdf-simple:latest
+    image: ghcr.io/alam00000/bentopdf-simple:${BENTOPDF_DOCKER_TAG:-latest}
     container_name: bentopdf
     profiles:
       - bentopdf

infrastructure/services/caddy/config/Caddyfile

@@ -47,3 +47,4 @@ import website/dozzle.caddy
 import website/litellm.caddy
 import website/localai.caddy
 import website/bentopdf.caddy
+import website/vscode.caddy

infrastructure/services/caddy/config/website/vscode.caddy

@@ -0,0 +1,6 @@
+{$SCHEME}://vscode.{$MAIN_DOMAIN} {
+	import authelia_middleware
+	reverse_proxy {$VSCODE_SERVER_ADDRESS} {
+		header_up Host {upstream_hostport}
+	}
+}

infrastructure/services/caddy/docker-compose.caddy.yml

@@ -2,14 +2,13 @@ services:
   # Caddy
   caddy:
     #image: bensuperpc/caddy-l4:latest
-    image: caddy:latest
+    image: caddy:${CADDY_DOCKER_TAG:-latest}
     container_name: caddy
     profiles:
       - caddy
     depends_on:
       main_infrastructure:
         condition: service_completed_successfully
-    restart: on-failure:7
     ports:
       - 80:80/tcp
       - 80:80/udp
@@ -32,10 +31,9 @@ services:
       - caddy-web
     env_file:
       - ./env/caddy.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
-    security_opt:
-      - no-new-privileges:true
+    extends:
+      file: ../common.yml
+      service: service-base
     healthcheck:
       test: pidof caddy || exit 1
       interval: 120s
@@ -43,7 +41,7 @@ services:
       retries: 3
 
   caddy_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
     container_name: caddy_backup
     profiles:
       - caddy

infrastructure/services/caddy/env/caddy.env.example

@@ -25,6 +25,7 @@ AUTHELIA_ADDRESS=authelia:9091
 DOZZLE_ADDRESS=dozzle:8080
 LOCALAI_ADDRESS=localai:8080
 BENTOPDF_ADDRESS=bentopdf:8080
+VSCODE_SERVER_ADDRESS=vscode-server:8443
 # Scheme
 SCHEME=https
 # ignore_loaded_certs off

infrastructure/services/caddy/env/caddy_backup.env.example

@@ -1,7 +1,7 @@
 #RUN_ON_STARTUP=true
 RESTIC_REPOSITORY=/mnt/restic
 RESTIC_BACKUP_SOURCES=/data
-RESTIC_PASSWORD=YFQh8v3Wi95v0p6h88D4u8C8z4gLfdMw
+RESTIC_PASSWORD=__GENERATE_CADDY_RESTIC_PASSWORD__
 # Backup (exuclusive with Check and Prune)
 BACKUP_CRON=*/30 * * * *
 RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose

infrastructure/services/code-server/docker-compose.vscode-server.yml

@@ -0,0 +1,36 @@
+services:
+  # vscode-server
+  vscode-server:
+    extends:
+      file: ../common.yml
+      service: service-base
+    image: lscr.io/linuxserver/code-server:${VSCODE_SERVER_DOCKER_TAG:-latest}
+    container_name: vscode-server
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
+    env_file:
+      - ./env/vscode-server.env
+    profiles:
+      - vscode-server
+    depends_on:
+      - caddy
+    volumes:
+      - vscode-server_config:/config:rw
+      - public_data:/public_data:rw
+      - private_data:/private_data:rw
+    networks:
+      - caddy-dev
+
+networks:
+  caddy-dev:
+    driver: bridge
+    name: caddy-dev
+
+volumes:
+  vscode-server_config:
+    name: vscode-server_config
+  private_data:
+    name: private_data
+  public_data:
+    name: public_data

infrastructure/services/code-server/env/vscode-server.env.example

@@ -0,0 +1,4 @@
+SUDO_PASSWORD=__GENERATE_SUDO_VSCODE_SERVER_PASSWORD__
+PASSWORD=__GENERATE_VSCODE_SERVER_PASSWORD__
+PROXY_DOMAIN=vscode.bensuperpc.org
+DOCKER_MODS=linuxserver/mods:code-server-python3

infrastructure/services/cyberchef/docker-compose.cyberchef.yml

@@ -1,36 +1,32 @@
 services:
   # cyberchef
   cyberchef0:
-    image: mpepping/cyberchef:latest
+    extends:
+      file: ../common.yml
+      service: service-base
+    image: mpepping/cyberchef:${CYBERCHEF_DOCKER_TAG:-latest}
     container_name: cyberchef0
     profiles:
       - cyberchef
-    restart: on-failure:7
     depends_on:
       - caddy
     networks:
       - caddy-tools
     read_only: false
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - SYS_ADMIN
 
   cyberchef1:
-    image: mpepping/cyberchef:latest
+    extends:
+      file: ../common.yml
+      service: service-base
+    image: mpepping/cyberchef:${CYBERCHEF_DOCKER_TAG:-latest}
     container_name: cyberchef1
     profiles:
       - cyberchef
-    restart: on-failure:7
     depends_on:
       - caddy
     networks:
       - caddy-tools
     read_only: false
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - SYS_ADMIN
 
 networks:
   caddy-tools:

infrastructure/services/dependency-track/docker-compose.dependency-track.yml

@@ -1,6 +1,6 @@
 services:
   dependency-track-apiserver:
-    image: dependencytrack/apiserver
+    image: dependencytrack/apiserver:${DEPENDENCY_TRACK_API_DOCKER_TAG:-latest}
     container_name: dependency-track-apiserver
     profiles:
       - dependency-track
@@ -9,7 +9,9 @@ services:
         condition: service_healthy
     env_file:
       - ./env/dependency-track.env
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     networks:
       - caddy-web
       - dependency-track-internal
@@ -17,11 +19,13 @@ services:
     - 'dtrack-data:/data'
 
   dependency-track-frontend:
-    image: dependencytrack/frontend
+    image: dependencytrack/frontend:${DEPENDENCY_TRACK_FRONTEND_DOCKER_TAG:-latest}
     container_name: dependency-track-frontend
     profiles:
       - dependency-track
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     networks:
       - caddy-web
       - dependency-track-internal
@@ -30,19 +34,19 @@ services:
         condition: service_healthy
       caddy:
         condition: service_healthy
-    security_opt:
-      - no-new-privileges:true
     env_file:
       - ./env/dependency-track.env
 
   dependency-track-postgres:
-    image: postgres:17-alpine
+    image: postgres:${DEPENDENCY_TRACK_POSTGRES_DOCKER_TAG:-17-alpine}
     container_name: dependency-track-postgres
     profiles:
       - dependency-track
     env_file:
       - ./env/postgres.env
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     networks:
       - dependency-track-internal
     healthcheck:

infrastructure/services/dependency-track/env/dependency-track.env.example

@@ -2,6 +2,6 @@ ALPINE_DATABASE_MODE="external"
 ALPINE_DATABASE_URL="jdbc:postgresql://dependency-track-postgres:5432/dtrack"
 ALPINE_DATABASE_DRIVER="org.postgresql.Driver"
 ALPINE_DATABASE_USERNAME="dtrack"
-ALPINE_DATABASE_PASSWORD="dtrack"
+ALPINE_DATABASE_PASSWORD="__GENERATE_DTRACK_DB_PASSWORD__"
 
 API_BASE_URL="https://dependency-track.bensuperpc.org"

infrastructure/services/dependency-track/env/postgres.env

@@ -1,3 +0,0 @@
-POSTGRES_DB="dtrack"
-POSTGRES_USER="dtrack"
-POSTGRES_PASSWORD="dtrack"

infrastructure/services/dependency-track/env/postgres.env.example

@@ -0,0 +1,3 @@
+POSTGRES_DB="dtrack"
+POSTGRES_USER="dtrack"
+POSTGRES_PASSWORD="__GENERATE_DTRACK_DB_PASSWORD__"

infrastructure/services/dozzle/config/users.yml

@@ -1,7 +1,8 @@
 users:
-  bensuperpc:
-    email: bensuperpc@gmail.com
-    name: bensuperpc
+  admin:
+    email: me@email.net
+    name: admin
+    # docker run -it --rm amir20/dozzle generate admin --password password --email me@email.net --name "admin"
     password: $2a$11$w56N4NICh5xD5Bbq6Z2Z2ef9/QUaa/YKleMiawn/Bru9hYsQOJyrm
     filter: ""
     roles: ""

infrastructure/services/dozzle/docker-compose.dozzle.yml

@@ -1,6 +1,6 @@
 services:
   dozzle:
-    image: amir20/dozzle:latest
+    image: amir20/dozzle:${DOZZLE_DOCKER_TAG:-latest}
     container_name: dozzle
     profiles:
       - dozzle
@@ -22,7 +22,7 @@ services:
       - dozzle-internal
     
   dozzle-dockerproxy:
-    image: tecnativa/docker-socket-proxy:latest
+    image: tecnativa/docker-socket-proxy:${DOCKER_SOCKET_PROXY_DOCKER_TAG:-latest}
     container_name: dozzle-dockerproxy
     profiles:
       - dozzle

infrastructure/services/dufs/docker-compose.dufs.yml

@@ -1,12 +1,14 @@
 services:
   # dufs
   dufs:
-    image: sigoden/dufs:latest
+    image: sigoden/dufs:${DUFS_DOCKER_TAG:-latest}
     container_name: dufs
     profiles:
       - dufs
 #    user: ${PUID:-1000}:${PGID:-1000} 
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     depends_on:
       - caddy
     env_file:
@@ -15,8 +17,6 @@ services:
       - public_data:/data
     networks:
       - caddy-files
-    security_opt:
-      - no-new-privileges:true
 
 volumes:
   public_data:

infrastructure/services/dufs/env/dufs.env.example

@@ -4,4 +4,4 @@ DUFS_SERVE_PATH=/data
 DUFS_HIDDEN=tmp,*.log,*.lock
 DUFS_ALLOW_ALL=true
 DUFS_COMPRESS=medium
-DUFS_AUTH="admin:heqihlOfBmJDESGFlpbPi7P7Mi6F7RkV@/:rw|@/:ro"
+DUFS_AUTH="admin:__GENERATE_DUFS_PASSWORD__@/:rw|@/:ro"

infrastructure/services/forgejo/docker-compose.forgejo.yml

@@ -1,7 +1,7 @@
 services:
   # forgejo
   forgejo:
-    image: codeberg.org/forgejo/forgejo:15
+    image: codeberg.org/forgejo/forgejo:${FORGEJO_DOCKER_TAG:-15}
     container_name: forgejo
     profiles:
       - forgejo
@@ -26,13 +26,15 @@ services:
   
   # Database forgejo
   database_forgejo:
-    image: mariadb:latest
+    image: mariadb:${FORGEJO_DB_DOCKER_TAG:-latest}
     container_name: database_forgejo
     profiles:
       - forgejo
     depends_on:
       - caddy
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     volumes:
       - forgejo_db:/var/lib/mysql:rw
     env_file:
@@ -40,12 +42,10 @@ services:
     command: '--default-authentication-plugin=mysql_native_password'
     networks:
       - forgejo-internal
-    security_opt:
-      - no-new-privileges:true
 
   # forgejo-runner
   docker-in-docker:
-    image: code.forgejo.org/oci/docker:dind
+    image: code.forgejo.org/oci/docker:${FORGEJO_DIND_DOCKER_TAG:-dind}
     container_name: 'docker_dind'
     hostname: docker
     networks:
@@ -60,7 +60,7 @@ services:
       - forgejo_certs:/certs
 
   forgejo_runner:
-    image: data.forgejo.org/forgejo/runner:12
+    image: data.forgejo.org/forgejo/runner:${FORGEJO_RUNNER_DOCKER_TAG:-12}
     networks:
       - forgejo-internal
     profiles:

infrastructure/services/forgejo/env/forgejo.env.example

@@ -4,7 +4,7 @@ FORGEJO__database__DB_TYPE=mysql
 FORGEJO__database__HOST=database_forgejo:3306
 FORGEJO__database__NAME=forgejo
 FORGEJO__database__USER=bensuperpc
-FORGEJO__database__PASSWD=ZcuHcM9tnIEM7EEO7R5jCpEt6v1d6r7s
+FORGEJO__database__PASSWD=__GENERATE_FORGEJO_DB_PASSWORD__
 FORGEJO__APP_NAME=Bensuperpc's Forgejo
 FORGEJO__APP_SLOGAN=Personal Code, Mirrors, and More
 FORGEJO__server__DOMAIN=git.bensuperpc.org
@@ -13,7 +13,7 @@ FORGEJO__server__HTTP_PORT=3000
 FORGEJO__server__SSH_LISTEN_PORT=2222
 FORGEJO__server__SSH_PORT=22
 FORGEJO__server__ROOT_URL=https://git.bensuperpc.org
-FORGEJO__security__SECRET_KEY=7IWrMh7mC7UMo1SowvUsAT2LOX49eU6P
+FORGEJO__security__SECRET_KEY=__GENERATE_FORGEJO_SECRET_KEY__
 #FORGEJO__security__INTERNAL_TOKEN=
 FORGEJO__security__INSTALL_LOCK=true
 FORGEJO__security__MIN_PASSWORD_LENGTH=8

infrastructure/services/forgejo/env/forgejo_db.env

@@ -1,4 +0,0 @@
-MARIADB_ROOT_PASSWORD=ZI8Trbot3b8WGqE5AKj1yphKMu4v9qQw
-MARIADB_USER=bensuperpc
-MARIADB_PASSWORD=ZcuHcM9tnIEM7EEO7R5jCpEt6v1d6r7s
-MARIADB_DATABASE=forgejo

infrastructure/services/forgejo/env/forgejo_db.env.example

@@ -0,0 +1,4 @@
+MARIADB_ROOT_PASSWORD=__GENERATE_FORGEJO_DB_ROOT_PASSWORD__
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=__GENERATE_FORGEJO_DB_PASSWORD__
+MARIADB_DATABASE=forgejo

infrastructure/services/homepage/config/services.yaml

@@ -152,6 +152,13 @@
         # ping: transmission.bensuperpc.org
         container: transmission
         server: my-docker
+    - vscode-server:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/vscode.png
+        href: https://vscode.bensuperpc.org/
+        description: VS Code Server
+        # ping: vscode.bensuperpc.org
+        container: vscode-server
+        server: my-docker
 
 - Games:
     - minecraft:

infrastructure/services/homepage/docker-compose.homepage.yml

@@ -1,11 +1,13 @@
 services:
   # homepage
   homepage:
-    image: ghcr.io/gethomepage/homepage:latest
+    image: ghcr.io/gethomepage/homepage:${HOMEPAGE_DOCKER_TAG:-latest}
     container_name: homepage
     profiles:
       - homepage
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
 #    environment:
 #      - PUID=${PUID:-1000}
 #      - PGID=${PGID:-1000}
@@ -14,8 +16,6 @@ services:
       - homepage-dockerproxy
     env_file:
       - ./env/homepage.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     volumes:
       - homepage_log:/app/logs
       - ./config:/app/config
@@ -23,11 +23,8 @@ services:
     networks:
       - caddy-infra
       - homepage-internal
-    security_opt:
-      - no-new-privileges:true
-
   homepage-dockerproxy:
-    image: tecnativa/docker-socket-proxy:latest
+    image: tecnativa/docker-socket-proxy:${DOCKER_SOCKET_PROXY_DOCKER_TAG:-latest}
     container_name: homepage-dockerproxy
     profiles:
       - homepage

infrastructure/services/it-tools/docker-compose.it-tools.yml

@@ -4,7 +4,7 @@ services:
     extends:
       file: ../common.yml
       service: service-base
-    image: ghcr.io/sharevb/it-tools:latest
+    image: ghcr.io/sharevb/it-tools:${IT_TOOLS_DOCKER_TAG:-latest}
     container_name: it-tools0
     profiles:
       - it-tools
@@ -18,7 +18,7 @@ services:
     extends:
       file: ../common.yml
       service: service-base
-    image: ghcr.io/sharevb/it-tools:latest
+    image: ghcr.io/sharevb/it-tools:${IT_TOOLS_DOCKER_TAG:-latest}
     container_name: it-tools1
     profiles:
       - it-tools

infrastructure/services/jellyfin/docker-compose.jellyfin.yml

@@ -1,11 +1,13 @@
 services:
   # Jellyfin
   jellyfin:
-    image: lscr.io/linuxserver/jellyfin:latest
+    image: lscr.io/linuxserver/jellyfin:${JELLYFIN_DOCKER_TAG:-latest}
     container_name: jellyfin
     profiles:
       - jellyfin
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
@@ -24,8 +26,6 @@ services:
       - /dev/dri:/dev/dri
     networks:
       - caddy-media
-    security_opt:
-      - no-new-privileges:true
 
 volumes:
   jellyfin_config:

infrastructure/services/localai/docker-compose.localai.yml

@@ -7,13 +7,13 @@ services:
     container_name: localai
     profiles:
       - localai
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     depends_on:
       - caddy
     env_file:
       - ./env/localai.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     volumes:
       - localai_data:/data
       - localai_models:/models
@@ -21,8 +21,6 @@ services:
       - localai_config:/config
     networks:
       - caddy-ai
-    security_opt:
-      - no-new-privileges:true
 
 volumes:
   localai_models:

infrastructure/services/main/docker-compose.main.yml

@@ -1,15 +1,16 @@
 services:
   main_infrastructure:
     container_name: main_infrastructure
-    image: alpine:latest
+    image: alpine:${ALPINE_DOCKER_TAG:-latest}
     profiles:
       - main_infrastructure
     volumes:
       - public_data:/public_data:rw
       - private_data:/private_data:rw
     read_only: true
-    security_opt:
-      - no-new-privileges:true
+    extends:
+      file: ../common.yml
+      service: service-base
     cap_drop:
       - ALL
     cap_add:
@@ -22,7 +23,7 @@ services:
     container_name: watchtower
     profiles:
       - main_infrastructure
-    image: nickfedor/watchtower:latest
+    image: nickfedor/watchtower:${WATCHTOWER_DOCKER_TAG:-latest}
     environment:
       - TZ=${TZ:-Europe/Paris}
     volumes:

infrastructure/services/memos/docker-compose.memos.yml

@@ -1,11 +1,13 @@
 services:
   # memos
   memos:
-    image: neosmemo/memos:latest
+    image: neosmemo/memos:${MEMOS_DOCKER_TAG:-latest}
     container_name: memos
     profiles:
       - memos
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     depends_on:
       - caddy
     env_file:
@@ -14,8 +16,6 @@ services:
       - memos_config:/var/opt/memos
     networks:
       - caddy-tools
-    security_opt:
-      - no-new-privileges:true
 
 volumes:
   memos_config:

infrastructure/services/minecraft-server/backup/docker-compose.backup.yml

@@ -1,21 +1,21 @@
 services:
   minecraft_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
     container_name: minecraft_backup
     profiles:
       - minecraft_backup
     depends_on:
       - mc-server
       - minecraft_proxy
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
     env_file:
       - ./env/backup.env
     volumes:
       - minecraft_server_backup:/mnt/restic
       - minecraft_server_data:/data/minecraft_server_data:ro
       - minecraft_proxy_data:/data/minecraft_proxy_data:ro
-    security_opt:
-      - no-new-privileges:true
     network_mode: none
     cap_drop:
       - NET_ADMIN

infrastructure/services/minecraft-server/backup/env/backup.env.example

@@ -1,10 +1,10 @@
 #RUN_ON_STARTUP=true
 RESTIC_REPOSITORY=/mnt/restic
 RESTIC_BACKUP_SOURCES=/data
-RESTIC_PASSWORD=SCY5cmu12Odca302EXabPA9jXYkCb2NN
+RESTIC_PASSWORD=__GENERATE_MINECRAFT_RESTIC_PASSWORD__
 # Backup (exuclusive with Check and Prune)
-BACKUP_CRON=*/15 * * * *
 RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
+BACKUP_CRON=*/15 * * * *
 #RESTIC_FORGET_ARGS=--prune --keep-last 8 --keep-daily 7 --keep-weekly 5 --keep-monthly 12 --keep-yearly 4
 # Check (exuclusive with Check and Prune)
 #CHECK_CRON=*/15 * * * *

infrastructure/services/minecraft-server/minecraft-server/docker-compose.minecraft.yml

@@ -1,6 +1,6 @@
 services:
   minecraft_proxy:
-    image: itzg/bungeecord:latest
+    image: itzg/mc-proxy:${MINECRAFT_PROXY_DOCKER_TAG:-java25}
     container_name: minecraft_proxy_server
     profiles:
       - minecraft_proxy
@@ -26,7 +26,7 @@ services:
       - minecraft-network
 
   mc-server:
-    image: itzg/minecraft-server:latest
+    image: itzg/minecraft-server:${MINECRAFT_SERVER_DOCKER_TAG:-java25}
     container_name: minecraft_server
     profiles:
       - minecraft_server

infrastructure/services/minecraft-server/minecraft-server/env/proxy.env.example

@@ -1,12 +1,12 @@
 TYPE=VELOCITY
-VELOCITY_VERSION=3.5.0-SNAPSHOT
-VELOCITY_BUILD_ID=594
+VELOCITY_VERSION=4.0.0-SNAPSHOT
+VELOCITY_BUILD_ID=5
 #PLUGINS=
 #SPIGET_PLUGINS=
 DEBUG=false
 DEBUG_HELPER=false
 ENABLE_RCON=false
-#RCON_PASSWORD=6hxU3Oxmh2Q8e6S9fjkdWJik
+#RCON_PASSWORD=__GENERATE_MINECRAFT_PROXY_RCON_PASSWORD__
 #RCON_PORT=25576
 INIT_MEMORY=512M
 MAX_MEMORY=1536M

infrastructure/services/minecraft-server/minecraft-server/env/server.env.example

@@ -11,8 +11,8 @@ ENFORCE_SECURE_PROFILE=false
 
 # Server jar options
 TYPE=PURPUR
-VERSION=1.21.11
-PURPUR_BUILD=2568
+VERSION=26.2
+PURPUR_BUILD=2608
 FORCE_REDOWNLOAD=false
 BUILD_FROM_SOURCE=false
 
@@ -64,7 +64,7 @@ ALLOW_FLIGHT=false
 
 # RCON options
 ENABLE_RCON=false
-RCON_PASSWORD=6hxU3Oxmh2Q8e6S9fjkdWJik
+RCON_PASSWORD=__GENERATE_MINECRAFT_RCON_PASSWORD__
 RCON_PORT=25575
 BROADCAST_CONSOLE_TO_OPS=true
 BROADCAST_RCON_TO_OPS=true
@@ -78,4 +78,3 @@ SNOOPER_ENABLED=true
 ENABLE_STATUS=true
 PREVIEWS_CHAT=false
 #SYNC_CHUNK_WRITES=true
-

infrastructure/services/omni-tools/docker-compose.omni-tools.yml

@@ -2,7 +2,7 @@ x-omni-tools: &omni-tools
   extends:
     file: ../common.yml
     service: service-base
-  image: iib0011/omni-tools:latest
+  image: iib0011/omni-tools:${OMNI_TOOLS_DOCKER_TAG:-latest}
   profiles:
     - omni-tools
   depends_on:

infrastructure/services/open-webui/docker-compose.open-webui.yml

@@ -2,14 +2,16 @@ name: openwebui
 
 services:
   ollama:
-    image: ollama/ollama:${OLLAMA_DOCKER_TAG:-0.30.11}
+    image: ollama/ollama:${OLLAMA_DOCKER_TAG:-0.31.2}
     container_name: ollama
     profiles:
       - openwebui
       - ollama
     depends_on:
       - caddy
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     tty: true
     volumes:
       - openwebui-ollama:/root/.ollama
@@ -17,10 +19,6 @@ services:
     #   - ${OLLAMA_PORT:-11434}:11434
     env_file:
       - ./env/openwebui-ollama.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
-    security_opt:
-      - no-new-privileges:true
     networks:
       - openwebui-internal
     # devices:
@@ -28,24 +26,22 @@ services:
     #   - /dev/kfd
 
   litellm:
-    image: ghcr.io/berriai/litellm:${LITELLM_DOCKER_TAG:-v1.89.6}
+    image: ghcr.io/berriai/litellm:${LITELLM_DOCKER_TAG:-v1.92.0}
     container_name: litellm
     profiles:
       - openwebui
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     depends_on:
       litellm-postgres:
         condition: service_healthy
     env_file:
       - ./env/litellm.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     command: ["--port", "4000", "--detailed_debug"] 
     networks:
       - caddy-ai
       - openwebui-internal
-    security_opt:
-      - no-new-privileges:true
 
   litellm-postgres:
     image: postgres:${POSTGRES_DOCKER_TAG:-18.4-alpine3.24}
@@ -54,11 +50,11 @@ services:
       - openwebui
     env_file:
       - ./env/litellm-postgres.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     volumes:
       - litellm-postgres:/var/lib/postgresql
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     networks:
       - openwebui-internal
     healthcheck:
@@ -74,11 +70,11 @@ services:
       - openwebui
     env_file:
       - ./env/openwebui-postgres.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
+    extends:
+      file: ../common.yml
+      service: service-base
     volumes:
       - openwebui-postgres:/var/lib/postgresql
-    restart: on-failure:7
     networks:
       - openwebui-internal
     healthcheck:
@@ -88,10 +84,13 @@ services:
       retries: 5
 
   openwebui:
-    image: ghcr.io/open-webui/open-webui:${WEBUI_DOCKER_TAG:-git-ecd48e2}
+    image: ghcr.io/open-webui/open-webui:${OPEN_WEBUI_DOCKER_TAG:-v0.10.2}
     container_name: openwebui
     profiles:
       - openwebui
+    extends:
+      file: ../common.yml
+      service: service-base
     volumes:
       - openwebui:/app/backend/data
     depends_on:
@@ -102,40 +101,37 @@ services:
       - valkey
     env_file:
       - ./env/openwebui.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     #  - UID=${PUID:-1000}
     #  - GID=${PGID:-1000}
     # ports:
     #   - ${OPEN_WEBUI_PORT:-3000}:8080
-    restart: on-failure:7
     networks:
       - caddy-ai
       - openwebui-internal
-    security_opt:
-      - no-new-privileges:true
 
   openwebui-pipelines:
     image: ghcr.io/open-webui/pipelines:${WEBUI_PIPELINE_DOCKER_TAG:-git-039f9c5}
     container_name: openwebui-pipelines
     profiles:
       - openwebui
+    extends:
+      file: ../common.yml
+      service: service-base
     networks:
       - openwebui-internal
     env_file:
       - ./env/openwebui-pipelines.env
-    restart: on-failure:7
     volumes:
       - openwebui-pipelines:/app/pipelines
-    security_opt:
-      - no-new-privileges:true
 
   qdrant:
     image: qdrant/qdrant:${QDRANT_DOCKER_TAG:-v1.18.2}
     profiles:
       - openwebui
     container_name: qdrant
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     # ports:
     #   - "6333:6333"
     #   - "6334:6334"
@@ -153,8 +149,12 @@ services:
       - openwebui
     env_file:
       - ./env/openwebui-valkey.env
-    restart: on-failure:7
-    command: valkey-server --requirepass ${VALKEY_PASSWORD:-valkey_password} --maxclients 10000 --timeout 1800
+    extends:
+      file: ../common.yml
+      service: service-base
+    # $$VALKEY_PASSWORD (not ${VALKEY_PASSWORD}) so it's expanded at container
+    # runtime from env_file, not at compose-parse time from the host shell.
+    command: sh -c 'exec valkey-server --requirepass "$$VALKEY_PASSWORD" --maxclients 10000 --timeout 1800'
     volumes:
       - openwebui-valkey:/data
     networks:

infrastructure/services/open-webui/env/litellm-postgres.env

@@ -1,3 +0,0 @@
-POSTGRES_USER=litellm_user
-POSTGRES_PASSWORD=fdbdfsgfdghgjhfjtjgdfssdgsfdg
-POSTGRES_DB=litellm_db

infrastructure/services/open-webui/env/litellm-postgres.env.example

@@ -0,0 +1,3 @@
+POSTGRES_USER=litellm_user
+POSTGRES_PASSWORD=__GENERATE_LITELLM_DB_PASSWORD__
+POSTGRES_DB=litellm_db

infrastructure/services/open-webui/env/litellm.env

@@ -1,11 +0,0 @@
-DATABASE_URL=postgresql://litellm_user:fdbdfsgfdghgjhfjtjgdfssdgsfdg@litellm-postgres:5432/litellm_db
-
-LITELLM_MASTER_KEY=a51d5a17f7b8f96128866c6bfc903ec0
-
-LITELLM_MODE=proxy
-UI_USERNAME=admin
-UI_PASSWORD=ffdsfsdsfdggdfsgdfhgfsgfsg
-PROXY_BASE_URL=https://litellm.bensuperpc.org
-
-#OPENAI_API_KEY=
-#ANTHROPIC_API_KEY=

infrastructure/services/open-webui/env/litellm.env.example

@@ -0,0 +1,11 @@
+DATABASE_URL=postgresql://litellm_user:__GENERATE_LITELLM_DB_PASSWORD__@litellm-postgres:5432/litellm_db
+
+LITELLM_MASTER_KEY=__GENERATE_LITELLM_MASTER_KEY__
+
+LITELLM_MODE=proxy
+UI_USERNAME=admin
+UI_PASSWORD=__GENERATE_LITELLM_UI_PASSWORD__
+PROXY_BASE_URL=https://litellm.bensuperpc.org
+
+#OPENAI_API_KEY=
+#ANTHROPIC_API_KEY=

infrastructure/services/open-webui/env/openwebui-pgadmin.env

@@ -1,4 +0,0 @@
-PGADMIN_DEFAULT_EMAIL=admin@local.ai
-PGADMIN_DEFAULT_PASSWORD=admin123
-PGADMIN_CONFIG_SERVER_MODE=False
-PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False

infrastructure/services/open-webui/env/openwebui-pgadmin.env.example

@@ -0,0 +1,4 @@
+PGADMIN_DEFAULT_EMAIL=admin@local.ai
+PGADMIN_DEFAULT_PASSWORD=__GENERATE_PGADMIN_PASSWORD__
+PGADMIN_CONFIG_SERVER_MODE=False
+PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False

infrastructure/services/open-webui/env/openwebui-pipelines.env

@@ -1 +0,0 @@
-PIPELINES_API_KEY=ssdfsfdsfdgfgfg

infrastructure/services/open-webui/env/openwebui-pipelines.env.example

@@ -0,0 +1 @@
+PIPELINES_API_KEY=__GENERATE_PIPELINES_API_KEY__

infrastructure/services/open-webui/env/openwebui-postgres.env

@@ -1,3 +0,0 @@
-POSTGRES_DB=openwebui
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=securepassword123

infrastructure/services/open-webui/env/openwebui-postgres.env.example

@@ -0,0 +1,3 @@
+POSTGRES_DB=openwebui
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=__GENERATE_OPENWEBUI_DB_PASSWORD__

infrastructure/services/open-webui/env/openwebui-qdrant.env

@@ -1,2 +0,0 @@
-QDRANT__SERVICE__API_KEY=qdrant_api_key
-QDRANT__SERVICE__ENABLE_API_KEY_AUTHORIZATION=true

infrastructure/services/open-webui/env/openwebui-qdrant.env.example

@@ -0,0 +1,2 @@
+QDRANT__SERVICE__API_KEY=__GENERATE_QDRANT_API_KEY__
+QDRANT__SERVICE__ENABLE_API_KEY_AUTHORIZATION=true

infrastructure/services/open-webui/env/openwebui-valkey.env

@@ -1 +0,0 @@
-VALKEY_PASSWORD=valkey_password

infrastructure/services/open-webui/env/openwebui-valkey.env.example

@@ -0,0 +1 @@
+VALKEY_PASSWORD=__GENERATE_VALKEY_PASSWORD__

infrastructure/services/open-webui/env/openwebui.env.example

@@ -1,10 +1,10 @@
 OLLAMA_BASE_URL=http://ollama:11434
 
 OPENAI_API_BASE_URL=http://litellm:4000/v1
-OPENAI_API_KEY=a51d5a17f7b8f96128866c6bfc903ec0
+OPENAI_API_KEY=__GENERATE_LITELLM_MASTER_KEY__
 
 # openssl rand -hex 32
-WEBUI_SECRET_KEY=7d83b15a417d090ba5c6b899270a05dd215c60848354c0c7574226d6ff02f39e
+WEBUI_SECRET_KEY=__GENERATE_OPENWEBUI_SECRET_KEY__
 
 #HF_HUB_OFFLINE=1
 # Disable analytics
@@ -16,7 +16,7 @@ ANONYMIZED_TELEMETRY=false
 #OPENAI_API_KEY=
 
 # Database configuration
-DATABASE_URL=postgresql://postgres:securepassword123@openwebui-postgres:5432/openwebui
+DATABASE_URL=postgresql://postgres:__GENERATE_OPENWEBUI_DB_PASSWORD__@openwebui-postgres:5432/openwebui
 DATABASE_POOL_SIZE=20
 DATABASE_POOL_MAX_OVERFLOW=10
 DATABASE_POOL_TIMEOUT=30
@@ -24,12 +24,12 @@ DATABASE_POOL_RECYCLE=1800
 
 VECTOR_DB=${VECTOR_DB:-qdrant}
 QDRANT_URI=http://qdrant:6333
-QDRANT_API_KEY=qdrant_api_key
+QDRANT_API_KEY=__GENERATE_QDRANT_API_KEY__
 
-REDIS_URL=redis://:valkey_password@valkey:6379/0
+REDIS_URL=redis://:__GENERATE_VALKEY_PASSWORD__@valkey:6379/0
 ENABLE_WEBSOCKET_SUPPORT=true
 WEBSOCKET_MANAGER=redis
-WEBSOCKET_REDIS_URL=redis://:valkey_password@valkey:6379/1?socket_timeout=86400
+WEBSOCKET_REDIS_URL=redis://:__GENERATE_VALKEY_PASSWORD__@valkey:6379/1?socket_timeout=86400
 # Fix issues with redis lib 8.0.0 and openwebUI 0.10.1
 WEBSOCKET_REDIS_OPTIONS={"socket_timeout":null}
 

infrastructure/services/openssh/docker-compose.openssh.yml

@@ -1,7 +1,7 @@
 services:
   # openssh
   openssh:
-    image: linuxserver/openssh-server:latest
+    image: linuxserver/openssh-server:${OPENSSH_DOCKER_TAG:-latest}
     container_name: openssh
     profiles:
       - openssh
@@ -30,12 +30,8 @@ services:
       - minecraft_server_backup:/minecraft_server_backup:rw
       - minecraft_server_data:/minecraft_server_data:rw
       - minecraft_proxy_data:/minecraft_proxy_data:rw
-      - forgejo_data:/forgejo_data:rw
-      - forgejo_db:/forgejo_db:rw
-      - teamfortress2_backup:/teamfortress2_backup:rw
-      - teamfortress2_data:/teamfortress2_data:rw
-      - argus_data:/argus_data:rw
       - qbittorrent_config:/qbittorrent_config:rw
+      - vscode-server_config:/vscode-server_config:rw
     networks:
       - openssh-network
     security_opt:
@@ -83,16 +79,11 @@ volumes:
     name: teamfortress2_backup
   teamfortress2_data:
     name: teamfortress2_data
-# forgejo
-  forgejo_data:
-    name: forgejo_data
-  forgejo_db:
-    name: forgejo_db
 # argus
-  argus_data:
-    name: argus_data
   qbittorrent_config:
     name: qbittorrent_config
+  vscode-server_config:
+    name: vscode-server_config
 
 networks:
   openssh-network:

infrastructure/services/openssh/env/openssh.env.example

@@ -4,7 +4,7 @@ DOCKER_MODS=linuxserver/mods:openssh-server-rsync
 #PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
 PUBLIC_KEY_DIR=/authorized_ssh_keys
 USER_NAME=admin
-USER_PASSWORD=it47mnLJIhNFspkYQo70zJsAYX7n0DSX
+USER_PASSWORD=__GENERATE_OPENSSH_USER_PASSWORD__
 
 #PUBLIC_KEY=yourpublickey
 #PUBLIC_KEY_FILE=/path/to/file

infrastructure/services/picoshare/docker-compose.picoshare.yml

@@ -1,26 +1,22 @@
 services:
   # picoshare
   picoshare:
-    image: mtlynch/picoshare:latest
+    extends:
+      file: ../common.yml
+      service: service-base
+    image: mtlynch/picoshare:${PICOSHARE_DOCKER_TAG:-latest}
     container_name: picoshare
     profiles:
       - picoshare
-    restart: on-failure:7
     depends_on:
       - caddy
     env_file:
       - ./env/picoshare.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     volumes:
       - picoshare_data:/data
     networks:
       - caddy-files
-    security_opt:
-      - no-new-privileges:true
     read_only: false
-    cap_drop:
-      - SYS_ADMIN
 #    tmpfs:
 #      - /tmp
 

infrastructure/services/picoshare/env/picoshare.env

@@ -1,3 +0,0 @@
-PS_SHARED_SECRET=CBuS4DJLqIe93xF1KGYRrnhxUFBqLD2n
-PORT=4001
-PS_BEHIND_PROXY=true

infrastructure/services/picoshare/env/picoshare.env.example

@@ -0,0 +1,3 @@
+PS_SHARED_SECRET=__GENERATE_PICOSHARE_SHARED_SECRET__
+PORT=4001
+PS_BEHIND_PROXY=true

infrastructure/services/privatebin/docker-compose.privatebin.yml

@@ -1,22 +1,20 @@
 services:
   # privatebin
   privatebin:
-    image: privatebin/nginx-fpm-alpine:latest
+    image: privatebin/nginx-fpm-alpine:${PRIVATEBIN_DOCKER_TAG:-latest}
     container_name: privatebin
     profiles:
       - privatebin
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     depends_on:
       - caddy
     volumes:
       - privatebin_data:/srv/data
       - ./config/conf.php:/srv/cfg/conf.php:ro
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     networks:
       - caddy-tools
-    security_opt:
-      - no-new-privileges:true
     read_only: true
 
 volumes:

infrastructure/services/projectsend/docker-compose.projectsend.yml

@@ -1,11 +1,13 @@
 services:
   # projectsend
   projectsend:
-    image: linuxserver/projectsend:latest
+    extends:
+      file: ../common.yml
+      service: service-base
+    image: linuxserver/projectsend:${PROJECTSEND_DOCKER_TAG:-latest}
     container_name: projectsend
     profiles:
       - projectsend
-    restart: on-failure:7
     depends_on:
       - caddy
     env_file:
@@ -16,32 +18,25 @@ services:
     networks:
       - caddy-files
       - projectsend-internal
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - SYS_ADMIN
 
   # Database projectsend
   projectsend_db:
-    image: mariadb:latest
+    image: mariadb:${PROJECTSEND_DB_DOCKER_TAG:-latest}
     container_name: projectsend_db
     profiles:
-      - database
       - projectsend
+    extends:
+      file: ../common.yml
+      service: service-base
     depends_on:
       - caddy
-    restart: on-failure:7
     volumes:
       - projectsend_db:/var/lib/mysql:rw
     env_file:
       - ./env/projectsend_db.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     command: '--default-authentication-plugin=mysql_native_password'
     networks:
       - projectsend-internal
-    security_opt:
-      - no-new-privileges:true
 
 volumes:
   projectsend_db:

infrastructure/services/projectsend/env/projectsend_db.env

@@ -1,4 +0,0 @@
-MARIADB_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt
-MARIADB_USER=bensuperpc
-MARIADB_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
-MARIADB_DATABASE=projectsend

infrastructure/services/projectsend/env/projectsend_db.env.example

@@ -0,0 +1,4 @@
+MARIADB_ROOT_PASSWORD=__GENERATE_PROJECTSEND_DB_ROOT_PASSWORD__
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=__GENERATE_PROJECTSEND_DB_PASSWORD__
+MARIADB_DATABASE=projectsend

infrastructure/services/psitransfer/docker-compose.psitransfer.yml

@@ -1,24 +1,22 @@
 services:
   # psitransfer
   psitransfer:
-    image: psitrax/psitransfer:latest
+    image: psitrax/psitransfer:${PSITRANSFER_DOCKER_TAG:-latest}
     container_name: psitransfer
     profiles:
       - psitransfer
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
 #    user: ${PUID:-1000}:${PGID:-1000} 
     depends_on:
       - caddy
     env_file:
       - ./env/psitransfer.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     volumes:
       - psitransfer_data:/data
     networks:
       - caddy-files
-    security_opt:
-      - no-new-privileges:true
     read_only: true
 
 volumes:

infrastructure/services/psitransfer/env/psitransfer.env

@@ -1,2 +0,0 @@
-PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn
-#PSITRANSFER_PORT=3000

infrastructure/services/psitransfer/env/psitransfer.env.example

@@ -0,0 +1,2 @@
+PSITRANSFER_ADMIN_PASS=__GENERATE_PSITRANSFER_ADMIN_PASS__
+#PSITRANSFER_PORT=3000

infrastructure/services/qbittorrent/docker-compose.qbittorrent.yml

@@ -1,11 +1,13 @@
 services:
   # qBittorrent
   qbittorrent:
-    image: lscr.io/linuxserver/qbittorrent:latest
+    image: lscr.io/linuxserver/qbittorrent:${QBITTORRENT_DOCKER_TAG:-latest}
     container_name: qbittorrent
     profiles:
       - qbittorrent
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     depends_on:
       - caddy
     env_file:
@@ -13,7 +15,6 @@ services:
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
-      - TZ=${TZ:-Europe/Paris}
     ports:
       - 6881:6881
       - 6881:6881/udp
@@ -23,8 +24,6 @@ services:
       - private_data:/private_downloads
     networks:
       - caddy-media
-    security_opt:
-      - no-new-privileges:true
 
 volumes:
   qbittorrent_config:

infrastructure/services/satisfactory-server/backup/docker-compose.backup.yml

@@ -1,6 +1,6 @@
 services:
   satisfactory_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
     container_name: satisfactory_backup
     profiles:
       - satisfactory_backup

infrastructure/services/satisfactory-server/backup/env/satisfactory_backup.env.example

@@ -1,7 +1,7 @@
 #RUN_ON_STARTUP=true
 RESTIC_REPOSITORY=/mnt/restic
 RESTIC_BACKUP_SOURCES=/data
-RESTIC_PASSWORD=SCY5cmu12Odca302EXabPA9jXYkCb2NN
+RESTIC_PASSWORD=__GENERATE_SATISFACTORY_RESTIC_PASSWORD__
 # Backup (exuclusive with Check and Prune)
 BACKUP_CRON=*/15 * * * *
 RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose

infrastructure/services/satisfactory-server/satisfactory/docker-compose.satisfactory.yml

@@ -1,11 +1,13 @@
 services:
   # Satisfactory server
   satisfactory_server:
-    image: wolveix/satisfactory-server:latest
+    extends:
+      file: ../../common.yml
+      service: service-base
+    image: wolveix/satisfactory-server:${SATISFACTORY_DOCKER_TAG:-latest}
     container_name: satisfactory_server
     profiles:
       - satisfactory_server
-    restart: on-failure:7
     ports:
       - 7777:7777/udp
       - 7777:7777/tcp
@@ -19,17 +21,12 @@ services:
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
-      - TZ=${TZ:-Europe/Paris}
-    security_opt:
-      - no-new-privileges:true
     healthcheck:
       test: bash /healthcheck.sh
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 120s
-    cap_drop:
-      - SYS_ADMIN
 
 volumes:
   satisfactory_server_config:

infrastructure/services/searxng/docker-compose.searxng.yml

@@ -4,14 +4,14 @@ services:
   searxng:
     container_name: searxng
     image: docker.io/searxng/searxng:${SEARXNG_VERSION:-latest}
-    restart: on-failure:7
     depends_on:
       - caddy
     profiles:
       - searxng
+    extends:
+      file: ../common.yml
+      service: service-base
     env_file: ./config/searxng.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     networks:
       - caddy-tools
       - searxng-internal
@@ -22,19 +22,19 @@ services:
       - 1.1.1.1
       - 8.8.8.8
 
-  valkey:
+  searxng-valkey:
     container_name: searxng-valkey
     profiles:
       - searxng
-    image: docker.io/valkey/valkey:9-alpine
+    image: docker.io/valkey/valkey:${SEARXNG_VALKEY_DOCKER_TAG:-9-alpine}
+    extends:
+      file: ../common.yml
+      service: service-base
     command: valkey-server --save 30 1 --loglevel warning
-    restart: on-failure:7
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     networks:
       - searxng-internal
     volumes:
-      - valkey-data:/data/
+      - searxng-valkey-data:/data/
 
 networks:
   caddy-tools:
@@ -47,5 +47,5 @@ networks:
 volumes:
   searxng-data: {}
   searxng-config: {}
-  valkey-data: {}
+  searxng-valkey-data: {}
 

infrastructure/services/stirlingpdf/docker-compose.stirlingpdf.yml

@@ -1,24 +1,22 @@
 services:
   # stirlingpdf
   stirlingpdf:
-    image: frooodle/s-pdf:latest
+    image: frooodle/s-pdf:${STIRLINGPDF_DOCKER_TAG:-latest}
     container_name: stirlingpdf
     profiles:
       - stirlingpdf
-    restart: on-failure:7
+    extends:
+      file: ../common.yml
+      service: service-base
     depends_on:
       - caddy
     env_file:
       - ./env/stirlingpdf.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
     volumes:
       - stirlingpdf_config:/configs
       - stirlingpdf_tessdata:/usr/share/tessdata
     networks:
       - caddy-tools
-    security_opt:
-      - no-new-privileges:true
     read_only: false
 
 volumes:

infrastructure/services/stirlingpdf/env/stirlingpdf.env.example

@@ -6,4 +6,4 @@ LANGS=en_GB
 # Can be disabled after initial login, optional,
 # default it admin:stirling
 #SECURITY_INITIALLOGIN_USERNAME=admin
-#SECURITY_INITIALLOGIN_PASSWORD=Jw9U039f5xc2mFcacvGvPD9RjwIh4DzO
+#SECURITY_INITIALLOGIN_PASSWORD=__GENERATE_STIRLINGPDF_LOGIN_PASSWORD__