Improve infra

.github/workflows/main.yml

@@ -26,10 +26,8 @@ jobs:
         with:
           submodules: "recursive"
           fetch-depth: 0
-      - name: "Check compose"
-        run: make check
       - name: "Update server image"
-        run: make image-update
+        run: make pull
       - name: "Build server"
         run: make build
 #      - name: "Start 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

DockerCompose.mk

@@ -29,8 +29,9 @@ COMPOSE_DIR ?= --project-directory ./$(PROJECT_DIRECTORY)
 
 UID ?= 1000
 GID ?= 1000
+TZ ?= Europe/Paris
 
-ENV_ARG_VAR ?= PUID=$(UID) PGID=$(GID)
+ENV_ARG_VAR ?= PUID=$(UID) PGID=$(GID) TZ=$(TZ)
 
 DOCKER_COMPOSE_COMMAND ?= $(ENV_ARG_VAR) $(DOCKER_EXEC) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD)
 
@@ -66,11 +67,11 @@ git-update:
 	git pull --recurse-submodules --all --progress
 
 .PHONY: update
-update: image-update git-update
+update: git-update
 
 .PHONY: clean
 clean:
-	docker system prune -f
+	$(ENV_ARG_VAR) $(DOCKER_EXEC) system prune -f
 
 .PHONY: purge
 purge:

Makefile

@@ -24,8 +24,8 @@
 
 PROJECT_DIRECTORY := infrastructure
 CONFIG_DIRECTORY := presets
-# 7dtd minecraft satisfactory torrent
+# 7dtd minecraft satisfactory torrent ia torrent tools
-CONFIGS := torrent
+CONFIGS := 7dtd
 #DOCKER_PROFILES := 
 
 include DockerCompose.mk

README.md

@@ -1,36 +1,30 @@
 # Infrastructure
 
-_Open source, decentralized and self-hosted infrastructure for many local services._
+_Open source, decentralized and self-hosted infrastructure for many local services and authentication with Authelia._
-
-## About
-
-It uses caddy and docker-compose to run my services (And many other things).
-It's a **work in progress**, and I'm still learning a lot about it.
-If you have any **questions** or **suggestions**, feel free to open an issue or a pull request.
 
 ## Features
 
 - [x] caddy 2 HTTP/S reverse proxy
+- [x] Authelia (SSO / authentication middleware)
+- [x] Open-WebUI + Ollama (Local chatGPT)
+- [x] qbittorrent and transmission (Torrent client/server)
 - [x] Docker / docker-compose
 - [x] Homepage (Dashboard)
+- [x] SearXNG (Self-hosted search engine)
 - [x] Jellyfin (Eg Netflix, Disney+)
 - [x] Forgejo (Git server, fork of Gitea)
 - [x] Uptime Kuma (Monitoring)
 - [x] Argus (Application update monitoring)
-- [x] qbittorrent and transmission (Torrent client/server)
 - [x] SyncThing (File synchronization)
 - [x] Dufs (File server)
 - [x] PsiTransfer, ProjectSend, Picoshare (File sharing)
 - [x] it-tools, omni-tools and cyberchef (Tools for IT)
-- [x] Open-WebUI + Ollama (Local chatGPT)
+- [x] Privatebin
-- [x] Privatebin (Pastebin)
 - [x] Memos (Note-taking)
 - [x] Stirling PDF (PDF tools)
 - [x] Wordpress (Via FASTCGI/caddy)
-- [X] Satisfactory
+- [x] Dependency-Track (SBOM / vulnerability tracking)
-- [x] 7 days to die
+- [X] Game (Satisfactory, Minecraft, 7 Days to Die, Team Fortress 2 etc...)
-- [x] Minecraft
-- [x] Team Fortress 2
 
 ## Architecture
 
@@ -50,7 +44,7 @@ The homepage is a dashboard with many widgets and services.
 - [Docker Compose](https://docs.docker.com/compose/install/)
 - [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 - [Web domain](https://www.ovh.com/world/domains/) (I use OVH)
-- [Open port 80, 443, 22, 2222 and 5555 on your router](http://192.168.1.1/)
+- [Open port 80, 443, 22 and 2222 on your router](http://192.168.1.1/)
 - For games server, you need to open these ports (7777, 8888, 25565, 26900, 26901, 26903)
 
 List of ports used by the services in this infrastructure:
@@ -87,7 +81,29 @@ Go to the folder
 cd infrastructure
 ```
 
-Change services you want to enable in the [Makefile](Makefile) file, by default all services are enabled (games servers included).
+### Start the infrastructure
+
+Start the website with:
+
+```sh
+make up
+```
+
+Stop the website with:
+
+```sh
+make stop
+```
+
+Remove containers with:
+
+```sh
+make down
+```
+
+Services are enabled via **preset configuration files** in the [`presets/`](presets/) directory. 
+
+The active presets are declared in the [`Makefile`](Makefile) via the `CONFIGS` variable, for example, `CONFIGS := chatgpt` loads `presets/chatgpt.conf` which activates the `main_infrastructure`, `caddy`, `openssh`, and `openwebui` profiles.
 
 ### Configure the domain
 
@@ -97,7 +113,7 @@ For all **bensuperpc.org**, you need to replace it with your domain, example: **
 find . \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/bensuperpc.org/mydomain.com/g'
 ```
 
-Check if all bensuperpc.* are replaced by your domain in [Caddyfile](caddy/services/wordpress/Caddyfile)
+Check if all bensuperpc.* are replaced by your domain in [Caddyfile](infrastructure/services/caddy/config/Caddyfile)
 
 And then, caddy will generate the certificate for you and renew it automatically :D
 
@@ -105,166 +121,99 @@ And then, caddy will generate the certificate for you and renew it automatically
 | ------------------------------------------------------------------ | ---- | ------------------------------------------------------------ |
 | [bensuperpc.org](https://bensuperpc.org)                           | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
 | [www.bensuperpc.org](https://www.bensuperpc.org)                   | Main | Homepage                                                     |
-| [open-webui.bensuperpc.org](https://open-webui.bensuperpc.org)     | Sub  | For local chatGPT                                            |
+| [openwebui.bensuperpc.org](https://openwebui.bensuperpc.org)       | Sub  | For local chatGPT with ollama and openweb-ui                 |
-| [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org)       | Sub  | Wordpress website                                            |
+| [authelia.bensuperpc.org](https://authelia.bensuperpc.org)         | Sub  | Authelia for authentication                                  |
 | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org)     | Sub  | Uptime Kuma for monitoring                                   |
 | [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org)   | Sub  | Torrent client/server                                        |
+| [dozzle.bensuperpc.org](https://dozzle.bensuperpc.org)             | Sub  | Dozzle for docker logs                                       |
 | [transmission.bensuperpc.org](https://transmission.bensuperpc.org) | Sub  | Torrent client/server                                        |
 | [forgejo.bensuperpc.org](https://forgejo.bensuperpc.org/)          | Sub  | Fork of Gitea for git                                        |
 | [git.bensuperpc.org](https://git.bensuperpc.org)                   | Sub  | Fork of Gitea for git                                        |
-| [link.bensuperpc.org](https://link.bensuperpc.org)                 | Sub  | For link shortener                                           |
 | [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org)         | Sub  | Jellyfin for media server                                    |
 | [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org)       | Sub  | SyncThing for file synchronization                           |
 | [psitransfer.bensuperpc.org](https://psitransfer.bensuperpc.org)   | Sub  | PsiTransfer for file sharing                                 |
 | [it-tools.bensuperpc.org](https://it-tools.bensuperpc.org)         | Sub  | Tools for IT                                                 |
 | [omni-tools.bensuperpc.org](https://omni-tools.bensuperpc.org)     | Sub  | Tools for IT                                                 |
-| [privatebin.bensuperpc.org](https://privatebin.bensuperpc.org)     | Sub  | Pastebin                                                     |
+| [privatebin.bensuperpc.org](https://privatebin.bensuperpc.org)     | Sub  | Privatebin                                                   |
 | [projectsend.bensuperpc.org](https://projectsend.bensuperpc.org)   | Sub  | ProjectSend for file sharing                                 |
 | [picoshare.bensuperpc.org](https://picoshare.bensuperpc.org)       | Sub  | Picoshare for file sharing                                   |
 | [dufs.bensuperpc.org](https://dufs.bensuperpc.org)                 | Sub  | Dufs for file sharing                                        |
 | [memos.bensuperpc.org](https://memos.bensuperpc.org)               | Sub  | Memos note-taking app                                        |
 | [stirlingpdf.bensuperpc.org](https://stirlingpdf.bensuperpc.org)   | Sub  | Stirling PDF tools                                           |
 | [argus.bensuperpc.org](https://argus.bensuperpc.org)               | Sub  | Argus for monitoring application updates                     |
+| [searxng.bensuperpc.org](https://searxng.bensuperpc.org)           | Sub  | SearXNG self-hosted search engine                            |
+| [dependency-track.bensuperpc.org](https://dependency-track.bensuperpc.org) | Sub | SBOM / vulnerability analysis                       |
+| [litellm.bensuperpc.org](https://litellm.bensuperpc.org)           | Sub  | LiteLLM llm proxy for open-webui                             |
+| [localai.bensuperpc.org](https://localai.bensuperpc.org)           | Sub  | For local chatGPT with multi-backend                         |
+ [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org)       | Sub  | Wordpress website                                            |
+ [bentopdf.bensuperpc.org](https://bentopdf.bensuperpc.org)       | Sub  | BentoPDF                                                     |
+
 
 ### Configure the infrastructure
 
-You need to configure the infrastructure with your own configuration.
+Every service ships a `*.env.example` file, real `*.env` files are gitignored and never committed, you can generate them locally with:
-
-You can generate a password with 32 characters:
 
 ```sh
-openssl rand -base64 32
+python3 tools/init_secrets.py
 ```
 
-Or online: [passwordsgenerator.net](https://passwordsgenerator.net/)
-
 #### Caddy
 
-For [caddy_backup.env](infrastructure/services/caddy/env/caddy_backup.env) file, you need to change the password(s) for the restic backup.
+Edit [caddy.env](infrastructure/services/caddy/env/caddy.env.example) to set your domain and mail address:
 
 ```sh
-RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
+MAIN_DOMAIN=bensuperpc.org
+MAIL_DOMAIN=bensuperpc@gmail.com
+SCHEME=https
+AUTO_HTTPS_OPTIONS=ignore_loaded_certs
 ```
 
-#### Wordpress
+#### Authelia - user database
 
-For the [wordpress.env](infrastructure/services/wordpress/env/wordpress.env) file, you need to change the password and user for the database.
+`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
-WORDPRESS_DB_USER=bensuperpc
+docker run --rm authelia/authelia:latest authelia crypto hash generate argon2 --password 'MyPassword'
-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.
+Then edit the `username`, `displayname`, `password` hash and `email` fields to match.
+
+#### Dozzle - user account
+
+Generate a user entry for [users.yml](infrastructure/services/dozzle/config/users.yml):
 
 ```sh
-MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
+docker run -it --rm amir20/dozzle generate bensuperpc --password mypassword --email bensuperpc@gmail.com --name "bensuperpc"
-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.
+#### OpenSSH - public key
 
-```sh
+Replace [id_ed25519.pub](infrastructure/services/openssh/config/authorized_keys/id_ed25519.pub) with your own public SSH key.
-RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-```
 
-#### PsiTransfer
+#### Open-WebUI - Ollama model
 
-For [psitransfer.env](infrastructure/services/psitransfer/env/psitransfer.env) file, you need to change the secret key.
+After starting the stack, pull a model via the Open-WebUI GUI or with:
-
-```sh
-PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn
-```
-
-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/open-webui.env) file, entirely optional.
-
-To download the model, you can use:
 
 ```sh
 docker exec -it ollama ollama run deepseek-r1:8b
 ```
 
-### Start the infrastructure
+#### Team Fortress 2 - Steam GSLT
 
-Start the website with:
+`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
-make start-detached
+FORGEJO__security__INSTALL_LOCK=true
 ```
 
-Stop the website with:
-
-```sh
-make stop
-```
-
-Remove countainers with:
-
-```sh
-make down
-```
-
-You can disable some services by removing the service name in PROFILES variable in the [Makefile](Makefile) file.
-
-To enable the gitea CI: [how-to-build-docker-containers-using-gitea-runners](https://medium.com/@lokanx/how-to-build-docker-containers-using-gitea-runners-600729555e07)
-
 ### Homepage
 
 You can change the homepage config in these files:
@@ -274,16 +223,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
@@ -335,7 +274,7 @@ This infrastructure uses docker volumes to store data, all configuration/data fo
 
 ### SSH access
 
-The default port for ssh/rsync is is 2222.
+The default port for SSH/rsync is 2222.
 
 You can access to the server with:
 
@@ -347,6 +286,50 @@ ssh -p 2222 admin@bensuperpc.org
 
 To activate the alternative webui theme (VueTorrent), you need to go in the qbittorrent settings, then in the `webui` section, check the `Use alternative webui` and add `/vuetorrent` to text field.
 
+
+### Local testing
+
+If you want to test the infrastructure locally, you can add these lines in your `/etc/hosts` file:
+
+```sh
+127.0.0.1 openwebui.bensuperpc.org
+127.0.0.1 authelia.bensuperpc.org
+127.0.0.1 memos.bensuperpc.org
+127.0.0.1 stirlingpdf.bensuperpc.org
+127.0.0.1 public.bensuperpc.org
+127.0.0.1 private.bensuperpc.org
+127.0.0.1 jellyfin.bensuperpc.org
+127.0.0.1 syncthing.bensuperpc.org
+127.0.0.1 psitransfer.bensuperpc.org
+127.0.0.1 projectsend.bensuperpc.org
+127.0.0.1 picoshare.bensuperpc.org
+127.0.0.1 dufs.bensuperpc.org
+127.0.0.1 it-tools.bensuperpc.org
+127.0.0.1 omni-tools.bensuperpc.org
+127.0.0.1 privatebin.bensuperpc.org
+127.0.0.1 forgejo.bensuperpc.org
+127.0.0.1 git.bensuperpc.org
+127.0.0.1 qbittorrent.bensuperpc.org
+127.0.0.1 transmission.bensuperpc.org
+127.0.0.1 uptimekuma.bensuperpc.org
+127.0.0.1 wordpress.bensuperpc.org
+127.0.0.1 searxng.bensuperpc.org
+127.0.0.1 dependency-track.bensuperpc.org
+127.0.0.1 homepage.bensuperpc.org
+```
+
+Then update the [caddy.env](infrastructure/services/caddy/env/caddy.env) file with your local domain to disable the letsencrypt certificate generation and auto redirect to https:
+
+```sh
+MAIN_DOMAIN=bensuperpc.org
+# Scheme
+SCHEME=https
+# ignore_loaded_certs off
+AUTO_HTTPS_OPTIONS=ignore_loaded_certs
+```
+
+And remove all the `import authelia_middleware` in the caddyfiles, authelia need https to work.
+
 ## Sources
 
 - [Wordpress](https://wordpress.org/)
@@ -362,6 +345,7 @@ To activate the alternative webui theme (VueTorrent), you need to go in the qbit
 - [Letsencrypt](https://letsencrypt.org/)
 - [Caddy](https://caddyserver.com/)
 - [Adminer](https://www.adminer.org/)
+- [self-hosted-ai-stack](https://triedandtestedbuilds.com/self-hosted-ai-stack-part-1)
 - [Uptime Kuma](https://uptime-kuma.com/)
 - [qbittorrent](https://www.qbittorrent.org/)
 - [Transmission](https://transmissionbt.com/)
@@ -385,7 +369,10 @@ To activate the alternative webui theme (VueTorrent), you need to go in the qbit
 - [Forgejo-runner](https://huijzer.xyz/posts/55)
 - [Forgejo](https://nickcunningh.am/blog/how-to-setup-and-configure-forgejo-with-support-for-forgejo-actions-and-more)
 - [Argus](https://github.com/release-argus/Argus)
-- [Forgejo-runner](https://huijzer.xyz/posts/55)
+- [SearXNG](https://github.com/searxng/searxng)
+- [Dependency-Track](https://dependencytrack.org/)
+- [Authelia](https://www.authelia.com/)
+- [BentoPDF](https://github.com/alam00000/bentopdf)
 
 ## License
 

infrastructure/common.yml

@@ -0,0 +1,9 @@
+services:
+  service-base:
+    restart: on-failure:7
+    environment:
+      - TZ=${TZ:-Europe/Paris}
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - SYS_ADMIN

infrastructure/docker-compose.yml

@@ -49,11 +49,21 @@ include:
   - services/dependency-track/docker-compose.dependency-track.yml
 # Searxng
   - services/searxng/docker-compose.searxng.yml
+# Authelia
+  - services/authelia/docker-compose.authelia.yml
+# Dozzle
+  - services/dozzle/docker-compose.dozzle.yml
+# LocalAI
+  - services/localai/docker-compose.localai.yml
+# Bentopdf
+  - services/bentopdf/docker-compose.bentopdf.yml
+# Code-server
+  - services/code-server/docker-compose.vscode-server.yml
 # Minecraft
-  - services/minecraft-server/docker-compose.yml
+  - games/minecraft-server/docker-compose.yml
 # 7daystodie
-  - services/7daystodie-server/docker-compose.yml
+  - games/7daystodie-server/docker-compose.yml
 # Satisfactory
-  - services/satisfactory-server/docker-compose.yml
+  - games/satisfactory-server/docker-compose.yml
 # Team Fortress 2
-  - services/teamfortress2-server/docker-compose.yml
+  - games/teamfortress2-server/docker-compose.yml

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

@@ -1,11 +1,11 @@
 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
-    restart: on-failure:5
+    restart: on-failure:7
     ports:
       - "26900:26900"
       - "26901:26901"
@@ -25,16 +25,11 @@ services:
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
+      - TZ=${TZ:-Europe/Paris}
     # security_opt:
     #   - no-new-privileges:true
     # cap_drop:
     #   - SYS_ADMIN
-    deploy:
-      resources:
-        limits:
-          memory: 16G
-        reservations:
-          memory: 4G
 
 volumes:
   7daystodie_backup:

infrastructure/games/7daystodie-server/7daystodie/env/7daystodie.env.example

@@ -0,0 +1,7 @@
+START_MODE=3
+VERSION=stable
+TimeZone=Europe/Paris
+BACKUP=NO
+BACKUP_HOUR=2
+BACKUP_MAX=7
+MONITOR=NO

infrastructure/games/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:5
+    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/games/7daystodie-server/backup/env/7daystodie_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_7DTD_RESTIC_PASSWORD__
 # Backup (exuclusive with Check and Prune)
 BACKUP_CRON=*/15 * * * *
 RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose

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

@@ -1,22 +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:3
+    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
-      - minecraft_rcon_data:/data/minecraft_rcon_data:ro
-    security_opt:
-      - no-new-privileges:true
     network_mode: none
     cap_drop:
       - NET_ADMIN
@@ -30,5 +29,3 @@ volumes:
     name: minecraft_server_data
   minecraft_proxy_data:
     name: minecraft_proxy_data
-  minecraft_rcon_data:
-    name: minecraft_rcon_data

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

@@ -0,0 +1,14 @@
+#RUN_ON_STARTUP=true
+RESTIC_REPOSITORY=/mnt/restic
+RESTIC_BACKUP_SOURCES=/data
+RESTIC_PASSWORD=__GENERATE_MINECRAFT_RESTIC_PASSWORD__
+# Backup (exuclusive with Check and Prune)
+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 * * * *
+#RESTIC_CHECK_ARGS=--read-data-subset=40%
+# Prune (exuclusive with Check and Prune)
+#PRUNE_CRON=*/15 * * * *
+#RESTIC_PRUNE_ARGS=

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

@@ -1,11 +1,11 @@
 services:
   minecraft_proxy:
-    image: itzg/bungeecord:latest
+    image: itzg/mc-proxy:${MINECRAFT_PROXY_DOCKER_TAG:-java25}
     container_name: minecraft_proxy_server
     profiles:
       - minecraft_proxy
       - minecraft_server
-    restart: on-failure:3
+    restart: on-failure:7
     env_file:
       - ./env/proxy.env
     environment:
@@ -26,13 +26,13 @@ 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
     depends_on:
       - minecraft_proxy
-    restart: on-failure:3
+    restart: on-failure:7
     ports:
       #       Server Minecraft port (Disable if you use proxy)
       # - "25565:25565"
@@ -57,48 +57,11 @@ services:
 #      - ./asset_links/plugins.txt:/extras/plugins.txt:ro
     networks:
       - minecraft-network
-    deploy:
-      resources:
-#        limits:
-#          cpus: '8.0'
-#          memory: 26G
-        reservations:
-          cpus: '0.01'
-          memory: 20M
-
-  rcon-web:
-    image: itzg/rcon:latest
-    container_name: minecraft_rcon_web
-    profiles:
-      - mc-web
-    restart: on-failure:3
-    depends_on:
-      - minecraft_server
-      - minecraft_proxy
-    environment:
-      RWA_USERNAME: admin
-      RWA_PASSWORD: admin
-      RWA_ADMIN: "TRUE"
-      # is referring to the hostname of 'minecraft_server' compose service below
-      RWA_RCON_HOST: minecraft_server
-      RWA_RCON_PASSWORD: 6hxU3Oxmh2Q8e6S9fjkdWJikRCON_PASSWORD
-    ports:
-      #       web UI port
-      - "4326:4326"
-      #       websocket access from UI
-      - "4327:4327"
-    volumes:
-      - minecraft_rcon_data:/opt/rcon-web-admin/db
-    networks:
-      - minecraft-network
-
 volumes:
   minecraft_server_data:
     name: minecraft_server_data
   minecraft_proxy_data:
     name: minecraft_proxy_data
-  minecraft_rcon_data:
-    name: minecraft_rcon_data
 
 networks:
   minecraft-network:

infrastructure/games/minecraft-server/minecraft-server/env/mods_plugins.env.example

@@ -0,0 +1,34 @@
+# Disable SignLink: 39593
+#KeepChunks,Chunky,Plasmo Voice Server,viaversion,viabackwards,LuckPerms,QuickShop-Reremake,KeepChunks, DecentHolograms
+#SPIGET_RESOURCES=23307,81534,91064,19254,27448,28140,62575,23307,96927
+#      MODPACK= # MODPACK or MODS
+#      MODS=https://dev.bukkit.org/projects/dynmap/files/3620010/download
+#MODS_FILE=/extras/plugins.txt
+REMOVE_OLD_MODS=false
+REMOVE_OLD_MODS_INCLUDE=*.jar,*-version.json
+REMOVE_OLD_MODS_EXCLUDE=
+REMOVE_OLD_MODS_DEPTH=16
+
+# RESOURCE_PACK=
+# RESOURCE_PACK_SHA1=
+
+#      Minecraft Datapack
+# DATAPACKS=Terralith_v2.2_Seed_3820.zip
+#DATAPACKS_FILE=/extras/datapacks.txt
+#REMOVE_OLD_DATAPACKS=false
+#REMOVE_OLD_DATAPACKS_INCLUDE=*.zip
+# REMOVE_OLD_DATAPACKS_EXCLUDE=
+#REMOVE_OLD_DATAPACKS_DEPTH=1
+
+#RESOURCE_PACK=
+#RESOURCE_PACK_SHA1=
+
+# MODS_FORGEAPI_KEY
+# MODS_FORGEAPI_FILE
+# MODS_FORGEAPI_PROJECTIDS
+# MODS_FORGEAPI_RELEASES
+# MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES
+# MODS_FORGEAPI_IGNORE_GAMETYPE
+# REMOVE_OLD_FORGEAPI_MODS
+# REMOVE_OLD_DATAPACKS_DEPTH
+# REMOVE_OLD_DATAPACKS_INCLUDE

infrastructure/games/minecraft-server/minecraft-server/env/proxy.env

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

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

@@ -0,0 +1,14 @@
+TYPE=VELOCITY
+VELOCITY_VERSION=4.0.0-SNAPSHOT
+VELOCITY_BUILD_ID=5
+#PLUGINS=
+#SPIGET_PLUGINS=
+DEBUG=false
+DEBUG_HELPER=false
+ENABLE_RCON=false
+#RCON_PASSWORD=__GENERATE_MINECRAFT_PROXY_RCON_PASSWORD__
+#RCON_PORT=25576
+INIT_MEMORY=512M
+MAX_MEMORY=1536M
+#JVM_OPTS=
+JVM_XX_OPTS=-XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15

infrastructure/games/minecraft-server/minecraft-server/env/server.env

@@ -11,8 +11,8 @@ ENFORCE_SECURE_PROFILE=false
 
 # Server jar options
 TYPE=PURPUR
-VERSION=1.21.11
+VERSION=26.2
-PURPUR_BUILD=2568
+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=rDqV6FrU5NypcJQtXhbOgA
 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/games/minecraft-server/minecraft-server/env/server.env.example

@@ -0,0 +1,80 @@
+# Base options
+EULA=true
+ONLINE_MODE=false
+SERVER_PORT=25565
+SERVER_NAME=MyServer
+ICON=https://github.com/bensuperpc/docker-minecraft-server/releases/download/Test_world/icon_64x64.png
+OVERRIDE_ICON=true
+MOTD=A §l§cMinecraft§r §nserver
+OVERRIDE_SERVER_PROPERTIES=true
+ENFORCE_SECURE_PROFILE=false
+
+# Server jar options
+TYPE=PURPUR
+VERSION=26.2
+PURPUR_BUILD=2608
+FORCE_REDOWNLOAD=false
+BUILD_FROM_SOURCE=false
+
+#       Server options
+INIT_MEMORY=2G
+MAX_MEMORY=12G
+EXEC_DIRECTLY=false
+USE_AIKAR_FLAGS=true
+USE_SIMD_FLAGS=true
+# TUNE_VIRTUALIZED=true
+# ENABLE_JMX=true
+CONSOLE=false
+GUI=false
+TZ=Europe/Paris
+
+# OPS options
+OPS=Bensuperpc
+# OPS_FILE=
+OVERRIDE_OPS=true
+#OP_PERMISSION_LEVEL=4
+#FUNCTION_PERMISSION_LEVEL
+
+# WHITELIST options
+ENABLE_WHITELIST=false
+OVERRIDE_WHITELIST=true
+#WHITELIST=Bensuperpc
+# WHITELIST_FILE=
+ENFORCE_WHITELIST=false
+
+# AUTOPAUSE options
+ENABLE_AUTOPAUSE=false
+AUTOPAUSE_TIMEOUT_EST=7200000
+AUTOPAUSE_TIMEOUT_INIT=3600000
+AUTOPAUSE_TIMEOUT_KN=480000
+
+# AUTOSTOP options
+# ENABLE_AUTOSTOP=true
+# AUTOSTOP_TIMEOUT_EST
+# AUTOSTOP_TIMEOUT_INIT
+# AUTOSTOP_PERIOD
+
+NETWORK_COMPRESSION_THRESHOLD=-1
+LOG_TIMESTAMP=true
+MAX_TICK_TIME=-1
+# Time (sec) before AFK player was disconnected
+PLAYER_IDLE_TIMEOUT=600
+MAX_PLAYERS=32
+ALLOW_FLIGHT=false
+
+# RCON options
+ENABLE_RCON=false
+RCON_PASSWORD=__GENERATE_MINECRAFT_RCON_PASSWORD__
+RCON_PORT=25575
+BROADCAST_CONSOLE_TO_OPS=true
+BROADCAST_RCON_TO_OPS=true
+
+# QUERY options
+#ENABLE_QUERY=true
+#QUERY_PORT=25565
+
+# Others options
+SNOOPER_ENABLED=true
+ENABLE_STATUS=true
+PREVIEWS_CHAT=false
+#SYNC_CHUNK_WRITES=true

infrastructure/games/minecraft-server/minecraft-server/env/world.env.example

@@ -0,0 +1,22 @@
+LEVEL=world
+LEVEL_TYPE=default
+#      MAX_WORLD_SIZE=10000
+#      MAX_BUILD_HEIGHT=256
+ALLOW_NETHER=true
+GENERATE_STRUCTURES=true
+VIEW_DISTANCE=12
+SIMULATION_DISTANCE=10
+ENABLE_COMMAND_BLOCK=true
+ANNOUNCE_PLAYER_ACHIEVEMENTS=true
+PVP=true
+DIFFICULTY=hard
+FORCE_GAMEMODE=false
+MODE=survival
+HARDCORE=false
+SPAWN_PROTECTION=16
+SEED=3820
+
+# Spawn Entities Options
+SPAWN_ANIMALS=true
+SPAWN_MONSTERS=true
+SPAWN_NPCS=true

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

@@ -1,12 +1,12 @@
 services:
   satisfactory_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
     container_name: satisfactory_backup
     profiles:
       - satisfactory_backup
     depends_on:
       - satisfactory_server
-    restart: on-failure:5
+    restart: on-failure:7
     env_file:
       - ./env/satisfactory_backup.env
     volumes:

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

@@ -0,0 +1,14 @@
+#RUN_ON_STARTUP=true
+RESTIC_REPOSITORY=/mnt/restic
+RESTIC_BACKUP_SOURCES=/data
+RESTIC_PASSWORD=__GENERATE_SATISFACTORY_RESTIC_PASSWORD__
+# 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/games/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:5
     ports:
       - 7777:7777/udp
       - 7777:7777/tcp
@@ -19,22 +21,12 @@ services:
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
-    security_opt:
-      - no-new-privileges:true
     healthcheck:
       test: bash /healthcheck.sh
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 120s
-    cap_drop:
-      - SYS_ADMIN
-    deploy:
-      resources:
-        limits:
-          memory: 24G
-        reservations:
-          memory: 4G
 
 volumes:
   satisfactory_server_config:

infrastructure/games/satisfactory-server/satisfactory/env/satisfactory.env.example

@@ -0,0 +1,17 @@
+AUTOSAVENUM=10
+DEBUG=false
+DISABLESEASONALEVENTS=false
+MAXOBJECTS=4325376
+MAXPLAYERS=4
+MAXTICKRATE=30
+ROOTLESS=false
+SERVERGAMEPORT=7777
+SERVERIP=0.0.0.0
+SERVERSTREAMING=true
+SKIPUPDATE=false
+STEAMBETA=false
+TIMEOUT=60
+
+AUTOSAVEONDISCONNECT=true
+CRASHREPORT=true
+NETWORKQUALITY=3

infrastructure/games/teamfortress2-server/backup/docker-compose.backup.yml

@@ -1,12 +1,12 @@
 services:
   teamfortress2_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
     container_name: teamfortress2_backup
     profiles:
       - teamfortress2_backup
     depends_on:
       - teamfortress2_server
-    restart: on-failure:5
+    restart: on-failure:7
     env_file:
       - ./env/teamfortress2_backup.env
     volumes:

infrastructure/games/teamfortress2-server/backup/env/teamfortress2_backup.env

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

infrastructure/games/teamfortress2-server/backup/env/teamfortress2_backup.env.example

@@ -0,0 +1,14 @@
+#RUN_ON_STARTUP=true
+RESTIC_REPOSITORY=/mnt/restic
+RESTIC_BACKUP_SOURCES=/data
+RESTIC_PASSWORD=__GENERATE_TEAMFORTRESS2_RESTIC_PASSWORD__
+# 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/games/teamfortress2-server/teamfortress2/docker-compose.teamfortress2.yml

@@ -1,11 +1,13 @@
 services:
   # Team Fortress 2 server
   teamfortress2_server:
-    image: cm2network/tf2:sourcemod-x64
+    extends:
+      file: ../../../common.yml
+      service: service-base
+    image: cm2network/tf2:${TEAMFORTRESS2_DOCKER_TAG:-sourcemod-x64}
     container_name: teamfortress2_server
     profiles:
       - teamfortress2_server
-    restart: on-failure:5
     ports:
      - "27015:27015/tcp"
      - "27015:27015/udp"
@@ -18,16 +20,6 @@ services:
 #    environment:
 #      - PUID=${PUID:-1000}
 #      - PGID=${PGID:-1000}
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - SYS_ADMIN
-    deploy:
-      resources:
-        limits:
-          memory: 16G
-        reservations:
-          memory: 4G
 
 volumes:
   teamfortress2_data:

infrastructure/games/teamfortress2-server/teamfortress2/env/teamfortress2.env

@@ -0,0 +1,12 @@
+# Get a free Game Server Login Token from https://steamcommunity.com/dev/managegameservers
+# This is NOT a value make init can generate for you, you must fill it in yourself.
+SRCDS_TOKEN=CHANGEME_STEAM_GSLT_TOKEN
+SRCDS_PW=2Ql1Qm4KHtGGEl8Fk5X3Lw
+SRCDS_PORT=27015
+SRCDS_MAXPLAYERS=32
+SRCDS_REGION=3
+SRCDS_STARTMAP=pl_goldrush
+#SRCDS_MAPCYCLE="mapcycle_default.txt"
+#pl_badwater
+SRCDS_CFG=server.cfg
+SRCDS_SECURED=0

infrastructure/games/teamfortress2-server/teamfortress2/env/teamfortress2.env.example

@@ -0,0 +1,12 @@
+# Get a free Game Server Login Token from https://steamcommunity.com/dev/managegameservers
+# This is NOT a value make init can generate for you, you must fill it in yourself.
+SRCDS_TOKEN=CHANGEME_STEAM_GSLT_TOKEN
+SRCDS_PW=__GENERATE_TEAMFORTRESS2_SERVER_PW__
+SRCDS_PORT=27015
+SRCDS_MAXPLAYERS=32
+SRCDS_REGION=3
+SRCDS_STARTMAP=pl_goldrush
+#SRCDS_MAPCYCLE="mapcycle_default.txt"
+#pl_badwater
+SRCDS_CFG=server.cfg
+SRCDS_SECURED=0

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

@@ -1,18 +1,19 @@
 services:
   # argus
   argus:
-    image: releaseargus/argus:latest
+    image: releaseargus/argus:${ARGUS_DOCKER_TAG:-latest}
     container_name: argus
     profiles:
       - argus
     environment:
-      ARGUS_UID: ${PUID:-1000}
+      - ARGUS_UID=${PUID:-1000}
-      ARGUS_GID: ${PGID:-1000}
+      - ARGUS_GID=${PGID:-1000}
-    restart: on-failure:5
+      - TZ=${TZ:-Europe/Paris}
+    restart: on-failure:7
     depends_on:
       - caddy
     networks:
-      - argus-network
+      - caddy-infra
     volumes:
       - argus_data:/app/data/
       - ./config/config.yml:/app/config.yml
@@ -28,6 +29,6 @@ volumes:
     name: argus_data
 
 networks:
-  argus-network:
+  caddy-infra:
     driver: bridge
-    name: argus-network
+    name: caddy-infra

infrastructure/services/authelia/config/configuration.yml

@@ -0,0 +1,78 @@
+theme: auto
+
+server:
+  address: "tcp://0.0.0.0:9091"
+
+log:
+  level: info
+
+authentication_backend:
+  file:
+    path: /config/users_database.yml
+
+# totp:
+#   issuer: bensuperpc.org
+
+access_control:
+  default_policy: deny
+  rules:
+    - domain:
+        - "authelia.bensuperpc.org"
+        - "www.bensuperpc.org"
+        - "public.bensuperpc.org"
+        - "it-tools.bensuperpc.org"
+        - "omni-tools.bensuperpc.org"
+        - "cyberchef.bensuperpc.org"
+        - "bentopdf.bensuperpc.org"
+        - "wordpress.bensuperpc.org"
+        - "homepage.bensuperpc.org"
+        - "forgejo.bensuperpc.org"
+      policy: bypass
+    - domain:
+        - "jellyfin.bensuperpc.org"
+        - "openwebui.bensuperpc.org"
+        - "qbittorrent.bensuperpc.org"
+        - "syncthing.bensuperpc.org"
+        - "torrent.bensuperpc.org"
+        - "litellm.bensuperpc.org"
+        - "searxng.bensuperpc.org"
+        - "localai.bensuperpc.org"
+      subject:
+      - 'group:admins'
+      - 'group:users'
+      policy: one_factor
+    - domain:
+        - "*.bensuperpc.org"
+      subject:
+      - 'group:admins'
+      policy: one_factor
+    # - domain: "dependency-track.bensuperpc.org"
+    #   resources:
+    #     - "^/api/.*"
+    #   policy: bypass
+#    - domain: "*.bensuperpc.org"
+#      policy: two_factor
+
+session:
+  expiration: 72h
+  inactivity: 60m
+  remember_me: 1M
+  cookies:
+    - domain: "bensuperpc.org"
+      authelia_url: "https://authelia.bensuperpc.org"
+
+regulation:
+  max_retries: 5
+  find_time: 3m
+  ban_time: 30m
+
+storage:
+  postgres: {}
+
+notifier:
+  filesystem:
+    filename: /config/notification.txt
+  # smtp:
+  #   address: "submission://smtp.example.com:587"
+  #   username: bensuperpc
+  #   sender: "Authelia <authelia@bensuperpc.org>"

infrastructure/services/authelia/config/users_database.yml

@@ -0,0 +1,8 @@
+users:
+  bensuperpc:
+    displayname: "Bensuperpc"
+    password: "$argon2id$v=19$m=65536,t=3,p=4$1T+CwoeP6hcoddG8l1iilg$omcB+SICmNQzmZIXhE54S5+J68AU32f60a5ctYoEObU"
+    email: "bensuperpc@gmail.com"
+    groups:
+      - admins
+      - users

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

@@ -0,0 +1,56 @@
+services:
+  authelia:
+    container_name: authelia    
+    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
+    volumes:
+      - ./config:/config
+    networks:
+      - caddy-infra
+      - authelia-internal
+
+  authelia-postgres:
+    image: postgres:${AUTHELIA_POSTGRES_DOCKER_TAG:-18.4-alpine3.24}
+    container_name: authelia-postgres
+    extends:
+      file: ../../common.yml
+      service: service-base
+    volumes:
+      - authelia_db_data:/var/lib/postgresql
+    env_file:
+      - ./env/authelia_postgres.env
+    profiles:
+      - authelia
+      - caddy
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}" ]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+    networks:
+      - authelia-internal
+
+networks:
+  caddy-infra:
+    driver: bridge
+    name: caddy-infra
+  authelia-internal:
+    driver: bridge
+    name: authelia-internal
+
+volumes:
+  authelia_db_data: {}

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.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

@@ -0,0 +1,18 @@
+services:
+  bentopdf:
+    extends:
+      file: ../../common.yml
+      service: service-base
+    image: ghcr.io/alam00000/bentopdf-simple:${BENTOPDF_DOCKER_TAG:-latest}
+    container_name: bentopdf
+    profiles:
+      - bentopdf
+    depends_on:
+      - caddy
+    networks:
+      - caddy-tools
+
+networks:
+  caddy-tools:
+    driver: bridge
+    name: caddy-tools

infrastructure/services/caddy/config/Caddyfile

@@ -10,13 +10,13 @@
 		}
 		format json
 	}
+
+    auto_https {$AUTO_HTTPS_OPTIONS}
 }
 
-# import website/*
-
-
 # Common settings
 import website/header.caddy
+import website/authelia_middleware.caddy
 
 # All website configurations
 import website/main.caddy
@@ -25,7 +25,7 @@ import website/forgejo.caddy
 import website/homepage.caddy
 import website/jellyfin.caddy
 import website/memos.caddy
-import website/open-webui.caddy
+import website/openwebui.caddy
 import website/privatebin.caddy
 import website/psitransfer.caddy
 import website/stirlingpdf.caddy
@@ -42,3 +42,9 @@ import website/uptimekuma.caddy
 import website/argus.caddy
 import website/dependency-track.caddy
 import website/searxng.caddy
+import website/authelia.caddy
+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/argus.caddy

@@ -1,3 +1,4 @@
-argus.{$MAIN_DOMAIN} {
+{$SCHEME}://argus.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$ARGUS_ADDRESS}
 }

infrastructure/services/caddy/config/website/authelia.caddy

@@ -0,0 +1,3 @@
+{$SCHEME}://authelia.{$MAIN_DOMAIN} {
+	reverse_proxy {$AUTHELIA_ADDRESS}
+}

infrastructure/services/caddy/config/website/authelia_middleware.caddy

@@ -0,0 +1,8 @@
+(authelia_middleware) {
+    forward_auth authelia:9091 {
+        uri /api/authz/forward-auth
+        copy_headers Remote-User Remote-Groups Remote-Name Remote-Email
+        header_up X-Forwarded-Proto {scheme}
+        header_up X-Forwarded-Host {host}
+    }
+}

infrastructure/services/caddy/config/website/bentopdf.caddy

@@ -0,0 +1,4 @@
+{$SCHEME}://bentopdf.{$MAIN_DOMAIN} {
+	import authelia_middleware
+	reverse_proxy {$BENTOPDF_ADDRESS}
+}

infrastructure/services/caddy/config/website/cyberchef.caddy

@@ -1,4 +1,5 @@
-cyberchef.{$MAIN_DOMAIN} {
+{$SCHEME}://cyberchef.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	# Load balance between 2 instances
 	reverse_proxy {
 		to cyberchef0:8000 cyberchef1:8000

infrastructure/services/caddy/config/website/dependency-track.caddy

@@ -1,4 +1,5 @@
-dependency-track.{$MAIN_DOMAIN} {
+{$SCHEME}://dependency-track.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy /api/* {$DEPENDENCY_TRACK_APISERVER_ADDRESS}
 	reverse_proxy {$DEPENDENCY_TRACK_FRONTEND_ADDRESS}
 }

infrastructure/services/caddy/config/website/dozzle.caddy

@@ -0,0 +1,4 @@
+{$SCHEME}://dozzle.{$MAIN_DOMAIN} {
+	import authelia_middleware
+	reverse_proxy {$DOZZLE_ADDRESS}
+}

infrastructure/services/caddy/config/website/dufs.caddy

@@ -1,3 +1,4 @@
-dufs.{$MAIN_DOMAIN} {
+{$SCHEME}://dufs.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy dufs:5000
 }

infrastructure/services/caddy/config/website/forgejo.caddy

@@ -1,7 +1,9 @@
-git.{$MAIN_DOMAIN} {
+{$SCHEME}://git.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$FORGEJO_ADDRESS}
 }
 
-forgejo.{$MAIN_DOMAIN} {
+{$SCHEME}://forgejo.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	redir https://git.{$MAIN_DOMAIN}{uri} permanent
 }

infrastructure/services/caddy/config/website/homepage.caddy

@@ -1,3 +1,4 @@
-homepage.{$MAIN_DOMAIN} {
+{$SCHEME}://homepage.{$MAIN_DOMAIN} {
-	reverse_proxy {$HOMEPAGE_ADDRESS}
+	import authelia_middleware
+	redir https://www.{$MAIN_DOMAIN}{uri} permanent
 }

infrastructure/services/caddy/config/website/it-tools.caddy

@@ -1,4 +1,5 @@
-it-tools.{$MAIN_DOMAIN} {
+{$SCHEME}://it-tools.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	# Load balance between 2 instances
 	reverse_proxy {
 		to it-tools0:8080 it-tools1:8080

infrastructure/services/caddy/config/website/jellyfin.caddy

@@ -1,4 +1,5 @@
-jellyfin.{$MAIN_DOMAIN} {
+{$SCHEME}://jellyfin.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$JELLYFIN_ADDRESS}
 	header {
 		import header_common

infrastructure/services/caddy/config/website/litellm.caddy

@@ -0,0 +1,5 @@
+{$SCHEME}://litellm.{$MAIN_DOMAIN} {
+	import authelia_middleware
+	reverse_proxy {$LITELLM_ADDRESS} {
+    }
+}

infrastructure/services/caddy/config/website/localai.caddy

@@ -0,0 +1,5 @@
+{$SCHEME}://localai.{$MAIN_DOMAIN} {
+	import authelia_middleware
+	reverse_proxy {$LOCALAI_ADDRESS} {
+    }
+}

infrastructure/services/caddy/config/website/main.caddy

@@ -1,4 +1,5 @@
-www.{$MAIN_DOMAIN} {
+{$SCHEME}://www.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	header {
 		Cache-Control "public, max-age=10"
 		import header_common
@@ -12,11 +13,11 @@ www.{$MAIN_DOMAIN} {
 	reverse_proxy homepage:3000
 }
 
-{$MAIN_DOMAIN} {
+{$SCHEME}://{$MAIN_DOMAIN} {
-	redir https://www.{host}{uri} permanent
+	redir https://www.{$MAIN_DOMAIN}{uri} permanent
 }
 
-public.{$MAIN_DOMAIN} {
+{$SCHEME}://public.{$MAIN_DOMAIN} {
 	root * /public_data
 	file_server browse
 

infrastructure/services/caddy/config/website/memos.caddy

@@ -1,3 +1,4 @@
-memos.{$MAIN_DOMAIN} {
+{$SCHEME}://memos.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$MEMOS_ADDRESS}
 }

infrastructure/services/caddy/config/website/omni-tools.caddy

@@ -1,4 +1,5 @@
-omni-tools.{$MAIN_DOMAIN} {
+{$SCHEME}://omni-tools.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	# Load balance between 2 instances
 	reverse_proxy {
 		to omni-tools0:80 omni-tools1:80

infrastructure/services/caddy/config/website/open-webui.caddy

@@ -1,3 +0,0 @@
-open-webui.{$MAIN_DOMAIN} {
-	reverse_proxy {$OPEN_WEBUI_ADDRESS}
-}

infrastructure/services/caddy/config/website/openwebui.caddy

@@ -0,0 +1,5 @@
+{$SCHEME}://openwebui.{$MAIN_DOMAIN} {
+	import authelia_middleware
+	reverse_proxy {$OPEN_WEBUI_ADDRESS} {
+    }
+}

infrastructure/services/caddy/config/website/picoshare.caddy

@@ -1,3 +1,4 @@
-picoshare.{$MAIN_DOMAIN} {
+{$SCHEME}://picoshare.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$PICOSHARE_ADDRESS}
 }

infrastructure/services/caddy/config/website/privatebin.caddy

@@ -1,7 +1,4 @@
-privatebin.{$MAIN_DOMAIN} {
+{$SCHEME}://privatebin.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$PRIVATEBIN_ADDRESS}
 }
-
-pastebin.{$MAIN_DOMAIN} {
-	redir https://privatebin.{$MAIN_DOMAIN} permanent
-}

infrastructure/services/caddy/config/website/projectsend.caddy

@@ -1,3 +1,4 @@
-projectsend.{$MAIN_DOMAIN} {
+{$SCHEME}://projectsend.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$PROJECTSEND_ADDRESS}
 }

infrastructure/services/caddy/config/website/psitransfer.caddy

@@ -1,7 +1,9 @@
-transfer.{$MAIN_DOMAIN} {
+{$SCHEME}://transfer.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$PSITRANSFER_ADDRESS}
 }
 
-psitransfer.{$MAIN_DOMAIN} {
+{$SCHEME}://psitransfer.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	redir https://transfer.{$MAIN_DOMAIN}{uri} permanent
 }

infrastructure/services/caddy/config/website/qbittorrent.caddy

@@ -1,11 +1,15 @@
-torrent.{$MAIN_DOMAIN} {
+{$SCHEME}://torrent.{$MAIN_DOMAIN} {
-	reverse_proxy {$QBITTORRENT_ADDRESS}
+	import authelia_middleware
+	reverse_proxy {$QBITTORRENT_ADDRESS} {
+		header_up Referer "{$SCHEME}://torrent.{$MAIN_DOMAIN}"
+	}
 	header {
 		Cache-Control "no-store"
 		import header_common
 	}
 }
 
-qbittorrent.{$MAIN_DOMAIN} {
+{$SCHEME}://qbittorrent.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	redir https://torrent.{$MAIN_DOMAIN} permanent
 }

infrastructure/services/caddy/config/website/searxng.caddy

@@ -1,3 +1,4 @@
-searxng.{$MAIN_DOMAIN} {
+{$SCHEME}://searxng.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$SEARXNG_ADDRESS}
 }

infrastructure/services/caddy/config/website/stirlingpdf.caddy

@@ -1,3 +1,4 @@
-stirlingpdf.{$MAIN_DOMAIN} {
+{$SCHEME}://stirlingpdf.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$STIRLINGPDF_ADDRESS}
 }

infrastructure/services/caddy/config/website/syncthing.caddy

@@ -1,4 +1,5 @@
-syncthing.{$MAIN_DOMAIN} {
+{$SCHEME}://syncthing.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$SYNCTHING_ADDRESS} { 
 		header_up Host {upstream_hostport}
 	}

infrastructure/services/caddy/config/website/transmission.caddy

@@ -1,3 +1,4 @@
-transmission.{$MAIN_DOMAIN} {
+{$SCHEME}://transmission.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$TRANSMISSION_ADDRESS} 
 }

infrastructure/services/caddy/config/website/uptimekuma.caddy

@@ -1,4 +1,5 @@
-uptimekuma.{$MAIN_DOMAIN} {
+{$SCHEME}://uptimekuma.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	reverse_proxy {$UPTIMEKUMA_ADDRESS}
 	header {
 		Cache-Control "no-store"

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/config/website/wordpress.caddy

@@ -1,4 +1,5 @@
-wordpress.{$MAIN_DOMAIN} {
+{$SCHEME}://wordpress.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	root * /var/www/html
 	php_fastcgi {$WORDPRESS_ADDRESS}
 
@@ -16,9 +17,6 @@ wordpress.{$MAIN_DOMAIN} {
 	respond /uploads/*.php 404
 
 	header {
-		# disable FLoC tracking
-		Permissions-Policy interest-cohort=()
-
 		# enable HSTS
 		Strict-Transport-Security max-age=31536000;
 
@@ -29,6 +27,6 @@ wordpress.{$MAIN_DOMAIN} {
 		# X-Frame-Options DENY
 
 		# Disable powerful features we don't need
-		Permissions-Policy "geolocation=(), camera=(), microphone=() interest-cohort=()"
+		Permissions-Policy "geolocation=(), camera=(), microphone=()"
 	}
 }

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:5
     ports:
       - 80:80/tcp
       - 80:80/udp
@@ -23,37 +22,18 @@ services:
       - public_data:/public_data:ro
 
     networks:
-      - qbittorrent-network
+      - caddy-infra
-      - syncthing-network
+      - caddy-media
-      - jellyfin-network
+      - caddy-tools
-      - forgejo-network
+      - caddy-files
-      - argus-network
+      - caddy-dev
-      - it-tools-network
+      - caddy-ai
-      - homepage-network
+      - caddy-web
-      - dufs-network
-      - cyberchef-network
-      - open-webui-network
-      - uptimekuma-network
-      - stirlingpdf-network
-      - psitransfer-network
-      - transmission-network
-      - projectsend-network
-      - omni-tools-network
-      - privatebin-network
-      - picoshare-network
-      - memos-network
-      - dependency-track-network
-      - searxng-network
-      - wordpress-network
-#      - satisfactory-network
-#      - teamfortress2-network
-#      - minecraft-network
-#      - 7daystodie-network
-#      - openssh-network
     env_file:
       - ./env/caddy.env
-    security_opt:
+    extends:
-      - no-new-privileges:true
+      file: ../../common.yml
+      service: service-base
     healthcheck:
       test: pidof caddy || exit 1
       interval: 120s
@@ -61,15 +41,17 @@ services:
       retries: 3
 
   caddy_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
     container_name: caddy_backup
     profiles:
       - caddy
     depends_on:
       - caddy
-    restart: on-failure:5
+    restart: on-failure:7
     env_file:
       - ./env/caddy_backup.env
+    environment:
+      - TZ=${TZ:-Europe/Paris}
     volumes:
       - caddy_backup:/mnt/restic
       - caddy_data:/data:ro
@@ -90,3 +72,26 @@ volumes:
     name: wordpress
   public_data:
     name: public_data
+
+networks:
+  caddy-infra:
+    driver: bridge
+    name: caddy-infra
+  caddy-media:
+    driver: bridge
+    name: caddy-media
+  caddy-tools:
+    driver: bridge
+    name: caddy-tools
+  caddy-files:
+    driver: bridge
+    name: caddy-files
+  caddy-dev:
+    driver: bridge
+    name: caddy-dev
+  caddy-ai:
+    driver: bridge
+    name: caddy-ai
+  caddy-web:
+    driver: bridge
+    name: caddy-web

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

@@ -8,7 +8,8 @@ FORGEJO_ADDRESS=forgejo:3000
 UPTIMEKUMA_ADDRESS=uptime-kuma:3001
 MEMOS_ADDRESS=memos:5230
 HOMEPAGE_ADDRESS=homepage:3000
-OPEN_WEBUI_ADDRESS=open-webui:8080
+OPEN_WEBUI_ADDRESS=openwebui:8080
+LITELLM_ADDRESS=litellm:4000
 PICOSHARE_ADDRESS=picoshare:4001
 PRIVATEBIN_ADDRESS=privatebin:8080
 PROJECTSEND_ADDRESS=projectsend:80
@@ -20,3 +21,12 @@ WORDPRESS_ADDRESS=wordpress:9000
 DEPENDENCY_TRACK_FRONTEND_ADDRESS=dependency-track-frontend:8080
 DEPENDENCY_TRACK_APISERVER_ADDRESS=dependency-track-apiserver:8080
 SEARXNG_ADDRESS=searxng:8080
+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
+AUTO_HTTPS_OPTIONS=ignore_loaded_certs

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,50 @@
+services:
+  # vscode-server
+  vscode-server:
+    restart: on-failure:7
+    image: lscr.io/linuxserver/code-server:${VSCODE_SERVER_DOCKER_TAG:-latest}
+    container_name: vscode-server
+    ports:
+      - 8443:8443
+    environment:
+      - TZ=${TZ:-Europe/Paris}
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
+    env_file:
+      - env/vscode-server.env
+    profiles:
+      - vscode-server
+    depends_on:
+      - docker-dind
+    volumes:
+      - vscode-server_config:/config:rw
+    networks:
+      - vscode-server
+
+  # docker-dind
+  docker-dind:
+    image: docker:dind
+    container_name: docker-dind
+    restart: on-failure:7
+    privileged: true
+    entrypoint: ["dockerd"]
+    command:
+      - --host=unix:///var/run/docker.sock
+      - --host=tcp://0.0.0.0:2375
+    volumes:
+      - docker-dind-data:/var/lib/docker
+    networks:
+      - vscode-server
+    profiles:
+      - vscode-server
+
+networks:
+  vscode-server:
+    driver: bridge
+    name: vscode-server
+
+volumes:
+  vscode-server_config:
+    name: vscode-server_config
+  docker-dind-data:
+    name: docker-dind-data

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

@@ -0,0 +1,5 @@
+SUDO_PASSWORD=__GENERATE_SUDO_VSCODE_SERVER_PASSWORD__
+PASSWORD=__GENERATE_VSCODE_SERVER_PASSWORD__
+PROXY_DOMAIN=vscode.bensuperpc.org
+DOCKER_MODS=linuxserver/mods:code-server-python3|linuxserver/mods:universal-docker
+DOCKER_HOST=tcp://docker-dind:2375

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

@@ -1,56 +1,34 @@
 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:5
     depends_on:
       - caddy
     networks:
-      - cyberchef-network
+      - caddy-tools
     read_only: false
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - SYS_ADMIN
-
-    deploy:
-      resources:
-        limits:
-          cpus: '0.5'
-          memory: 512M
-        reservations:
-          cpus: '0.001'
-          memory: 20M
 
   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:5
     depends_on:
       - caddy
     networks:
-      - cyberchef-network
+      - caddy-tools
     read_only: false
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - SYS_ADMIN
-
-    deploy:
-      resources:
-        limits:
-          cpus: '0.5'
-          memory: 512M
-        reservations:
-          cpus: '0.001'
-          memory: 20M
 
 networks:
-  cyberchef-network:
+  caddy-tools:
     driver: bridge
-    name: cyberchef-network
+    name: 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,51 +9,51 @@ services:
         condition: service_healthy
     env_file:
       - ./env/dependency-track.env
-    restart: on-failure:5
+    extends:
+      file: ../../common.yml
+      service: service-base
     networks:
-      - dependency-track-network
+      - caddy-web
-    deploy:
+      - dependency-track-internal
-      resources:
-        limits:
-          memory: 4g
-      restart_policy:
-        condition: on-failure
     volumes:
     - '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:5
+    extends:
+      file: ../../common.yml
+      service: service-base
     networks:
-      - dependency-track-network
+      - caddy-web
+      - dependency-track-internal
     depends_on:
       dependency-track-apiserver:
         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/dependency-track.env
+      - ./env/postgres.env
-    restart: on-failure:5
+    extends:
+      file: ../../common.yml
+      service: service-base
     networks:
-      - dependency-track-network
+      - dependency-track-internal
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}" ]
       interval: 5s
       timeout: 3s
-      retries: 3
+      retries: 5
     volumes:
     - "dtrack-postgres-data:/var/lib/postgresql/data"
 
@@ -64,6 +64,9 @@ volumes:
     name: dtrack-postgres-data
 
 networks:
-  dependency-track-network:
+  caddy-web:
     driver: bridge
-    name: dependency-track-network
+    name: caddy-web
+  dependency-track-internal:
+    driver: bridge
+    name: dependency-track-internal

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

@@ -1,114 +0,0 @@
-# apiserver
-
-    # The Dependency-Track container can be configured using any of the
-    # available configuration properties defined in:
-    # https://docs.dependencytrack.org/getting-started/configuration/
-    # All properties are upper case with periods replaced by underscores.
-    #
-    # Database Properties
-    #   ALPINE_DATABASE_MODE: "external"
-    #   ALPINE_DATABASE_URL: "jdbc:postgresql://postgres10:5432/dtrack"
-    #   ALPINE_DATABASE_DRIVER: "org.postgresql.Driver"
-    #   ALPINE_DATABASE_USERNAME: "dtrack"
-    #   ALPINE_DATABASE_PASSWORD: "changeme"
-    #   ALPINE_DATABASE_POOL_ENABLED: "true"
-    #   ALPINE_DATABASE_POOL_MAX_SIZE: "20"
-    #   ALPINE_DATABASE_POOL_MIN_IDLE: "10"
-    #   ALPINE_DATABASE_POOL_IDLE_TIMEOUT: "300000"
-    #   ALPINE_DATABASE_POOL_MAX_LIFETIME: "600000"
-    #
-    # Optional LDAP Properties
-    #   ALPINE_LDAP_ENABLED: "true"
-    #   ALPINE_LDAP_SERVER_URL: "ldap://ldap.example.com:389"
-    #   ALPINE_LDAP_BASEDN: "dc=example,dc=com"
-    #   ALPINE_LDAP_SECURITY_AUTH: "simple"
-    #   ALPINE_LDAP_BIND_USERNAME: ""
-    #   ALPINE_LDAP_BIND_PASSWORD: ""
-    #   ALPINE_LDAP_AUTH_USERNAME_FORMAT: "%s@example.com"
-    #   ALPINE_LDAP_ATTRIBUTE_NAME: "userPrincipalName"
-    #   ALPINE_LDAP_ATTRIBUTE_MAIL: "mail"
-    #   ALPINE_LDAP_GROUPS_FILTER: "(&(objectClass=group)(objectCategory=Group))"
-    #   ALPINE_LDAP_USER_GROUPS_FILTER: "(member:1.2.840.113556.1.4.1941:={USER_DN})"
-    #   ALPINE_LDAP_GROUPS_SEARCH_FILTER: "(&(objectClass=group)(objectCategory=Group)(cn=*{SEARCH_TERM}*))"
-    #   ALPINE_LDAP_USERS_SEARCH_FILTER: "(&(objectClass=user)(objectCategory=Person)(cn=*{SEARCH_TERM}*))"
-    #   ALPINE_LDAP_USER_PROVISIONING: "false"
-    #   ALPINE_LDAP_TEAM_SYNCHRONIZATION: "false"
-    #
-    # Optional OpenID Connect (OIDC) Properties
-    #   ALPINE_OIDC_ENABLED: "true"
-    #   ALPINE_OIDC_ISSUER: "https://auth.example.com/auth/realms/example"
-    #   ALPINE_OIDC_CLIENT_ID: ""
-    #   ALPINE_OIDC_USERNAME_CLAIM: "preferred_username"
-    #   ALPINE_OIDC_TEAMS_CLAIM: "groups"
-    #   ALPINE_OIDC_USER_PROVISIONING: "true"
-    #   ALPINE_OIDC_TEAM_SYNCHRONIZATION: "true"
-    #
-    # Optional HTTP Proxy Settings
-    #   ALPINE_HTTP_PROXY_ADDRESS: "proxy.example.com"
-    #   ALPINE_HTTP_PROXY_PORT: "8888"
-    #   ALPINE_HTTP_PROXY_USERNAME: ""
-    #   ALPINE_HTTP_PROXY_PASSWORD: ""
-    #   ALPINE_NO_PROXY: ""
-    #
-    # Optional HTTP Outbound Connection Timeout Settings. All values are in seconds.
-    #   ALPINE_HTTP_TIMEOUT_CONNECTION: "30"
-    #   ALPINE_HTTP_TIMEOUT_SOCKET: "30"
-    #   ALPINE_HTTP_TIMEOUT_POOL: "60"
-    #
-    # Optional Cross-Origin Resource Sharing (CORS) Headers
-    #   ALPINE_CORS_ENABLED: "true"
-    #   ALPINE_CORS_ALLOW_ORIGIN: "*"
-    #   ALPINE_CORS_ALLOW_METHODS: "GET, POST, PUT, DELETE, OPTIONS"
-    #   ALPINE_CORS_ALLOW_HEADERS: "Origin, Content-Type, Authorization, X-Requested-With, Content-Length, Accept, Origin, X-Api-Key, X-Total-Count, *"
-    #   ALPINE_CORS_EXPOSE_HEADERS: "Origin, Content-Type, Authorization, X-Requested-With, Content-Length, Accept, Origin, X-Api-Key, X-Total-Count"
-    #   ALPINE_CORS_ALLOW_CREDENTIALS: "true"
-    #   ALPINE_CORS_MAX_AGE: "3600"
-    #
-    # Optional logging configuration
-    #   LOGGING_LEVEL: "INFO"
-    #   LOGGING_CONFIG_PATH: "logback.xml"
-    #
-    # Optional metrics properties
-    #   ALPINE_METRICS_ENABLED: "true"
-    #   ALPINE_METRICS_AUTH_USERNAME: ""
-    #   ALPINE_METRICS_AUTH_PASSWORD: ""
-    #
-    # Optional environmental variables to enable default notification publisher templates override and set the base directory to search for templates
-    #   DEFAULT_TEMPLATES_OVERRIDE_ENABLED: "false"
-    #   DEFAULT_TEMPLATES_OVERRIDE_BASE_DIRECTORY: "/data"
-    #
-    # Optional configuration for the Snyk analyzer
-    #   SNYK_THREAD_BATCH_SIZE: "10"
-    #
-    # Optional environmental variables to provide more JVM arguments to the API Server JVM, i.e. "-XX:ActiveProcessorCount=8"
-    #   EXTRA_JAVA_OPTIONS: ""
-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"
-
-
-
-# frontend
-
-
-      # The base URL of the API server.
-      # NOTE:
-      #   * This URL must be reachable by the browsers of your users.
-      #   * The frontend container itself does NOT communicate with the API server directly, it just serves static files.
-      #   * When deploying to dedicated servers, please use the external IP or domain of the API server.
-      # OIDC_ISSUER: ""
-      # OIDC_CLIENT_ID: ""
-      # OIDC_SCOPE: ""
-      # OIDC_FLOW: ""
-      # OIDC_LOGIN_BUTTON_TEXT: ""
-      # volumes:
-      # - "/host/path/to/config.json:/app/static/config.json"
-
-API_BASE_URL="https://dependency-track.bensuperpc.org"
-
-# postgres
-POSTGRES_DB="dtrack"
-POSTGRES_USER="dtrack"
-POSTGRES_PASSWORD="dtrack"

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

@@ -0,0 +1,7 @@
+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="__GENERATE_DTRACK_DB_PASSWORD__"
+
+API_BASE_URL="https://dependency-track.bensuperpc.org"

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

@@ -0,0 +1,8 @@
+users:
+  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

@@ -0,0 +1,56 @@
+services:
+  dozzle:
+    image: amir20/dozzle:${DOZZLE_DOCKER_TAG:-latest}
+    container_name: dozzle
+    profiles:
+      - dozzle
+    restart: on-failure:7
+    depends_on:
+      - caddy
+      - dozzle-dockerproxy
+    env_file:
+      - ./env/dozzle.env
+    environment:
+      - TZ=${TZ:-Europe/Paris}
+    volumes:
+      - dozzle_data:/data
+    secrets:
+      - source: dozzle_users
+        target: /data/users.yml
+    networks:
+      - caddy-infra
+      - dozzle-internal
+    
+  dozzle-dockerproxy:
+    image: tecnativa/docker-socket-proxy:${DOCKER_SOCKET_PROXY_DOCKER_TAG:-latest}
+    container_name: dozzle-dockerproxy
+    profiles:
+      - dozzle
+    restart: on-failure:7
+    environment:
+      - CONTAINERS=1
+      - POST=0
+      - PING=1
+      - VERSION=1
+      - EVENTS=1
+      - INFO=1
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    networks:
+      - dozzle-internal
+
+networks:
+  caddy-infra:
+    driver: bridge
+    name: caddy-infra
+  dozzle-internal:
+    driver: bridge
+    name: dozzle-internal
+  
+volumes:
+  dozzle_data:
+    name: dozzle_data
+
+secrets:
+  dozzle_users:
+    file: ./config/users.yml

infrastructure/services/dozzle/env/dozzle.env.example

@@ -0,0 +1,2 @@
+DOZZLE_AUTH_PROVIDER=simple
+DOZZLE_REMOTE_HOST=tcp://dozzle-dockerproxy:2375

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:5
+    extends:
+      file: ../../common.yml
+      service: service-base
     depends_on:
       - caddy
     env_file:
@@ -14,9 +16,7 @@ services:
     volumes:
       - public_data:/data
     networks:
-      - dufs-network
+      - caddy-files
-    security_opt:
-      - no-new-privileges:true
 
 volumes:
   public_data:
@@ -25,6 +25,6 @@ volumes:
     name: private_data
 
 networks:
-  dufs-network:
+  caddy-files:
     driver: bridge
-    name: dufs-network
+    name: caddy-files

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,11 +1,11 @@
 services:
   # forgejo
   forgejo:
-    image: codeberg.org/forgejo/forgejo:15
+    image: codeberg.org/forgejo/forgejo:${FORGEJO_DOCKER_TAG:-15}
     container_name: forgejo
     profiles:
       - forgejo
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - database_forgejo
       - caddy
@@ -18,37 +18,38 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     networks:
-      - forgejo-network
+      - caddy-dev
+      - forgejo-internal
 #    user: ${PUID:-1000}:${PGID:-1000} 
     security_opt:
       - no-new-privileges:true
   
   # 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:5
+    extends:
+      file: ../../common.yml
+      service: service-base
     volumes:
       - forgejo_db:/var/lib/mysql:rw
     env_file:
       - ./env/forgejo_db.env
     command: '--default-authentication-plugin=mysql_native_password'
     networks:
-      - forgejo-network
+      - 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:
-      - forgejo-network
+      - forgejo-internal
     profiles:
       - forgejo-runner
     privileged: true
@@ -59,9 +60,9 @@ 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-network
+      - forgejo-internal
     profiles:
       - forgejo-runner
     depends_on:
@@ -75,7 +76,7 @@ services:
 #      - ./config/forgejo_runner/config.yaml:/config.yaml:ro
       - forgejo_runner:/data
       - forgejo_certs:/certs
-    restart: 'unless-stopped'
+    restart: on-failure:7
 
 #    command: '/bin/sh -c "while : ; do sleep 1 ; done ;"'
     command: '/bin/sh -c "sleep 5; forgejo-runner -c /data/config.yml daemon"'
@@ -91,6 +92,9 @@ volumes:
     name: forgejo_runner
 
 networks:
-  forgejo-network:
+  caddy-dev:
     driver: bridge
-    name: forgejo-network
+    name: caddy-dev
+  forgejo-internal:
+    driver: bridge
+    name: forgejo-internal

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