Bump actions/checkout from 5 to 7

Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/main.yml

@@ -22,14 +22,14 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: "Checkout Code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
         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

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
         with:
           token: ${{ secrets.CI_TOKEN }}
           repository: ${{ github.repository }}

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
+# 7dtd minecraft satisfactory torrent
-CONFIGS := minecraft satisfactory
+CONFIGS := torrent
 #DOCKER_PROFILES := 
 
 include DockerCompose.mk

README.md

@@ -1,30 +1,30 @@
 # Infrastructure
 
-_Open source, decentralized and self-hosted infrastructure for many 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] Wordpress (Via FASTCGI/caddy)
+- [x] Homepage (Dashboard)
-- [x] Jellyfin (Media server)
+- [x] SearXNG (Self-hosted search engine)
+- [x] Jellyfin (Eg Netflix, Disney+)
 - [x] Forgejo (Git server, fork of Gitea)
 - [x] Uptime Kuma (Monitoring)
-- [x] qbittorrent and transmission (Torrent client/server)
+- [x] Argus (Application update monitoring)
 - [x] SyncThing (File synchronization)
+- [x] Dufs (File server)
 - [x] PsiTransfer, ProjectSend, Picoshare (File sharing)
-- [x] it-tools and omni-tools (Tools for IT)
+- [x] it-tools, omni-tools and cyberchef (Tools for IT)
-- [x] Open-WebUI (Local chatGPT)
+- [x] Privatebin
-- [x] Privatebin (Pastebin)
+- [x] Memos (Note-taking)
-- [X] [Satisfactory](https://github.com/bensuperpc/docker-satisfactory)
+- [x] Stirling PDF (PDF tools)
-- [x] [7 days to die](https://github.com/bensuperpc/docker-7daystodie)
+- [x] Wordpress (Via FASTCGI/caddy)
-- [x] [minecraft](https://github.com/bensuperpc/docker-minecraft-server)
+- [x] Dependency-Track (SBOM / vulnerability tracking)
+- [X] Game (Satisfactory, Minecraft, 7 Days to Die, Team Fortress 2 etc...)
 
 ## Architecture
 
@@ -44,8 +44,8 @@ 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, 25565, 26900, 26901, 26903)
+- 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:
 
@@ -56,10 +56,13 @@ List of ports used by the services in this infrastructure:
 | 22          | Forgejo       | Git/SSH access    |
 | 2222        | OpenSSH       | Global SSH access |
 | 7777        | Satisfactory  | Game server port  |
+| 8888        | Satisfactory  | Game server port  |
 | 25565       | Minecraft     | Game server port  |
+| 8100        | Bluemap Minecraft | Web map port  |
 | 26900       | 7 Days to Die | Game server port  |
 | 26901       | 7 Days to Die | Game server port  |
 | 26903       | 7 Days to Die | Game server port  |
+| 27015       | Team Fortress 2 | Game server port |
 
 
 **To avoid get rate limit from letsencrypt (10 certificates per 3 hours), you need to disable some certificates in the caddyfiles and enable them 3h later...**
@@ -78,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
 
@@ -88,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
 
@@ -96,25 +121,29 @@ 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  | Caddy 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                       |
+| [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org)       | Sub  | Wordpress website                                            |
 
 ### Configure the infrastructure
 
@@ -136,27 +165,52 @@ For [caddy_backup.env](infrastructure/services/caddy/env/caddy_backup.env) file,
 RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
 ```
 
-#### Wordpress
+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).
-
-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
+MAIN_DOMAIN=bensuperpc.org
-WORDPRESS_DB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
+MAIL_DOMAIN=bensuperpc@gmail.com
+# Scheme
+SCHEME=https
+# ignore_loaded_certs off
+AUTO_HTTPS_OPTIONS=ignore_loaded_certs
 ```
 
-For [wordpress_db.env](infrastructure/services/wordpress/env/wordpress_db.env) file, you need to change the password(s) and user for the database.
+#### Authelia
+
+For [authelia.env](infrastructure/services/authelia/env/authelia.env) file, you need to change the password(s) and secret key:
 
 ```sh
-MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
+AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET=ht87MVnXkXhBpDkMUHqKDqdg8UGBJt+Fx5jNIqXnN2k=
-MARIADB_USER=bensuperpc
+AUTHELIA_SESSION_SECRET=nsvbXKGRXVZUCUkOapntlq/Zh+d75WacTK5Jgyh8zYk=
-MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
+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=
 ```
 
-For [wordpress_backup.env](infrastructure/services/wordpress/env/wordpress_backup.env) file, you need to change the password(s) for the restic backup.
+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
-RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
+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)
+
+```sh
+docker run --rm authelia/authelia:latest authelia crypto hash generate argon2 --password 'MyPassword'
+```
+
+#### Dozzle
+
+To generate a new user for dozzle, you can use the following command [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
@@ -223,37 +277,32 @@ USER_PASSWORD=rdUwf36C11PLmpU9Lvq7tP5pfFBKAuCh
 
 #### Open-WebUI
 
-For [open-webui.env](infrastructure/services/open-webui/env/open-webui.env) file, entirely optional.
+For [open-webui.env](infrastructure/services/open-webui/env/open-webui.env) file, you must change the secret key for the webui and configure its PostgreSQL backend.
 
-To download the model, you can use:
+```sh
+WEBUI_SECRET_KEY=7d83b15a417d090ba5c6b899270a05dd215c60848354c0c7574226d6ff02f39e
+```
+
+Also update [openwebui-postgres.env](infrastructure/services/open-webui/env/openwebui-postgres.env) with your own credentials.
+
+To download the model, through open-webui GUI or you can use the following command:
 
 ```sh
 docker exec -it ollama ollama run deepseek-r1:8b
 ```
 
-### Start the infrastructure
+#### Dependency-Track
 
-Start the website with:
+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.
 
 ```sh
-make start-at
+POSTGRES_USER=dtrack
+POSTGRES_PASSWORD=<your_password>
+POSTGRES_DB=dtrack_db
+ALPINE_DATA_DIRECTORY=/data
 ```
 
-Stop the website with (or CTRL+C with the previous command):
+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**.
-
-```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
 
@@ -274,7 +323,7 @@ Once the installation is complete, you need to set the installation lock:
 FORGEJO__security__INSTALL_LOCK=true
 ```
 
-### Forgejo Runner
+### Forgejo Runner (Out of date)
 
 ```sh
 docker exec -it forgejo_runner /bin/bash
@@ -325,7 +374,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:
 
@@ -333,6 +382,76 @@ You can access to the server with:
 ssh -p 2222 admin@bensuperpc.org
 ```
 
+### Qbittorrent
+
+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.
+
+#### 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/)
@@ -348,6 +467,7 @@ ssh -p 2222 admin@bensuperpc.org
 - [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/)
@@ -370,6 +490,10 @@ ssh -p 2222 admin@bensuperpc.org
 - [Forgejo-runner](https://code.forgejo.org/forgejo/runner)
 - [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)
+- [SearXNG](https://github.com/searxng/searxng)
+- [Dependency-Track](https://dependencytrack.org/)
+- [Authelia](https://www.authelia.com/)
 
 ## License
 

infrastructure/docker-compose.yml

@@ -41,6 +41,18 @@ include:
   - services/uptime-kuma/docker-compose.uptime-kuma.yml
 # open-webui
   - services/open-webui/docker-compose.open-webui.yml
+# Memos
+  - services/memos/docker-compose.memos.yml
+# Argus
+  - services/argus/docker-compose.argus.yml
+# Dependency-Track
+  - 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
 # Minecraft
   - services/minecraft-server/docker-compose.yml
 # 7daystodie

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

@@ -5,7 +5,7 @@ services:
     container_name: 7daystodie_server
     profiles:
       - 7daystodie_server
-    restart: on-failure:5
+    restart: on-failure:7
     ports:
       - "26900:26900"
       - "26901:26901"
@@ -19,12 +19,13 @@ services:
       - 7daystodie_server_file:/home/sdtdserver/serverfiles                # Optional - serverfiles folder
       - 7daystodie_server_log:/home/sdtdserver/log   
     networks:
-      - infra-network
+      - 7daystodie-network
     env_file:
       - ./env/7daystodie.env
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
+      - TZ=${TZ:-Europe/Paris}
     # security_opt:
     #   - no-new-privileges:true
     # cap_drop:
@@ -49,6 +50,7 @@ volumes:
     name: 7daystodie_server_log
 
 networks:
-  infra-network:
+  7daystodie-network:
     driver: bridge
-    name: infra-network
+    name: 7daystodie-network
+

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

@@ -6,7 +6,7 @@ services:
       - 7daystodie_backup
     depends_on:
       - 7daystodie_server
-    restart: on-failure:5
+    restart: on-failure:7
     env_file:
       - ./env/7daystodie_backup.env
     volumes:

infrastructure/services/argus/config/config.yml

@@ -0,0 +1,87 @@
+settings:
+  log:
+    level: DEBUG
+defaults:
+  service:
+    latest_version:
+      access_token: <secret>
+    deployed_version:
+      allow_invalid_certs: true
+notify:
+  default_gotify:
+    type: gotify
+    url_fields:
+      host: gotify.example.io
+      token: <secret>
+  default_mattermost:
+    type: mattermost
+    url_fields:
+      host: localhost
+      port: "8081"
+      token: <secret>
+webhook:
+  awx_more:
+    type: github
+    url: http://localhost:8081
+    secret: <secret>
+    silent_fails: true
+  awx_other:
+    type: github
+    url: https://localhost:8081/api/v2/job_templates/36/github/
+    secret: <secret>
+    silent_fails: true
+service:
+  forgejo:
+    latest_version:
+      type: url
+      url: https://code.forgejo.org/api/v1/repos/forgejo/forgejo/releases
+      url_commands:
+        - type: regex
+          regex: "['\"]tag_name['\"]: *['\"]v?([0-9.]+(?:-dev)?)['\"]"
+    deployed_version:
+      type: url
+      url: https://code.forgejo.org
+      regex: Powered by Forgejo.*\s+Version:\s+([0-9.]+(?:-dev)?)
+    dashboard:
+      web_url: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/{{ version }}.md
+      icon: https://code.forgejo.org/assets/img/logo.svg
+      tags:
+        - go
+  svt-av1:
+    latest_version:
+      type: url
+      url: https://gitlab.com/api/v4/projects/AOMediaCodec%2FSVT-AV1/repository/tags?order_by=version&sort=desc
+      url_commands:
+        - type: regex
+          regex: '"name":"v?([0-9.]+(?:-rc[0-9]+)?)"'
+    dashboard:
+      icon: https://upload.wikimedia.org/wikipedia/commons/8/84/AV1_logo_2018.svg
+      web_url: https://gitlab.com/AOMediaCodec/SVT-AV1/-/releases/v{{ version }}
+    tags:
+      - av1
+      - video
+      - encoder
+  ffmpeg:
+    latest_version:
+      type: url
+      url: https://api.github.com/repos/FFmpeg/FFmpeg/tags
+      url_commands:
+        - type: regex
+          regex: '"name":"n?([0-9.]+)"'
+    dashboard:
+      icon: https://upload.wikimedia.org/wikipedia/commons/7/76/FFmpeg_icon.svg?utm_source=commons.wikimedia.org&utm_campaign=index&utm_content=original
+      web_url: https://github.com/FFmpeg/FFmpeg/releases/tag/n{{ version }}
+  qbittorrent:
+    latest_version:
+      type: url
+      url: https://api.github.com/repos/qbittorrent/qBittorrent/releases/latest
+      url_commands:
+        - type: regex
+          regex: '"tag_name":"release-([0-9.]+)"'
+    dashboard:
+      icon: https://upload.wikimedia.org/wikipedia/commons/6/66/New_qBittorrent_Logo.svg
+      web_url: https://github.com/qbittorrent/qBittorrent/releases/tag/release-{{ version }}
+    tags:
+      - bittorrent
+      - qt
+      - cplusplus

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

@@ -0,0 +1,34 @@
+services:
+  # argus
+  argus:
+    image: releaseargus/argus:latest
+    container_name: argus
+    profiles:
+      - argus
+    environment:
+      - ARGUS_UID=${PUID:-1000}
+      - ARGUS_GID=${PGID:-1000}
+      - TZ=${TZ:-Europe/Paris}
+    restart: on-failure:7
+    depends_on:
+      - caddy
+    networks:
+      - caddy-infra
+    volumes:
+      - argus_data:/app/data/
+      - ./config/config.yml:/app/config.yml
+    # healthcheck:
+    #   test: ["CMD", "/healthcheck", "http://localhost:8080/api/v1/healthcheck"]
+    #   interval: 1m
+    #   timeout: 10s
+    #   retries: 3
+    #   start_period: 10s
+
+volumes:
+  argus_data:
+    name: argus_data
+
+networks:
+  caddy-infra:
+    driver: bridge
+    name: caddy-infra

infrastructure/services/authelia/config/configuration.yml

@@ -0,0 +1,64 @@
+theme: auto
+
+server:
+  address: "tcp://0.0.0.0:9091"
+
+log:
+  level: info
+
+authentication_backend:
+  file:
+    path: /config/users_database.yml
+
+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"
+        - "wordpress.bensuperpc.org"
+        - "homepage.bensuperpc.org"
+      policy: bypass
+    - domain: 
+        - "jellyfin.bensuperpc.org"
+        - "openwebui.bensuperpc.org"
+        - "searxng.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: 15m
+
+storage:
+  postgres: {}
+
+notifier:
+  filesystem:
+    filename: /config/notification.txt

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:latest
+    profiles:
+      - authelia
+      - caddy
+    depends_on:
+      authelia-postgres:
+        condition: service_healthy
+    # 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
+    container_name: authelia-postgres
+    restart: on-failure:7
+    volumes:
+      - authelia_db_data:/var/lib/postgresql/data
+    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
+      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

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

infrastructure/services/authelia/env/authelia_postgres.env

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

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
@@ -39,3 +39,8 @@ import website/projectsend.caddy
 import website/qbittorrent.caddy
 import website/syncthing.caddy
 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

infrastructure/services/caddy/config/website/argus.caddy

@@ -0,0 +1,4 @@
+{$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,6 @@
+(authelia_middleware) {
+    forward_auth authelia:9091 {
+        uri /api/authz/forward-auth
+        copy_headers Remote-User Remote-Groups Remote-Name Remote-Email
+    }
+}

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

@@ -0,0 +1,5 @@
+{$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} {
-	reverse_proxy forgejo:3000
+	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:3000
+	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,5 +1,6 @@
-jellyfin.{$MAIN_DOMAIN} {
+{$SCHEME}://jellyfin.{$MAIN_DOMAIN} {
-	reverse_proxy jellyfin:8096
+	import authelia_middleware
+	reverse_proxy {$JELLYFIN_ADDRESS}
 	header {
 		import header_common
 	}

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} {
-	reverse_proxy memos:5230
+	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:8080
-}

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

@@ -0,0 +1,4 @@
+{$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} {
-	reverse_proxy picoshare:4001
+	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} {
-	reverse_proxy privatebin:8080
+	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} {
-	reverse_proxy projectsend:80
+	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} {
-	reverse_proxy psitransfer:3000
+	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:8080
+	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

@@ -0,0 +1,4 @@
+{$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} {
-	reverse_proxy stirlingpdf:8080
+	import authelia_middleware
+	reverse_proxy {$STIRLINGPDF_ADDRESS}
 }

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

@@ -1,5 +1,6 @@
-syncthing.{$MAIN_DOMAIN} {
+{$SCHEME}://syncthing.{$MAIN_DOMAIN} {
-	reverse_proxy syncthing:8384 {
+	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} {
-	reverse_proxy transmission:9091
+	import authelia_middleware
+	reverse_proxy {$TRANSMISSION_ADDRESS} 
 }

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

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

infrastructure/services/caddy/config/website/wordpress.caddy

@@ -1,6 +1,7 @@
-wordpress.{$MAIN_DOMAIN} {
+{$SCHEME}://wordpress.{$MAIN_DOMAIN} {
+	import authelia_middleware
 	root * /var/www/html
-	php_fastcgi wordpress:9000
+	php_fastcgi {$WORDPRESS_ADDRESS}
 
 	file_server
 	encode zstd gzip
@@ -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

@@ -1,14 +1,15 @@
 services:
   # Caddy
   caddy:
-    image: bensuperpc/caddy-l4:latest
+    #image: bensuperpc/caddy-l4:latest
+    image: caddy:latest
     container_name: caddy
     profiles:
       - caddy
     depends_on:
       main_infrastructure:
         condition: service_completed_successfully
-    restart: on-failure:5
+    restart: on-failure:7
     ports:
       - 80:80/tcp
       - 80:80/udp
@@ -22,9 +23,17 @@ services:
       - public_data:/public_data:ro
 
     networks:
-      - infra-network
+      - caddy-infra
+      - caddy-media
+      - caddy-tools
+      - caddy-files
+      - caddy-dev
+      - caddy-ai
+      - caddy-web
     env_file:
       - ./env/caddy.env
+    environment:
+      - TZ=${TZ:-Europe/Paris}
     security_opt:
       - no-new-privileges:true
     healthcheck:
@@ -40,9 +49,11 @@ services:
       - 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
@@ -63,3 +74,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

@@ -1,2 +1,28 @@
 MAIN_DOMAIN=bensuperpc.org
 MAIL_DOMAIN=bensuperpc@gmail.com
+# Services
+JELLYFIN_ADDRESS=jellyfin:8096
+QBITTORRENT_ADDRESS=qbittorrent:8080
+ARGUS_ADDRESS=argus:8080
+FORGEJO_ADDRESS=forgejo:3000
+UPTIMEKUMA_ADDRESS=uptime-kuma:3001
+MEMOS_ADDRESS=memos:5230
+HOMEPAGE_ADDRESS=homepage:3000
+OPEN_WEBUI_ADDRESS=openwebui:8080
+PICOSHARE_ADDRESS=picoshare:4001
+PRIVATEBIN_ADDRESS=privatebin:8080
+PROJECTSEND_ADDRESS=projectsend:80
+STIRLINGPDF_ADDRESS=stirlingpdf:8080
+SYNCTHING_ADDRESS=syncthing:8384
+TRANSMISSION_ADDRESS=transmission:9091
+PSITRANSFER_ADDRESS=psitransfer:3000
+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
+# Scheme
+SCHEME=https
+# ignore_loaded_certs off
+AUTO_HTTPS_OPTIONS=ignore_loaded_certs

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

@@ -5,11 +5,11 @@ services:
     container_name: cyberchef0
     profiles:
       - cyberchef
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     networks:
-      - infra-network
+      - caddy-tools
     read_only: false
     security_opt:
       - no-new-privileges:true
@@ -30,11 +30,11 @@ services:
     container_name: cyberchef1
     profiles:
       - cyberchef
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     networks:
-      - infra-network
+      - caddy-tools
     read_only: false
     security_opt:
       - no-new-privileges:true
@@ -49,3 +49,8 @@ services:
         reservations:
           cpus: '0.001'
           memory: 20M
+
+networks:
+  caddy-tools:
+    driver: bridge
+    name: caddy-tools

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

@@ -0,0 +1,74 @@
+services:
+  dependency-track-apiserver:
+    image: dependencytrack/apiserver
+    container_name: dependency-track-apiserver
+    profiles:
+      - dependency-track
+    depends_on:
+      dependency-track-postgres:
+        condition: service_healthy
+    env_file:
+      - ./env/dependency-track.env
+    restart: on-failure:7
+    networks:
+      - caddy-web
+      - dependency-track-internal
+    deploy:
+      resources:
+        limits:
+          memory: 4g
+      restart_policy:
+        condition: on-failure
+    volumes:
+    - 'dtrack-data:/data'
+
+  dependency-track-frontend:
+    image: dependencytrack/frontend
+    container_name: dependency-track-frontend
+    profiles:
+      - dependency-track
+    restart: on-failure:7
+    networks:
+      - 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
+    container_name: dependency-track-postgres
+    profiles:
+      - dependency-track
+    env_file:
+      - ./env/postgres.env
+    restart: on-failure:7
+    networks:
+      - dependency-track-internal
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}" ]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+    volumes:
+    - "dtrack-postgres-data:/var/lib/postgresql/data"
+
+volumes:
+  dtrack-data:
+    name: dtrack-data
+  dtrack-postgres-data:
+    name: dtrack-postgres-data
+
+networks:
+  caddy-web:
+    driver: bridge
+    name: caddy-web
+  dependency-track-internal:
+    driver: bridge
+    name: dependency-track-internal

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

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

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

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

infrastructure/services/dozzle/config/users.yml

@@ -0,0 +1,7 @@
+users:
+  bensuperpc:
+    email: bensuperpc@gmail.com
+    name: bensuperpc
+    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: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: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

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

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

@@ -6,7 +6,7 @@ services:
     profiles:
       - dufs
 #    user: ${PUID:-1000}:${PGID:-1000} 
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     env_file:
@@ -14,7 +14,7 @@ services:
     volumes:
       - public_data:/data
     networks:
-      - infra-network
+      - caddy-files
     security_opt:
       - no-new-privileges:true
 
@@ -23,3 +23,8 @@ volumes:
     name: public_data
   private_data:
     name: private_data
+
+networks:
+  caddy-files:
+    driver: bridge
+    name: caddy-files

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

@@ -1,11 +1,11 @@
 services:
   # forgejo
   forgejo:
-    image: codeberg.org/forgejo/forgejo:13
+    image: codeberg.org/forgejo/forgejo:15
     container_name: forgejo
     profiles:
       - forgejo
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - database_forgejo
       - caddy
@@ -18,7 +18,8 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     networks:
-      - infra-network
+      - caddy-dev
+      - forgejo-internal
 #    user: ${PUID:-1000}:${PGID:-1000} 
     security_opt:
       - no-new-privileges:true
@@ -31,14 +32,14 @@ services:
       - forgejo
     depends_on:
       - caddy
-    restart: on-failure:5
+    restart: on-failure:7
     volumes:
       - forgejo_db:/var/lib/mysql:rw
     env_file:
       - ./env/forgejo_db.env
     command: '--default-authentication-plugin=mysql_native_password'
     networks:
-      - infra-network
+      - forgejo-internal
     security_opt:
       - no-new-privileges:true
 
@@ -48,7 +49,7 @@ services:
     container_name: 'docker_dind'
     hostname: docker
     networks:
-      - infra-network
+      - forgejo-internal
     profiles:
       - forgejo-runner
     privileged: true
@@ -61,11 +62,9 @@ services:
   forgejo_runner:
     image: data.forgejo.org/forgejo/runner:12
     networks:
-      - infra-network
+      - forgejo-internal
     profiles:
       - forgejo-runner
-    links:
-      - docker-in-docker
     depends_on:
       docker-in-docker:
         condition: service_started
@@ -91,3 +90,11 @@ volumes:
     name: forgejo_certs
   forgejo_runner:
     name: forgejo_runner
+
+networks:
+  caddy-dev:
+    driver: bridge
+    name: caddy-dev
+  forgejo-internal:
+    driver: bridge
+    name: forgejo-internal

infrastructure/services/homepage/config/docker.yaml

@@ -2,9 +2,6 @@
 # For configuration options and examples, please see:
 # https://gethomepage.dev/configs/docker
 
-#jellyfin:
+my-docker:
-#  host: jellyfin
+  host: homepage-dockerproxy
-#  port: 8096
+  port: 2375
-
-#my-docker:
-#   socket: /var/run/docker.sock

infrastructure/services/homepage/config/services.yaml

@@ -2,112 +2,135 @@
 # For configuration options and examples, please see:
 # https://gethomepage.dev/configs/services/
 
-- Personal:
+- Public:
-    - wordpress:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/wordpress.png
-        href: https://wordpress.bensuperpc.org/
-        description: Wordpress
-        ping: wordpress.bensuperpc.org
-        container: wordpress
-    - jellyfin:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/jellyfin.png
-        href: https://jellyfin.bensuperpc.org/
-        description: Jellyfin
-        ping: jellyfin.bensuperpc.org
-        container: jellyfin
-    - projectsend:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/projectsend.png
-        href: https://projectsend.bensuperpc.org/
-        description: ProjectSend
-        ping: projectsend.bensuperpc.org
-        container: projectsend
-- Sharing:
-    - psitransfer:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/psitransfer.png
-        href: https://psitransfer.bensuperpc.org/
-        description: PsiTransfer
-        ping: psitransfer.bensuperpc.org
-        container: psitransfer
-    - picoshare:
-#        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/picoshare.png
-        href: https://picoshare.bensuperpc.org/
-        description: PicoShare
-        ping: picoshare.bensuperpc.org
-        container: picoshare
-    - privatebin:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/privatebin.png
-        href: https://privatebin.bensuperpc.org/
-        description: PrivateBin
-        ping: privatebin.bensuperpc.org
-        container: privatebin
-    - qbittorrent:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/qbittorrent.png
-        href: https://qbittorrent.bensuperpc.org/
-        description: qBittorrent
-        ping: qbittorrent.bensuperpc.org
-        container: qbittorrent
-    - syncthing:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/syncthing.png
-        href: https://syncthing.bensuperpc.org/
-        description: Syncthing
-        ping: syncthing.bensuperpc.org
-        container: syncthing
-    - transmission:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/transmission.png
-        href: https://transmission.bensuperpc.org/
-        description: Transmission
-        ping: transmission.bensuperpc.org
-        container: transmission
-    - dufs:
-#        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/dufs.png
-        href: https://dufs.bensuperpc.org/
-        description: Dufs
-        ping: dufs.bensuperpc.org
-        container: dufs
-#    - caddy:
-#        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/caddy.png
-#        href: https://public.bensuperpc.org/
-#        description: File browser
-#        ping: public.bensuperpc.org
-#        container: caddy
-
-- Utils:
     - it-tools:
         icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/it-tools.png
         href: https://it-tools.bensuperpc.org/
         description: IT Tools
-        ping: it-tools.bensuperpc.org
+        # ping: it-tools.bensuperpc.org
         container: it-tools0
+        server: my-docker
     - omni-tools:
         icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/it-tools.png
         href: https://omni-tools.bensuperpc.org/
         description: Omni Tools
-        ping: omni-tools.bensuperpc.org
+        # ping: omni-tools.bensuperpc.org
         container: omni-tools0
+        server: my-docker
     - cyberchef:
         icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/cyberchef.png
         href: https://cyberchef.bensuperpc.org/
         description: CyberChef
-        ping: cyberchef.bensuperpc.org
+        # ping: cyberchef.bensuperpc.org
         container: cyberchef0
+        server: my-docker
+    - caddy:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/caddy.png
+        href: https://public.bensuperpc.org/
+        description: File browser
+        # ping: public.bensuperpc.org
+        container: caddy
+        server: my-docker
+    - psitransfer:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/psitransfer.png
+        href: https://psitransfer.bensuperpc.org/
+        description: PsiTransfer
+        # ping: psitransfer.bensuperpc.org
+        container: psitransfer
+        server: my-docker
     - stirlingpdf:
         #icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/stirlingpdf.png
         href: https://stirlingpdf.bensuperpc.org/
         description: StirlingPDF
-        ping: stirlingpdf.bensuperpc.org
+        # ping: stirlingpdf.bensuperpc.org
         container: stirlingpdf
+        server: my-docker
+    - privatebin:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/privatebin.png
+        href: https://privatebin.bensuperpc.org/
+        description: PrivateBin
+        # ping: privatebin.bensuperpc.org
+        container: privatebin
+        server: my-docker
     - forgejo:
         icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/forgejo.png
         href: https://forgejo.bensuperpc.org/
         description: Forgejo
-        ping: forgejo.bensuperpc.org
+        # ping: forgejo.bensuperpc.org
         container: forgejo
+        server: my-docker
+    - wordpress:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/wordpress.png
+        href: https://wordpress.bensuperpc.org/
+        description: Wordpress
+        # ping: wordpress.bensuperpc.org
+        container: wordpress
+        server: my-docker
+    - dufs:
+#        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/dufs.png
+        href: https://dufs.bensuperpc.org/
+        description: Dufs
+        # ping: dufs.bensuperpc.org
+        container: dufs
+        server: my-docker
+
+- Personal:
+    - jellyfin:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/jellyfin.png
+        href: https://jellyfin.bensuperpc.org/
+        description: Jellyfin
+        # ping: jellyfin.bensuperpc.org
+        container: jellyfin
+        server: my-docker
+    - projectsend:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/projectsend.png
+        href: https://projectsend.bensuperpc.org/
+        description: ProjectSend
+        # ping: projectsend.bensuperpc.org
+        container: projectsend
+        server: my-docker
+    - searxng:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/searxng.png
+        href: https://searxng.bensuperpc.org/
+        description: SearXNG
+        # ping: searxng.bensuperpc.org
+        container: searxng
+        server: my-docker
     - open-webui:
         icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/open-webui.png
-        href: https://open-webui.bensuperpc.org/
+        href: https://openwebui.bensuperpc.org/
         description: ChatGPT local
-        ping: open-webui.bensuperpc.org
+        # ping: openwebui.bensuperpc.org
-        container: open-webui
+        container: openwebui
+        server: my-docker
+    - picoshare:
+#        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/picoshare.png
+        href: https://picoshare.bensuperpc.org/
+        description: PicoShare
+        # ping: picoshare.bensuperpc.org
+        container: picoshare
+        server: my-docker
+    - qbittorrent:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/qbittorrent.png
+        href: https://qbittorrent.bensuperpc.org/
+        description: qBittorrent
+        # ping: qbittorrent.bensuperpc.org
+        container: qbittorrent
+        server: my-docker
+    - syncthing:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/syncthing.png
+        href: https://syncthing.bensuperpc.org/
+        description: Syncthing
+        # ping: syncthing.bensuperpc.org
+        container: syncthing
+        server: my-docker
+    - transmission:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/transmission.png
+        href: https://transmission.bensuperpc.org/
+        description: Transmission
+        # ping: transmission.bensuperpc.org
+        container: transmission
+        server: my-docker
 
 - Games:
     - minecraft:
@@ -115,19 +138,22 @@
 #        href: https://minecraft.bensuperpc.org/
         description: Minecraft server
 #        ping: minecraft.bensuperpc.org
-        container: minecraft-server
+        # container: minecraft-server
+        #server: my-docker
     - 7dtd:
 #        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/7dtd.png
 #        href: https://7dtd.bensuperpc.org/
         description: 7 Days to Die server
 #        ping: 7dtd.bensuperpc.org
-        container: 7daystodie_server
+        # container: 7daystodie_server
+        #server: my-docker
     - satisfactory:
 #        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/7dtd.png
 #        href: https://7dtd.bensuperpc.org/
         description: Satisfactory server
 #        ping: 7dtd.bensuperpc.org
-        container: satisfactory_server
+        # container: satisfactory_server
+        #server: my-docker
 
 - Admin:
     - uptime-kuma:
@@ -136,4 +162,18 @@
         description: Uptime Kuma
         ping: uptimekuma.bensuperpc.org
         container: uptime-kuma
-
+        server: my-docker
+    - authelia:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/authelia.png
+        href: https://authelia.bensuperpc.org/
+        description: Authelia
+        # ping: authelia.bensuperpc.org
+        container: authelia
+        server: my-docker
+    - dozzle:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/dozzle.png
+        href: https://dozzle.bensuperpc.org/
+        description: Dozzle
+        # ping: dozzle.bensuperpc.org
+        container: dozzle
+        server: my-docker

infrastructure/services/homepage/config/settings.yaml

@@ -24,19 +24,15 @@ color: slate
 language: en
 
 layout:
-  Personal:
+  Public:
     style: row
     columns: 6
-  Sharing:
+  Personal:
     style: row
     columns: 6
   Admin:
     style: row
     columns: 6
-  Utils:
-    style: row
-    columns: 6
-    initiallyCollapsed: false
   Games:
     style: row
     columns: 6

infrastructure/services/homepage/config/widgets.yaml

@@ -1,7 +1,6 @@
 ---
 # For configuration options and examples, please see:
 # https://gethomepage.dev/widgets/services/
-# https://gethomepage.dev/widgets/services/qbittorrent/
 
 #- logo:
 #    icon: /image/daisy.jpg

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

@@ -5,29 +5,49 @@ services:
     container_name: homepage
     profiles:
       - homepage
-    restart: on-failure:5
+    restart: on-failure:7
 #    environment:
 #      - PUID=${PUID:-1000}
 #      - PGID=${PGID:-1000}
     depends_on:
       - caddy
+      - homepage-dockerproxy
     env_file:
       - ./env/homepage.env
+    environment:
+      - TZ=${TZ:-Europe/Paris}
     volumes:
       - homepage_log:/app/logs
       - ./config:/app/config
       - ./image:/app/public/image:ro
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-#    develop:
-#      watch:
-#        - action: sync+restart
-#          path: ./homepage/image
-#          target: /app/public/image
     networks:
-      - infra-network
+      - caddy-infra
+      - homepage-internal
     security_opt:
       - no-new-privileges:true
 
+  homepage-dockerproxy:
+    image: tecnativa/docker-socket-proxy:latest
+    container_name: homepage-dockerproxy
+    profiles:
+      - homepage
+    restart: on-failure:7
+    environment:
+      - CONTAINERS=1
+      - POST=0
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    networks:
+      - homepage-internal
+
 volumes:
   homepage_log:
     name: homepage_log
+
+networks:
+  caddy-infra:
+    driver: bridge
+    name: caddy-infra
+  homepage-internal:
+    driver: bridge
+    name: homepage-internal

infrastructure/services/homepage/env/homepage.env

@@ -1,3 +1 @@
-PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn
+HOMEPAGE_ALLOWED_HOSTS=www.bensuperpc.org,homepage.bensuperpc.org
-#PSITRANSFER_PORT=3000
-HOMEPAGE_ALLOWED_HOSTS=www.bensuperpc.org

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

@@ -5,16 +5,18 @@ services:
     container_name: it-tools0
     profiles:
       - it-tools
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     networks:
-      - infra-network
+      - caddy-tools
     read_only: false
     security_opt:
       - no-new-privileges:true
     cap_drop:
       - SYS_ADMIN
+    environment:
+      - TZ=${TZ:-Europe/Paris}
 
     deploy:
       resources:
@@ -30,16 +32,18 @@ services:
     container_name: it-tools1
     profiles:
       - it-tools
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     networks:
-      - infra-network
+      - caddy-tools
     read_only: false
     security_opt:
       - no-new-privileges:true
     cap_drop:
       - SYS_ADMIN
+    environment:
+      - TZ=${TZ:-Europe/Paris}
 
     deploy:
       resources:
@@ -49,3 +53,8 @@ services:
         reservations:
           cpus: '0.001'
           memory: 20M
+
+networks:
+  caddy-tools:
+    driver: bridge
+    name: caddy-tools

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

@@ -5,10 +5,11 @@ services:
     container_name: jellyfin
     profiles:
       - jellyfin
-    restart: on-failure:5
+    restart: on-failure:7
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
+      - TZ=${TZ:-Europe/Paris}
     depends_on:
       - caddy
     env_file:
@@ -22,7 +23,7 @@ services:
     devices:
       - /dev/dri:/dev/dri
     networks:
-      - infra-network
+      - caddy-media
     security_opt:
       - no-new-privileges:true
 
@@ -35,3 +36,8 @@ volumes:
     name: public_data
   private_data:
     name: private_data
+
+networks:
+  caddy-media:
+    driver: bridge
+    name: caddy-media

infrastructure/services/jellyfin/env/jellyfin.env

@@ -1,2 +1 @@
-TZ=Etc/UTC
 DOCKER_MODS=linuxserver/mods:jellyfin-opencl-intel

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

@@ -18,6 +18,19 @@ services:
     # Fix root permissions on mounted volumes
     command: chown -R ${PUID:-1000}:${PGID:-1000} /public_data /private_data
 
+  watchtower:
+    container_name: watchtower
+    profiles:
+      - main_infrastructure
+    image: nickfedor/watchtower:latest
+    environment:
+      - TZ=${TZ:-Europe/Paris}
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    restart: on-failure:7
+    networks:
+      - watchtower-network
+
 volumes:
   public_data:
     name: public_data
@@ -25,6 +38,27 @@ volumes:
     name: private_data
 
 networks:
-  infra-network:
+  watchtower-network:
     driver: bridge
-    name: infra-network
+    name: watchtower-network
+  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/memos/docker-compose.memos.yml

@@ -5,7 +5,7 @@ services:
     container_name: memos
     profiles:
       - memos
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     env_file:
@@ -13,10 +13,15 @@ services:
     volumes:
       - memos_config:/var/opt/memos
     networks:
-      - infra-network
+      - caddy-tools
     security_opt:
       - no-new-privileges:true
 
 volumes:
   memos_config:
     name: memos_config
+
+networks:
+  caddy-tools:
+    driver: bridge
+    name: caddy-tools

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

@@ -7,14 +7,13 @@ services:
     depends_on:
       - mc-server
       - minecraft_proxy
-    restart: on-failure:3
+    restart: on-failure:7
     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
@@ -30,5 +29,3 @@ volumes:
     name: minecraft_server_data
   minecraft_proxy_data:
     name: minecraft_proxy_data
-  minecraft_rcon_data:
-    name: minecraft_rcon_data

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

@@ -1,5 +1,5 @@
 include:
 # Minecraft server
-  - minecraft-server/docker-compose.yml
+  - minecraft-server/docker-compose.minecraft.yml
 # Backup server
   - backup/docker-compose.backup.yml

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

@@ -5,7 +5,7 @@ services:
     profiles:
       - minecraft_proxy
       - minecraft_server
-    restart: on-failure:3
+    restart: on-failure:7
     env_file:
       - ./env/proxy.env
     environment:
@@ -23,7 +23,7 @@ services:
     volumes:
       - minecraft_proxy_data:/server
     networks:
-      - infra-network
+      - minecraft-network
 
   mc-server:
     image: itzg/minecraft-server:latest
@@ -32,7 +32,7 @@ services:
       - 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"
@@ -56,7 +56,7 @@ services:
       - minecraft_server_data:/data
 #      - ./asset_links/plugins.txt:/extras/plugins.txt:ro
     networks:
-      - infra-network
+      - minecraft-network
     deploy:
       resources:
 #        limits:
@@ -65,42 +65,13 @@ services:
         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:
-      - infra-network
-
 volumes:
   minecraft_server_data:
     name: minecraft_server_data
   minecraft_proxy_data:
     name: minecraft_proxy_data
-  minecraft_rcon_data:
-    name: minecraft_rcon_data
 
 networks:
-  infra-network:
+  minecraft-network:
     driver: bridge
-    name: infra-network
+    name: minecraft-network

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

@@ -5,16 +5,18 @@ services:
     container_name: omni-tools0
     profiles:
       - omni-tools
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     networks:
-      - infra-network
+      - caddy-tools
     read_only: false
     security_opt:
       - no-new-privileges:true
     cap_drop:
       - SYS_ADMIN
+    environment:
+      - TZ=${TZ:-Europe/Paris}
 
     deploy:
       resources:
@@ -30,16 +32,18 @@ services:
     container_name: omni-tools1
     profiles:
       - omni-tools
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     networks:
-      - infra-network
+      - caddy-tools
     read_only: false
     security_opt:
       - no-new-privileges:true
     cap_drop:
       - SYS_ADMIN
+    environment:
+      - TZ=${TZ:-Europe/Paris}
 
     deploy:
       resources:
@@ -49,3 +53,8 @@ services:
         reservations:
           cpus: '0.001'
           memory: 20M
+
+networks:
+  caddy-tools:
+    driver: bridge
+    name: caddy-tools

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

@@ -1,42 +1,105 @@
+name: openwebui
+
 services:
   ollama:
-    image: ollama/ollama:latest
+    image: ollama/ollama:${OLLAMA_DOCKER_TAG-latest}
-    #platform: linux/amd64
     container_name: ollama
     profiles:
-      - open-webui
+      - openwebui
+      - ollama
     depends_on:
       - caddy
-    restart: on-failure:5
+    restart: on-failure:7
     tty: true
     volumes:
       - ollama:/root/.ollama
+    # ports:
+    #   - ${OLLAMA_PORT-11434}:11434
+    env_file:
+      - ./env/ollama.env
+    environment:
+      - TZ=${TZ:-Europe/Paris}
     security_opt:
       - no-new-privileges:true
     networks:
-      - infra-network
+      - openwebui-internal
+    # devices:
+    #   - /dev/dri
+    #   - /dev/kfd
 
-  open-webui:
+  openwebui-postgres:
-    image: ghcr.io/open-webui/open-webui:main
+    image: postgres:17-alpine
-    container_name: open-webui
+    container_name: openwebui-postgres
     profiles:
-      - open-webui
+      - openwebui
+    env_file:
+      - ./env/openwebui-postgres.env
+    environment:
+      - TZ=${TZ:-Europe/Paris}
     volumes:
-      - open-webui:/app/backend/data
+      - openwebui-postgres:/var/lib/postgresql/data
+    restart: on-failure:7
+    networks:
+      - openwebui-internal
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}" ]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+
+  # pgadmin:
+  #   image: dpage/pgadmin4:latest
+  #   container_name: pgadmin
+  #   profiles:
+  #     - openwebui
+    # env_file:
+    #   - ./env/openwebui-pgadmin.env
+  #   volumes:
+  #     - openwebui-pgadmin:/var/lib/pgadmin
+  #   restart: on-failure:7
+  #   depends_on:
+  #     openwebui-postgres:
+  #       condition: service_healthy
+  #   networks:
+  #     - openwebui-network
+
+
+  openwebui:
+    image: ghcr.io/open-webui/open-webui:${WEBUI_DOCKER_TAG-main}
+    container_name: openwebui
+    profiles:
+      - openwebui
+    volumes:
+      - openwebui:/app/backend/data
     depends_on:
       - ollama
       - caddy
+      - openwebui-postgres
     env_file:
-      - ./env/open-webui.env
+      - ./env/openwebui.env
-    #environment:
+    environment:
+      - TZ=${TZ:-Europe/Paris}
     #  - UID=${PUID:-1000}
     #  - GID=${PGID:-1000}
-    restart: on-failure:5
+    # ports:
+    #   - ${OPEN_WEBUI_PORT-3000}:8080
+    restart: on-failure:7
     networks:
-      - infra-network
+      - caddy-ai
+      - openwebui-internal
     security_opt:
       - no-new-privileges:true
 
 volumes:
   ollama: {}
-  open-webui: {}
+  openwebui: {}
+  openwebui-postgres: {}
+  openwebui-pgadmin: {}
+
+networks:
+  caddy-ai:
+    driver: bridge
+    name: caddy-ai
+  openwebui-internal:
+    driver: bridge
+    name: openwebui-internal

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

@@ -0,0 +1,8 @@
+# OLLAMA_GPU_OVERHEAD=0
+# OLLAMA_VULKAN=1
+# OLLAMA_NEW_ENGINE=1
+# OLLAMA_GPU_LAYERS=
+# OLLAMA_DEBUG=1
+# OLLAMA_SCHED_SPREAD=1
+# OLLAMA_FLASH_ATTENTION=1
+# OLLAMA_CONTEXT_LENGTH=2048

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

@@ -0,0 +1,4 @@
+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-postgres.env

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

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

@@ -1,5 +1,6 @@
 OLLAMA_BASE_URL=http://ollama:11434
-#WEBUI_SECRET_KEY=
+# openssl rand -hex 32
+WEBUI_SECRET_KEY=7d83b15a417d090ba5c6b899270a05dd215c60848354c0c7574226d6ff02f39e
 #HF_HUB_OFFLINE=1
 # Disable analytics
 SCARF_NO_ANALYTICS=true
@@ -9,6 +10,9 @@ ANONYMIZED_TELEMETRY=false
 #OPENAI_API_BASE_URL=
 #OPENAI_API_KEY=
 
+# Database configuration
+DATABASE_URL=postgresql://postgres:securepassword123@openwebui-postgres:5432/openwebui
+
 # Only with stable-diffusion-webui
 #ENABLE_IMAGE_GENERATION=true
 #AUTOMATIC1111_BASE_URL=http://stable-diffusion-webui:7860

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

@@ -5,12 +5,13 @@ services:
     container_name: openssh
     profiles:
       - openssh
-    restart: on-failure:5
+    restart: on-failure:7
     env_file:
       - ./env/openssh.env
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
+      - TZ=${TZ:-Europe/Paris}
     volumes:
       - openssh_config:/config:rw
       - ./config/authorized_keys:/authorized_ssh_keys:ro
@@ -29,14 +30,14 @@ services:
       - minecraft_server_backup:/minecraft_server_backup:rw
       - minecraft_server_data:/minecraft_server_data:rw
       - minecraft_proxy_data:/minecraft_proxy_data:rw
-      - minecraft_rcon_data:/minecraft_rcon_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
     networks:
-      - infra-network
+      - openssh-network
     security_opt:
       - no-new-privileges:false
     ports:
@@ -77,8 +78,6 @@ volumes:
     name: minecraft_server_data
   minecraft_proxy_data:
     name: minecraft_proxy_data
-  minecraft_rcon_data:
-    name: minecraft_rcon_data
 # teamfortress2
   teamfortress2_backup:
     name: teamfortress2_backup
@@ -89,3 +88,13 @@ volumes:
     name: forgejo_data
   forgejo_db:
     name: forgejo_db
+# argus
+  argus_data:
+    name: argus_data
+  qbittorrent_config:
+    name: qbittorrent_config
+
+networks:
+  openssh-network:
+    driver: bridge
+    name: openssh-network

infrastructure/services/openssh/env/openssh.env

@@ -1,4 +1,3 @@
-TZ=Etc/UTC
 SUDO_ACCESS=true
 PASSWORD_ACCESS=false
 DOCKER_MODS=linuxserver/mods:openssh-server-rsync

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

@@ -5,15 +5,17 @@ services:
     container_name: picoshare
     profiles:
       - picoshare
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     env_file:
       - ./env/picoshare.env
+    environment:
+      - TZ=${TZ:-Europe/Paris}
     volumes:
       - picoshare_data:/data
     networks:
-      - infra-network
+      - caddy-files
     security_opt:
       - no-new-privileges:true
     read_only: false
@@ -33,3 +35,8 @@ services:
 volumes:
   picoshare_data:
     name: picoshare_data
+
+networks:
+  caddy-files:
+    driver: bridge
+    name: caddy-files

infrastructure/services/privatebin/config/conf.php

@@ -274,6 +274,17 @@ dir = PATH "data"
 ;version = "latest"
 ;bucket = "my-bucket"
 
+;[shlink]
+; - Shlink requires you to make a post call with a generated API key.
+;   use this section to setup the API key and URL. In order to use this section,
+;   "urlshortener" needs to point to the base URL of your PrivateBin
+;   instance with "?shortenviashlink&link=" appended. For example:
+;   urlshortener = "${basepath}?shortenviashlink&link="
+;   This URL will in turn call Shlink on the server side, using the URL from
+;   "apiurl" and the API Key from the "apikey" parameters below.
+; apiurl = "https://shlink.example.com/rest/v3/short-urls"
+; apikey = "your_api_key"
+
 ;[yourls]
 ; When using YOURLS as a "urlshortener" config item:
 ; - By default, "urlshortener" will point to the YOURLS API URL, with or without

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

@@ -5,14 +5,16 @@ services:
     container_name: privatebin
     profiles:
       - privatebin
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     volumes:
       - privatebin_data:/srv/data
       - ./config/conf.php:/srv/cfg/conf.php:ro
+    environment:
+      - TZ=${TZ:-Europe/Paris}
     networks:
-      - infra-network
+      - caddy-tools
     security_opt:
       - no-new-privileges:true
     read_only: true
@@ -28,3 +30,8 @@ services:
 volumes:
   privatebin_data:
     name: privatebin_data
+
+networks:
+  caddy-tools:
+    driver: bridge
+    name: caddy-tools

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

@@ -5,17 +5,17 @@ services:
     container_name: projectsend
     profiles:
       - projectsend
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     env_file:
       - ./env/projectsend.env
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
       - projectsend_config:/config
       - projectsend_share:/data
     networks:
-      - infra-network
+      - caddy-files
+      - projectsend-internal
     security_opt:
       - no-new-privileges:true
     cap_drop:
@@ -30,14 +30,16 @@ services:
       - projectsend
     depends_on:
       - caddy
-    restart: on-failure:5
+    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:
-      - infra-network
+      - projectsend-internal
     security_opt:
       - no-new-privileges:true
 
@@ -48,3 +50,12 @@ volumes:
     name: projectsend_config
   projectsend_share:
     name: projectsend_share
+
+
+networks:
+  caddy-files:
+    driver: bridge
+    name: caddy-files
+  projectsend-internal:
+    driver: bridge
+    name: projectsend-internal

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

@@ -5,16 +5,18 @@ services:
     container_name: psitransfer
     profiles:
       - psitransfer
-    restart: on-failure:5
+    restart: on-failure:7
 #    user: ${PUID:-1000}:${PGID:-1000} 
     depends_on:
       - caddy
     env_file:
       - ./env/psitransfer.env
+    environment:
+      - TZ=${TZ:-Europe/Paris}
     volumes:
       - psitransfer_data:/data
     networks:
-      - infra-network
+      - caddy-files
     security_opt:
       - no-new-privileges:true
     read_only: true
@@ -30,3 +32,8 @@ services:
 volumes:
   psitransfer_data:
     name: psitransfer_data
+
+networks:
+  caddy-files:
+    driver: bridge
+    name: caddy-files

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

@@ -5,7 +5,7 @@ services:
     container_name: qbittorrent
     profiles:
       - qbittorrent
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     env_file:
@@ -13,6 +13,7 @@ services:
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
+      - TZ=${TZ:-Europe/Paris}
     ports:
       - 6881:6881
       - 6881:6881/udp
@@ -21,7 +22,7 @@ services:
       - public_data:/downloads
       - private_data:/private_downloads
     networks:
-      - infra-network
+      - caddy-media
     security_opt:
       - no-new-privileges:true
 
@@ -32,3 +33,8 @@ volumes:
     name: public_data
   private_data:
     name: private_data
+
+networks:
+  caddy-media:
+    driver: bridge
+    name: caddy-media

infrastructure/services/qbittorrent/env/qbittorrent.env

@@ -1,4 +1,3 @@
-TZ=Etc/UTC
 WEBUI_PORT=8080
 TORRENTING_PORT=6881
 # Use alternative WebUI: /vuetorrent

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

@@ -6,7 +6,7 @@ services:
       - satisfactory_backup
     depends_on:
       - satisfactory_server
-    restart: on-failure:5
+    restart: on-failure:7
     env_file:
       - ./env/satisfactory_backup.env
     volumes:

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

@@ -1,7 +1,5 @@
 include:
 # Satisfactory server
   - satisfactory/docker-compose.satisfactory.yml
-# OpenSSH server
-  - openssh/docker-compose.openssh.yml
 # Backup server
   - backup/docker-compose.backup.yml

infrastructure/services/satisfactory-server/openssh/config/authorized_keys/id_ed25519.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVtzpnPr0Boy+bUbL+viOYfqeetDZF6Hu40EwNLXNb0 bensuperpc@gmail.com

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

@@ -1,36 +0,0 @@
-services:
-  # openssh
-  satisfactory_openssh:
-    image: linuxserver/openssh-server:latest
-    container_name: satisfactory_openssh
-    profiles:
-      - satisfactory_openssh
-    depends_on:
-      - satisfactory_server
-    restart: on-failure:5
-    env_file:
-      - ./env/openssh.env
-    environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-    volumes:
-      - satisfactory_openssh_config:/config
-      - ./config/authorized_keys:/authorized_ssh_keys:ro
-      - satisfactory_backup:/satisfactory_backup
-      - satisfactory_server_config:/satisfactory_server_config
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:false
-    cap_drop:
-      - SYS_ADMIN
-    ports:
-      - 2222:2222
-
-volumes:
-  satisfactory_openssh_config:
-    name: satisfactory_openssh_config
-  satisfactory_backup:
-    name: satisfactory_backup
-  satisfactory_server_config:
-    name: satisfactory_server_config

infrastructure/services/satisfactory-server/openssh/env/openssh.env

@@ -1,15 +0,0 @@
-TZ=Etc/UTC
-SUDO_ACCESS=true
-PASSWORD_ACCESS=false
-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=zpd91zZkCfdyAB8PZgUD7w7ZIhS8no4V
-
-#PUBLIC_KEY=yourpublickey
-#PUBLIC_KEY_FILE=/path/to/file
-#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
-#PUBLIC_KEY_URL=https://github.com/username.keys
-#USER_PASSWORD_FILE=/path/to/file
-#LOG_STDOUT=

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

@@ -5,7 +5,7 @@ services:
     container_name: satisfactory_server
     profiles:
       - satisfactory_server
-    restart: on-failure:5
+    restart: on-failure:7
     ports:
       - 7777:7777/udp
       - 7777:7777/tcp
@@ -13,12 +13,13 @@ services:
     volumes:
       - satisfactory_server_config:/config
     networks:
-      - infra-network
+      - satisfactory-network
     env_file:
       - ./env/satisfactory.env
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
+      - TZ=${TZ:-Europe/Paris}
     security_opt:
       - no-new-privileges:true
     healthcheck:
@@ -41,6 +42,6 @@ volumes:
     name: satisfactory_server_config
 
 networks:
-  infra-network:
+  satisfactory-network:
     driver: bridge
-    name: infra-network
+    name: satisfactory-network

infrastructure/services/searxng/config/searxng.env

@@ -0,0 +1,15 @@
+# Read the documentation before using the `docker-compose.yml` file:
+# https://docs.searxng.org/admin/installation-docker.html
+#
+# Additional ENVs:
+# https://docs.searxng.org/admin/settings/settings_general.html#settings-general
+# https://docs.searxng.org/admin/settings/settings_server.html#settings-server
+
+# Use a specific version tag. E.g. "latest" or "2026.3.25-541c6c3cb".
+#SEARXNG_VERSION=latest
+
+# Listen to a specific address.
+#SEARXNG_HOST=[::]
+
+# Listen to a specific port.
+#SEARXNG_PORT=8080

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

@@ -0,0 +1,51 @@
+name: searxng
+
+services:
+  searxng:
+    container_name: searxng
+    image: docker.io/searxng/searxng:${SEARXNG_VERSION:-latest}
+    restart: on-failure:7
+    depends_on:
+      - caddy
+    profiles:
+      - searxng
+    env_file: ./config/searxng.env
+    environment:
+      - TZ=${TZ:-Europe/Paris}
+    networks:
+      - caddy-tools
+      - searxng-internal
+    volumes:
+      - searxng-config:/etc/searxng/
+      - searxng-data:/var/cache/searxng/
+    dns:
+      - 1.1.1.1
+      - 8.8.8.8
+
+  valkey:
+    container_name: searxng-valkey
+    profiles:
+      - searxng
+    image: docker.io/valkey/valkey:9-alpine
+    command: valkey-server --save 30 1 --loglevel warning
+    restart: on-failure:7
+    environment:
+      - TZ=${TZ:-Europe/Paris}
+    networks:
+      - searxng-internal
+    volumes:
+      - valkey-data:/data/
+
+networks:
+  caddy-tools:
+    driver: bridge
+    name: caddy-tools
+  searxng-internal:
+    driver: bridge
+    name: searxng-internal
+
+volumes:
+  searxng-data: {}
+  searxng-config: {}
+  valkey-data: {}
+

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

@@ -5,16 +5,18 @@ services:
     container_name: stirlingpdf
     profiles:
       - stirlingpdf
-    restart: on-failure:5
+    restart: on-failure:7
     depends_on:
       - caddy
     env_file:
       - ./env/stirlingpdf.env
+    environment:
+      - TZ=${TZ:-Europe/Paris}
     volumes:
       - stirlingpdf_config:/configs
       - stirlingpdf_tessdata:/usr/share/tessdata
     networks:
-      - infra-network
+      - caddy-tools
     security_opt:
       - no-new-privileges:true
     read_only: false
@@ -24,3 +26,8 @@ volumes:
     name: stirlingpdf_config
   stirlingpdf_tessdata:
     name: stirlingpdf_tessdata
+
+networks:
+  caddy-tools:
+    driver: bridge
+    name: caddy-tools

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

@@ -7,18 +7,19 @@ services:
       - syncthing
     depends_on:
       - caddy
-    restart: on-failure:5
+    restart: on-failure:7
     env_file:
       - ./env/syncthing.env
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
+      - TZ=${TZ:-Europe/Paris}
     volumes:
       - syncthing_config:/config
       - public_data:/data1
       - private_data:/data2
     networks:
-      - infra-network
+      - caddy-media
     security_opt:
       - no-new-privileges:true
 
@@ -29,3 +30,8 @@ volumes:
     name: public_data
   private_data:
     name: private_data
+
+networks:
+  caddy-media:
+    driver: bridge
+    name: caddy-media

infrastructure/services/syncthing/env/syncthing.env

@@ -1 +0,0 @@
-TZ=Etc/UTC

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

@@ -6,7 +6,7 @@ services:
       - teamfortress2_backup
     depends_on:
       - teamfortress2_server
-    restart: on-failure:5
+    restart: on-failure:7
     env_file:
       - ./env/teamfortress2_backup.env
     volumes:

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

@@ -1,7 +1,5 @@
 include:
 # Team Fortress 2 server
   - teamfortress2/docker-compose.teamfortress2.yml
-# OpenSSH server
-  - openssh/docker-compose.openssh.yml
 # Backup server
   - backup/docker-compose.backup.yml

infrastructure/services/teamfortress2-server/openssh/config/authorized_keys/id_ed25519.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVtzpnPr0Boy+bUbL+viOYfqeetDZF6Hu40EwNLXNb0 bensuperpc@gmail.com

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

@@ -1,36 +0,0 @@
-services:
-  # openssh
-  teamfortress2_openssh:
-    image: linuxserver/openssh-server:latest
-    container_name: teamfortress2_openssh
-    profiles:
-      - teamfortress2_openssh
-    depends_on:
-      - teamfortress2_server
-    restart: on-failure:5
-    env_file:
-      - ./env/openssh.env
-    environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-    volumes:
-      - teamfortress2_openssh_config:/config
-      - ./config/authorized_keys:/authorized_ssh_keys:ro
-      - teamfortress2_backup:/teamfortress2_backup
-      - teamfortress2_data:/teamfortress2_data
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:false
-    cap_drop:
-      - SYS_ADMIN
-    ports:
-      - 2222:2222
-
-volumes:
-  teamfortress2_openssh_config:
-    name: teamfortress2_openssh_config
-  teamfortress2_backup:
-    name: teamfortress2_backup
-  teamfortress2_data:
-    name: teamfortress2_data

infrastructure/services/teamfortress2-server/openssh/env/openssh.env

@@ -1,15 +0,0 @@
-TZ=Etc/UTC
-SUDO_ACCESS=true
-PASSWORD_ACCESS=false
-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=K4CLuwknhW6sl6fxKI5DsNt9R9SSelmC
-
-#PUBLIC_KEY=yourpublickey
-#PUBLIC_KEY_FILE=/path/to/file
-#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
-#PUBLIC_KEY_URL=https://github.com/username.keys
-#USER_PASSWORD_FILE=/path/to/file
-#LOG_STDOUT=

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

@@ -5,19 +5,21 @@ services:
     container_name: teamfortress2_server
     profiles:
       - teamfortress2_server
-    restart: on-failure:5
+    restart: on-failure:7
     ports:
      - "27015:27015/tcp"
      - "27015:27015/udp"
     volumes:
       - teamfortress2_data:/home/steam/tf-dedicated
     networks:
-      - infra-network
+      - teamfortress2-network
     env_file:
       - ./env/teamfortress2.env
-#    environment:
+    environment:
+      - TZ=${TZ:-Europe/Paris}
 #      - PUID=${PUID:-1000}
 #      - PGID=${PGID:-1000}
+
     security_opt:
       - no-new-privileges:true
     cap_drop:
@@ -34,6 +36,6 @@ volumes:
     name: teamfortress2_data
 
 networks:
-  infra-network:
+  teamfortress2-network:
     driver: bridge
-    name: infra-network
+    name: teamfortress2-network