Remove Gitea

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
Move presets
2025-10-25 23:36:20 +02:00 · 2025-10-18 23:08:12 +02:00 · 2025-10-18 22:35:37 +02:00 · 2025-10-14 19:39:16 +02:00 · 2025-10-06 23:32:48 +02:00 · 2025-10-06 21:35:57 +02:00
131 changed files with 1448 additions and 844 deletions
--- a/.gitea/workflows/gitea-ci.yaml
+++ b/.gitea/workflows/gitea-ci.yaml
@@ -1,15 +0,0 @@
-name: Build And Test
-run-name: ${{ gitea.actor }} is runs ci pipeline
-on: [ push ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - run: ls
-publish:
-    runs-on: cth-ubuntu-latest
-    needs: build
-    if: gitea.ref == 'refs/heads/main'
-    steps:
-      - run: ls
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,12 +22,14 @@ jobs:
    timeout-minutes: 30
    steps:
      - name: "Checkout Code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
        with:
          submodules: "recursive"
          fetch-depth: 0
+      - name: "Check compose"
+        run: make check
      - name: "Update server image"
-        run: make update-docker
+        run: make image-update
      - name: "Build server"
        run: make build
 #      - name: "Start server"
--- a/.github/workflows/submodule-update.yml
+++ b/.github/workflows/submodule-update.yml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: "Checkout Code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
        with:
          token: ${{ secrets.CI_TOKEN }}
          repository: ${{ github.repository }}
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@

+/*.tar.gz
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "infrastructure/services/minecraft-server"]
+	path = infrastructure/services/minecraft-server
+	url = git@github.com:bensuperpc/docker-minecraft-server.git
+[submodule "infrastructure/services/7daystodie"]
+	path = infrastructure/services/7daystodie-server
+	url = git@github.com:bensuperpc/docker-7daystodie.git
+[submodule "infrastructure/services/satisfactory"]
+	path = infrastructure/services/satisfactory-server
+	url = git@github.com:bensuperpc/docker-satisfactory.git
--- a/DockerCompose.mk
+++ b/DockerCompose.mk
@@ -0,0 +1,77 @@
+#//////////////////////////////////////////////////////////////
+#//                                                          //
+#//  docker-multimedia, 2024                                 //
+#//  Created: 30, May, 2021                                  //
+#//  Modified: 14 November, 2024                             //
+#//  file: -                                                 //
+#//  -                                                       //
+#//  Source:                                                 //
+#//  OS: ALL                                                 //
+#//  CPU: ALL                                                //
+#//                                                          //
+#//////////////////////////////////////////////////////////////
+
+PROJECT_DIRECTORY ?= infrastructure
+
+DOCKER_EXEC ?= docker
+
+CONFIG_DIRECTORY ?= presets
+CONFIG_FILES ?= $(addprefix $(CONFIG_DIRECTORY)/,$(addsuffix .conf,$(CONFIGS)))
+include $(CONFIG_FILES)
+
+DOCKER_PROFILES ?=
+EXTRA_PROFILES ?=
+
+PROFILE_CMD ?= $(addprefix --profile ,$(DOCKER_PROFILES) $(EXTRA_PROFILES))
+
+COMPOSE_FILES ?=  $(shell find ./$(PROJECT_DIRECTORY) -maxdepth 1 -name 'docker-compose*.yml' -type f | sed -e 's/^/--file /')
+COMPOSE_DIR ?= --project-directory ./$(PROJECT_DIRECTORY)
+
+UID ?= 1000
+GID ?= 1000
+
+ENV_ARG_VAR ?= PUID=$(UID) PGID=$(GID)
+
+DOCKER_COMPOSE_COMMAND ?= $(ENV_ARG_VAR) $(DOCKER_EXEC) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD)
+
+.PHONY: build all
+all: start
+
+GENERIC_TARGETS := build down up run config logs pull images start restart stop
+
+.PHONY: $(GENERIC_TARGETS)
+$(GENERIC_TARGETS):
+	$(DOCKER_COMPOSE_COMMAND) $@
+
+.PHONY: start-detached
+start-detached:
+	$(DOCKER_COMPOSE_COMMAND) up -d
+
+.PHONY: no-start
+no-start:
+	$(DOCKER_COMPOSE_COMMAND) up --no-start
+
+.PHONY: state
+state:
+	$(DOCKER_COMPOSE_COMMAND) ps
+	$(DOCKER_COMPOSE_COMMAND) top
+
+.PHONY: volumes
+volumes:
+	$(DOCKER_COMPOSE_COMMAND) config --volumes
+
+.PHONY: git-update
+git-update: 
+#	git submodule update --init --recursive --remote
+	git pull --recurse-submodules --all --progress
+
+.PHONY: update
+update: image-update git-update
+
+.PHONY: clean
+clean:
+	docker system prune -f
+
+.PHONY: purge
+purge:
+	$(ENV_ARG_VAR) $(DOCKER_EXEC) compose $(COMPOSE_DIR) $(COMPOSE_FILES) down -v --rmi all
--- a/94
+++ b/94
@@ -1,8 +1,8 @@
 #//////////////////////////////////////////////////////////////
 #//                                                          //
-#//  Infrastructure, 2024                                    //
+#//  Script, 2022                                            //
 #//  Created: 14, April, 2022                                //
-#//  Modified: 05, May, 2024                                 //
+#//  Modified: 30, November, 2024                            //
 #//  file: -                                                 //
 #//  -                                                       //
 #//  Source:                                                 //
@@ -11,81 +11,21 @@
 #//                                                          //
 #//////////////////////////////////////////////////////////////

-SERVER_DIRECTORY := infrastructure
+#ADMIN_SERVICES := openssh
+# uptime-kuma
+#BLOG_SERVICES := wordpress
+#IA_SERVICES := open-webui
+#SHARING_SERVICES := privatebin
+# jellyfin
+# psitransfer picoshare projectsend dufs syncthing
+#UTILS_SERVICES := it-tools omni-tools cyberchef
+# homepage
+# stirlingpdf

-DOCKER := docker
+PROJECT_DIRECTORY := infrastructure
+CONFIG_DIRECTORY := presets

-BLOG_SERVICES := wordpress
-TORRENTS_SERVICES := qbittorrent transmission
-SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs gitea syncthing
-ADMIN_SERVICES := yacht uptime-kuma adminer openssh
-UTILS_SERVICES := it-tools stirlingpdf
-# gitea-runner
+CONFIGS := torrent
+#DOCKER_PROFILES := 

-PROFILES := main_infrastructure caddy homepage $(BLOG_SERVICES) $(SHARING_SERVICES) $(TORRENTS_SERVICES) $(ADMIN_SERVICES) $(UTILS_SERVICES)
-PROFILE_CMD := $(addprefix --profile ,$(PROFILES))
-
-COMPOSE_FILES :=  $(shell find ./$(SERVER_DIRECTORY) -name 'docker-compose*.yml' -type f | sed -e 's/^/--file /')
-COMPOSE_DIR := --project-directory ./$(SERVER_DIRECTORY)
-
-UID := 1000
-GID := 1000
-
-ENV_ARG_VAR := PUID=$(UID) PGID=$(GID)
-
-DOCKER_COMPOSE_COMMAND := $(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD)
-
-.PHONY: build all
-all: start
-
-.PHONY: build
-build:
-	$(DOCKER_COMPOSE_COMMAND) build
-
-.PHONY: start
-start:
-	$(DOCKER_COMPOSE_COMMAND) up -d
-
-.PHONY: start-at
-start-at:
-	$(DOCKER_COMPOSE_COMMAND) up
-
-.PHONY: docker-check
-docker-check:
-	$(DOCKER_COMPOSE_COMMAND) config
-
-.PHONY: stop
-stop: down
-
-.PHONY: down
-down:
-	$(DOCKER_COMPOSE_COMMAND) down
-
-.PHONY: restart
-restart: stop start
-
-.PHONY: logs
-logs:
-	$(DOCKER_COMPOSE_COMMAND) logs
-
-.PHONY: state
-state:
-	$(DOCKER_COMPOSE_COMMAND) ps
-	$(DOCKER_COMPOSE_COMMAND) top
-
-.PHONY: update-docker
-update-docker:
-	$(DOCKER_COMPOSE_COMMAND) pull
-
-.PHONY: update
-update: update-docker
-	git submodule update --init --recursive --remote
-	git pull --recurse-submodules --all --progress
-
-.PHONY: clean
-clean:
-	docker system prune -f
-
-.PHONY: purge
-purge:
-	$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) down -v --rmi all
+include DockerCompose.mk
--- a/README.md
+++ b/README.md
@@ -14,15 +14,17 @@ If you have any **questions** or **suggestions**, feel free to open an issue or
 - [x] Docker / docker-compose
 - [x] Wordpress (Via FASTCGI/caddy)
 - [x] Jellyfin (Media server)
- [x] Gitea (Git server)
+- [x] Forgejo (Git server, fork of Gitea)
 - [x] Uptime Kuma (Monitoring)
 - [x] qbittorrent and transmission (Torrent client/server)
 - [x] SyncThing (File synchronization)
 - [x] PsiTransfer, ProjectSend, Picoshare (File sharing)
- [x] it-tools (Tools for IT)
+- [x] it-tools and omni-tools (Tools for IT)
+- [x] Open-WebUI (Local chatGPT)
 - [x] Privatebin (Pastebin)
- [x] Yacht (Web interface for managing docker containers)
- [ ] Integrate games ([Satisfactory](https://github.com/bensuperpc/docker-satisfactory), [7 days to die](https://github.com/bensuperpc/docker-7daystodie), Minecraft...)
+- [X] [Satisfactory](https://github.com/bensuperpc/docker-satisfactory)
+- [x] [7 days to die](https://github.com/bensuperpc/docker-7daystodie)
+- [x] [minecraft](https://github.com/bensuperpc/docker-minecraft-server)

 ## Architecture

@@ -42,9 +44,25 @@ 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 and 2222 on your router](http://192.168.1.1/)
+- [Open port 80, 443, 22, 2222 and 5555 on your router](http://192.168.1.1/)
+- For games server, you need to open these ports (7777, 25565, 26900, 26901, 26903)

-***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...***
+List of ports used by the services in this infrastructure:
+
+| Port number | Service       | Description       |
+| ----------- | ------------- | ----------------- |
+| 80          | Caddy         | HTTP traffic      |
+| 443         | Caddy         | HTTPS traffic     |
+| 22          | Forgejo       | Git/SSH access    |
+| 2222        | OpenSSH       | Global SSH access |
+| 7777        | Satisfactory  | Game server port  |
+| 25565       | Minecraft     | Game server 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  |
+
+
+**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...**

 ### Clone

@@ -60,6 +78,8 @@ 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).
+
 ### Configure the domain

 For all **bensuperpc.org**, you need to replace it with your domain, example: **mydomain.com**, so the same for **bensuperpc.com** ect...
@@ -68,35 +88,33 @@ 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/wordpress/Caddyfile)
+Check if all bensuperpc.* are replaced by your domain in [Caddyfile](caddy/services/wordpress/Caddyfile)

 And then, caddy will generate the certificate for you and renew it automatically :D

-| Domain name | Type | Description |
-| --- | --- | --- |
-| [bensuperpc.org](https://bensuperpc.org) | Main | Redirect to www.bensuperpc.org |
-| [www.bensuperpc.org](https://www.bensuperpc.org) | Main | Homepage |
-| [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org) | Sub | Wordpress website |
-| [adminer.bensuperpc.org](https://adminer.bensuperpc.org) | Sub | Adminer for MariaDB for wordpress only |
-| [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | Sub | Uptime Kuma for monitoring |
-| [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server |
-| [transmission.bensuperpc.org](https://transmission.bensuperpc.org) | Sub | Torrent client/server |
-| [git.bensuperpc.org](https://git.bensuperpc.org) | Sub | 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 |
-| [privatebin.bensuperpc.org](https://privatebin.bensuperpc.org) | Sub | Pastebin |
-| [yacht.bensuperpc.org](https://yacht.bensuperpc.org) | Sub | Web interface for managing docker containers |
-| [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 |
-| [public.bensuperpc.org](https://public.bensuperpc.org) | Sub | Caddy for file sharing |
-| bensuperpc.com | Main | Redirect to www.bensuperpc.org |
-| bensuperpc.fr | Main | Redirect to www.bensuperpc.org |
-| bensuperpc.net | Main | Redirect to www.bensuperpc.org |
-| bensuperpc.ovh | Main | Redirect to www.bensuperpc.org |
+| Domain name                                                        | Type | Description                                                  |
+| ------------------------------------------------------------------ | ---- | ------------------------------------------------------------ |
+| [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                                            |
+| [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org)       | Sub  | Wordpress website                                            |
+| [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org)     | Sub  | Uptime Kuma for monitoring                                   |
+| [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org)   | Sub  | Torrent client/server                                        |
+| [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                                                     |
+| [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                                       |
+| [stirlingpdf.bensuperpc.org](https://stirlingpdf.bensuperpc.org)   | Sub  | Stirling PDF tools                                           |

 ### Configure the infrastructure

@@ -110,68 +128,46 @@ openssl rand -base64 32

 Or online: [passwordsgenerator.net](https://passwordsgenerator.net/)

-For [caddy_backup.env](infrastructure/caddy/env/caddy_backup.env) file, you need to change the password(s) for the restic backup.
+#### Caddy
+
+For [caddy_backup.env](infrastructure/services/caddy/env/caddy_backup.env) file, you need to change the password(s) for the restic backup.
+
 ```sh
 RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
 ```

-For the [wordpress.env](infrastructure/wordpress/env/wordpress.env) file, you need to change the password and user for the database.
+#### 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/wordpress/env/wordpress_db.env) file, you need to change the password(s) and user for the database.
-    
+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/wordpress/env/wordpress_backup.env) file, you need to change the password(s) for the restic backup.
+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
 ```

-For [adminer.env](infrastructure/wordpress/env/adminer.env) file, you need to change the password(s) and user for the database.
+#### PsiTransfer

-```sh
-MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-MARIADB_USER=bensuperpc
-MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
-```
-
-For [gitea.env](infrastructure/gitea/env/gitea.env) file, you need to change the password(s) and user for the database.
-
-```sh
-GITEA__database__USER=bensuperpc
-GITEA__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
-```
-
-For [gitea_db.env](infrastructure/gitea/env/gitea_db.env) file, you need to change the password(s) and user for the database.
-
-```sh
-MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
-MARIADB_USER=bensuperpc
-MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-```
-
-For [psitransfer.env](infrastructure/psitransfer/env/psitransfer.env) file, you need to change the secret key.
+For [psitransfer.env](infrastructure/services/psitransfer/env/psitransfer.env) file, you need to change the secret key.

 ```sh
 PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn
 ```

-For [yacht.env](infrastructure/yacht/env/yacht.env) file, you need to change the secret key.
-
-```sh
-SECRET_KEY=UZvg9nbcGIJlPEB3uI39TAEWyFOz9nm8
-```
-
-For [projectsend_db.env](infrastructure/projectsend/env/projectsend_db.env) file, you need to change the password(s) and user for the database.
+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
@@ -179,19 +175,25 @@ MARIADB_USER=bensuperpc
 MARIADB_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
 ```

-For [picoshare.env](infrastructure/picoshare/env/picoshare.env) file, you need to change the secret key.
+#### Picoshare
+
+For [picoshare.env](infrastructure/services/picoshare/env/picoshare.env) file, you need to change the secret key.

 ```sh
 PS_SHARED_SECRET=CBuS4DJLqIe93xF1KGYRrnhxUFBqLD2n
 ```

-For [dufs.env](infrastructure/dufs/env/dufs.env) file, you need to change the secret key and if you want the user name.
+#### 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"
 ```

-For [stirlingpdf.env](infrastructure/stirlingpdf/env/stirlingpdf.env) file, it's **completly optional**, you can change the password(s) and user.
+#### 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
@@ -203,7 +205,9 @@ SECURITY_INITIALLOGIN_USERNAME=admin
 SECURITY_INITIALLOGIN_PASSWORD=Jw9U039f5xc2mFcacvGvPD9RjwIh4DzO
 ```

-You can need to add/change the public ssh key [id_ed25519.pub](infrastructure/openssh/config/authorized_keys/id_ed25519.pub) (its my public key), also change the config/password in [openssh.env](infrastructure/openssh/env/openssh.env):
+#### 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
@@ -217,6 +221,16 @@ USER_PASSWORD=rdUwf36C11PLmpU9Lvq7tP5pfFBKAuCh
 #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

 Start the website with:
@@ -239,25 +253,73 @@ 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: https://medium.com/@lokanx/how-to-build-docker-containers-using-gitea-runners-600729555e07
+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:

- [bookmarks.yaml](infrastructure/homepage/config/bookmarks.yaml)
- [services.yaml](infrastructure/homepage/config/services.yaml)
- [settings.yaml](infrastructure/homepage/config/settings.yaml)
- [widgets.yaml](infrastructure/homepage/config/widgets.yaml)
+- [bookmarks.yaml](infrastructure/services/homepage/config/bookmarks.yaml)
+- [services.yaml](infrastructure/services/homepage/config/services.yaml)
+- [settings.yaml](infrastructure/services/homepage/config/settings.yaml)
+- [widgets.yaml](infrastructure/services/homepage/config/widgets.yaml)
+
+### Forgejo
+
+Once the installation is complete, you need to set the installation lock:
+
+```sh
+FORGEJO__security__INSTALL_LOCK=true
+```
+
+### Forgejo Runner
+
+```sh
+docker exec -it forgejo_runner /bin/bash
+```
+
+```sh
+forgejo-runner generate-config > /data/config.yml
+```
+
+Now update the config.yml file to support docker-in-docker:
+
+```yml
+  envs:
+    DOCKER_TLS_VERIFY: 1
+    DOCKER_CERT_PATH: /certs/client
+    DOCKER_HOST: tcp://docker:2376
+  labels: ["ubuntu-latest:docker://node:20-bookworm", "ubuntu-22.04:docker://node:20-bookworm"]
+  network: host
+  options: -v /certs/client:/certs/client
+  valid_volumes:
+     - /certs/client
+```
+
+Register the runner with your Forgejo instance:
+
+
+```sh
+forgejo-runner register
+```
+
+You will need to provide the following information:
+
+```sh
+https://forgejo.bensuperpc.org/
+<Your Registration Token, in https://forgejo.bensuperpc.org/admin/actions/runners>
+ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04
+main
+```

 ### Docker volumes

 This infrastructure uses docker volumes to store data, all configuration/data for each service are not shared between services for security and maintenance reasons, but **public_data** and **private_data** are shared between all services to store your data.

-| Volume name | Description |
-| --- | --- |
-| public_data | Public data reachable on internet via [dufs.bensuperpc.org](https://dufs.bensuperpc.org), can be disabled. |
-| private_data | Private data |
+| Volume name  | Description                                                                                                |
+| ------------ | ---------------------------------------------------------------------------------------------------------- |
+| public_data  | Public data reachable on internet via [dufs.bensuperpc.org](https://dufs.bensuperpc.org), can be disabled. |
+| private_data | Private data                                                                                               |

 ### SSH access

@@ -292,14 +354,19 @@ ssh -p 2222 admin@bensuperpc.org
 - [SyncThing](https://syncthing.net/)
 - [PsiTransfer](https://psitransfer.com/)
 - [It-tools](https://github.com/CorentinTh/it-tools)
+- [Omni-tools](https://github.com/iib0011/omni-tools)
 - [Privatebin](https://github.com/PrivateBin/PrivateBin)
 - [ghost](https://ghost.org)
 - [Homepage Tuto](https://belginux.com/installer-homepage-avec-docker/)
- [Yacht](https://yacht.sh/)
 - [ProjectSend](https://www.projectsend.org/)
 - [Picoshare](https://github.com/mtlynch/picoshare)
 - [Dufs](https://github.com/sigoden/dufs)
+- [demos](https://github.com/usememos/memos)
+- [Stirling PDF](https://github.com/Stirling-Tools/Stirling-PDF)
+- [open-webui](https://github.com/open-webui/open-webui)
 - [Fix docker volume](https://pratikpc.medium.com/use-docker-compose-named-volumes-as-non-root-within-your-containers-1911eb30f731)
+- [Forgejo-runner](https://code.forgejo.org/forgejo/runner)
+- [Forgejo-runner](https://huijzer.xyz/posts/55)

 ## License

--- a/infrastructure/caddy/config/Caddyfile
+++ b/infrastructure/caddy/config/Caddyfile
@@ -1,15 +0,0 @@
-{
-	email bensuperpc@gmail.com
-	key_type p384
-
-	log {
-		output file /data/logs/access.log
-		format json
-	}
-}
-
-import bensuperpc.org/*
-import bensuperpc.com/*
-import bensuperpc.net/*
-import bensuperpc.ovh/*
-import bensuperpc.fr/*
--- a/infrastructure/caddy/config/bensuperpc.com/Caddyfile
+++ b/infrastructure/caddy/config/bensuperpc.com/Caddyfile
@@ -1,7 +0,0 @@
-bensuperpc.com {  
-  	redir https://www.bensuperpc.org{uri} permanent
-}
-
-www.bensuperpc.com {  
-  	redir https://www.bensuperpc.org{uri} permanent
-}
--- a/infrastructure/caddy/config/bensuperpc.fr/Caddyfile
+++ b/infrastructure/caddy/config/bensuperpc.fr/Caddyfile
@@ -1,7 +0,0 @@
-bensuperpc.fr {
-	redir https://www.bensuperpc.org{uri} permanent
-}
-
-www.bensuperpc.fr {
-	redir https://www.bensuperpc.org{uri} permanent
-}
--- a/infrastructure/caddy/config/bensuperpc.net/Caddyfile
+++ b/infrastructure/caddy/config/bensuperpc.net/Caddyfile
@@ -1,19 +0,0 @@
-bensuperpc.net {
-	redir https://www.bensuperpc.org{uri} permanent
-}
-
-www.bensuperpc.net {
-	redir https://www.bensuperpc.org{uri} permanent
-}
-
-git.bensuperpc.net {
-	redir https://git.bensuperpc.org{uri} permanent
-}
-
-jellyfin.bensuperpc.net {
-	redir https://jellyfin.bensuperpc.org{uri} permanent
-}
-
-uptimekuma.bensuperpc.net {
-	redir https://uptimekuma.bensuperpc.org{uri} permanent
-}
--- a/infrastructure/caddy/config/bensuperpc.org/Caddyfile
+++ b/infrastructure/caddy/config/bensuperpc.org/Caddyfile
@@ -1,170 +0,0 @@
-www.bensuperpc.org {
-	reverse_proxy homepage:3000
-}
-
-bensuperpc.org {
-	redir https://www.{host}{uri} permanent
-}
-
-homepage.bensuperpc.org {
-	redir https://www.bensuperpc.org{uri} permanent
-}
-
-public.bensuperpc.org {
-	root * /public_data
-	file_server browse
-}
-
-wordpress.bensuperpc.org {
-	root * /var/www/html
-	php_fastcgi wordpress:9000
-
-	file_server
-	encode zstd gzip
-
-	@disallowed {
-		path /xmlrpc.php
-		path *.sql
-		path /wp-content/uploads/*.php
-	}
-
-	rewrite @disallowed '/index.php'
-
-	respond /uploads/*.php 404
-
-	header {
-		# disable FLoC tracking
-		Permissions-Policy interest-cohort=()
-
-		# enable HSTS
-		Strict-Transport-Security max-age=31536000;
-
-		# disable clients from sniffing the media type
-		X-Content-Type-Options nosniff
-
-		# clickjacking protection
-		# X-Frame-Options DENY
-
-		# Disable powerful features we don't need
-        Permissions-Policy "geolocation=(), camera=(), microphone=() interest-cohort=()"
-	}
-}
-
-it-tools.bensuperpc.org {
-	# Load balance between 2 instances
-	reverse_proxy {
-		to it-tools0:80 it-tools1:80
-		lb_policy round_robin
-		lb_retries 3
-		lb_try_interval 1s
-	}
-}
-
-adminer.bensuperpc.org {
-	reverse_proxy adminer:8080
-}
-
-uptimekuma.bensuperpc.org {
-	reverse_proxy uptime-kuma:3001
-}
-
-torrent.bensuperpc.org {
-	reverse_proxy qbittorrent:8080
-}
-
-qbittorrent.bensuperpc.org {
-	redir https://torrent.bensuperpc.org permanent
-}
-
-transmission.bensuperpc.org {
-	reverse_proxy transmission:9091
-}
-
-gitea.bensuperpc.org {
-	redir https://git.bensuperpc.org permanent
-}
-
-git.bensuperpc.org {
-	reverse_proxy gitea:3000
-}
-
-jellyfin.bensuperpc.org {
-	reverse_proxy jellyfin:8096
-}
-
-transfer.bensuperpc.org {
-	reverse_proxy psitransfer:3000
-}
-
-psitransfer.bensuperpc.org {
-	redir https://transfer.bensuperpc.org{uri} permanent
-}
-
-picoshare.bensuperpc.org {
-	reverse_proxy picoshare:4001
-}
-
-syncthing.bensuperpc.org {
-	reverse_proxy syncthing:8384 {
-		header_up Host {upstream_hostport}
-	}
-}
-
-tools.bensuperpc.org {
-	redir https://it-tools.bensuperpc.org permanent
-}
-
-privatebin.bensuperpc.org {
-	reverse_proxy privatebin:8080
-}
-
-pastebin.bensuperpc.org {
-	redir https://privatebin.bensuperpc.org permanent
-}
-
-yacht.bensuperpc.org {
-	reverse_proxy yacht:8000
-}
-
-projectsend.bensuperpc.org {
-	reverse_proxy projectsend:80
-}
-
-dufs.bensuperpc.org {
-	reverse_proxy dufs:5000
-}
-
-stirlingpdf.bensuperpc.org {
-	reverse_proxy stirlingpdf:8080
-}
-
-link.bensuperpc.org {
-	# TODO: Use service with database
-	# Friendly links
-	redir /gnous https://gnous.eu permanent
-	redir /proxy https://imagisphe.re permanent
-	redir /patch https://spaceint.fr permanent
-	redir /greep https://greep.fr permanent
-
-	# Youtube links
-	redir /rickroll https://www.youtube.com/watch?v=dQw4w9WgXcQ permanent
-	redir /babyshark https://www.youtube.com/watch?v=XqZsoesa55w permanent
-	redir /cowcowcow https://www.youtube.com/watch?v=FavUpD_IjVY permanent
-	redir /badapple https://www.youtube.com/watch?v=FtutLA63Cp8 permanent
-	redir /macdo https://www.youtube.com/watch?v=Q16KpquGsIc permanent
-	redir /superiser https://www.youtube.com/watch?v=srnyVw-OR0g permanent
-	redir /daicon https://youtu.be/-840keiiFDE?si=zIPIokytxcnGw5fJ&t=162 permanent
-	redir /scp https://www.youtube.com/watch?v=FGCDndN20G8 permanent
-	redir /scpfb https://youtu.be/9zrKk-1E8zM?si=8R_ZBVG3GzMUYOe8&t=36 permanent
-	redir /mother https://youtu.be/w3NyycHR3fE?si=rNNSW9zYv0bcO2Eu permanent
-	redir /cpu https://www.youtube.com/watch?v=y39D4529FM4 permanent
-	redir /lechanteur https://youtu.be/HXdP15Ubu6M?si=N0qvhqo--3pmSGmb permanent
-	redir /nohero https://youtu.be/4DuUejBkMqE?si=bkB8G6PHwCp56jxb permanent
-	redir /indochine https://youtu.be/M7X6oYg6iro?si=ZRarm3qamTJ8vIJ0 permanent
-	redir /bna https://youtu.be/3T3ofoKfEoY?si=_7HkGQXMC7rBng8O permanent
-	redir /jojo https://youtu.be/U0TXIXTzJEY?si=2acWJWX06ju2w4uj permanent
-	redir /patapon https://youtu.be/H6CbNHLHkmk?si=ZvU8SzrOK-oCUXT5 permanent
-	redir /darkwater https://youtu.be/Tr8ZgF4Dc0E?si=CEOmm2J6Jp5rdbbt permanent
-	redir /train https://youtu.be/l8mScKWj3kQ?si=BV07uJ9eP3kzV9Kl permanent
-	redir /jdg https://www.youtube.com/@joueurdugrenier permanent
-}
--- a/infrastructure/caddy/config/bensuperpc.ovh/Caddyfile
+++ b/infrastructure/caddy/config/bensuperpc.ovh/Caddyfile
@@ -1,7 +0,0 @@
-bensuperpc.ovh {
-	redir https://www.bensuperpc.org{uri} permanent
-}
-
-www.bensuperpc.ovh {
-	redir https://www.bensuperpc.org{uri} permanent
-}
--- a/infrastructure/caddy/env/caddy.env
+++ b/infrastructure/caddy/env/caddy.env
--- a/infrastructure/docker-compose.yml
+++ b/infrastructure/docker-compose.yml
@@ -0,0 +1,51 @@
+include:
+# Main
+  - services/main/docker-compose.main.yml 
+# WordPress
+  - services/wordpress/docker-compose.wordpress.yml
+# Caddy
+  - services/caddy/docker-compose.caddy.yml
+# Dufs
+  - services/dufs/docker-compose.dufs.yml
+# Forgejo
+  - services/forgejo/docker-compose.forgejo.yml
+# Homepage
+  - services/homepage/docker-compose.homepage.yml
+# It-tools
+  - services/it-tools/docker-compose.it-tools.yml
+# omni-tools
+  - services/omni-tools/docker-compose.omni-tools.yml
+# cyberchef
+  - services/cyberchef/docker-compose.cyberchef.yml
+# Jellyfin
+  - services/jellyfin/docker-compose.jellyfin.yml
+# Openssh
+  - services/openssh/docker-compose.openssh.yml
+# Picoshare
+  - services/picoshare/docker-compose.picoshare.yml
+# Privatebin
+  - services/privatebin/docker-compose.privatebin.yml
+# Projectsend
+  - services/projectsend/docker-compose.projectsend.yml
+# Psitransfer
+  - services/psitransfer/docker-compose.psitransfer.yml
+# Qbittorrent
+  - services/qbittorrent/docker-compose.qbittorrent.yml
+# Stirlingpdf
+  - services/stirlingpdf/docker-compose.stirlingpdf.yml
+# Syncthing
+  - services/syncthing/docker-compose.syncthing.yml
+# Transmission
+  - services/transmission/docker-compose.transmission.yml
+# Uptime-kuma
+  - services/uptime-kuma/docker-compose.uptime-kuma.yml
+# open-webui
+  - services/open-webui/docker-compose.open-webui.yml
+# Minecraft
+  - services/minecraft-server/minecraft-server/docker-compose.yml
+# 7daystodie
+  - services/7daystodie-server/7daystodie-server/docker-compose.yml
+# Satisfactory
+  - services/satisfactory-server/satisfactory-server/docker-compose.yml
+# Team Fortress 2
+  - services/teamfortress2-server/teamfortress2-server/docker-compose.yml
--- a/infrastructure/gitea/config/gitea_runner/config.yaml
+++ b/infrastructure/gitea/config/gitea_runner/config.yaml
@@ -1,98 +0,0 @@
-# Example configuration file, it's safe to copy this as the default config file without any modification.
-
-# You don't have to copy this file to your instance,
-# just run `./act_runner generate-config > config.yaml` to generate a config file.
-
-log:
-  # The level of logging, can be trace, debug, info, warn, error, fatal
-  level: info
-
-runner:
-  # Where to store the registration result.
-  file: .runner
-  # Execute how many tasks concurrently at the same time.
-  capacity: 1
-  # Extra environment variables to run jobs.
-  envs:
-    A_TEST_ENV_NAME_1: a_test_env_value_1
-    A_TEST_ENV_NAME_2: a_test_env_value_2
-  # Extra environment variables to run jobs from a file.
-  # It will be ignored if it's empty or the file doesn't exist.
-  env_file: .env
-  # The timeout for a job to be finished.
-  # Please note that the Gitea instance also has a timeout (3h by default) for the job.
-  # So the job could be stopped by the Gitea instance if it's timeout is shorter than this.
-  timeout: 3h
-  # Whether skip verifying the TLS certificate of the Gitea instance.
-  insecure: false
-  # The timeout for fetching the job from the Gitea instance.
-  fetch_timeout: 5s
-  # The interval for fetching the job from the Gitea instance.
-  fetch_interval: 2s
-  # The labels of a runner are used to determine which jobs the runner can run, and how to run them.
-  # Like: "macos-arm64:host" or "ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
-  # Find more images provided by Gitea at https://gitea.com/gitea/runner-images .
-  # If it's empty when registering, it will ask for inputting labels.
-  # If it's empty when execute `daemon`, will use labels in `.runner` file.
-  labels:
-    - "ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
-    - "ubuntu-22.04:docker://gitea/runner-images:ubuntu-22.04"
-    - "ubuntu-20.04:docker://gitea/runner-images:ubuntu-20.04"
-
-cache:
-  # Enable cache server to use actions/cache.
-  enabled: true
-  # The directory to store the cache data.
-  # If it's empty, the cache data will be stored in $HOME/.cache/actcache.
-  dir: ""
-  # The host of the cache server.
-  # It's not for the address to listen, but the address to connect from job containers.
-  # So 0.0.0.0 is a bad choice, leave it empty to detect automatically.
-  host: ""
-  # The port of the cache server.
-  # 0 means to use a random available port.
-  port: 0
-  # The external cache server URL. Valid only when enable is true.
-  # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself.
-  # The URL should generally end with "/".
-  external_server: ""
-
-container:
-  # Specifies the network to which the container will connect.
-  # Could be host, bridge or the name of a custom network.
-  # If it's empty, act_runner will create a network automatically.
-  network: ""
-  # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker).
-  privileged: false
-  # And other options to be used when the container is started (eg, --add-host=my.gitea.url:host-gateway).
-  options:
-  # The parent directory of a job's working directory.
-  # NOTE: There is no need to add the first '/' of the path as act_runner will add it automatically. 
-  # If the path starts with '/', the '/' will be trimmed.
-  # For example, if the parent directory is /path/to/my/dir, workdir_parent should be path/to/my/dir
-  # If it's empty, /workspace will be used.
-  workdir_parent:
-  # Volumes (including bind mounts) can be mounted to containers. Glob syntax is supported, see https://github.com/gobwas/glob
-  # You can specify multiple volumes. If the sequence is empty, no volumes can be mounted.
-  # For example, if you only allow containers to mount the `data` volume and all the json files in `/src`, you should change the config to:
-  # valid_volumes:
-  #   - data
-  #   - /src/*.json
-  # If you want to allow any volume, please use the following configuration:
-  # valid_volumes:
-  #   - '**'
-  valid_volumes: []
-  # overrides the docker client host with the specified one.
-  # If it's empty, act_runner will find an available docker host automatically.
-  # If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers.
-  # If it's not empty or "-", the specified docker host will be used. An error will be returned if it doesn't work.
-  docker_host: ""
-  # Pull docker image(s) even if already present
-  force_pull: true
-  # Rebuild docker image(s) even if already present
-  force_rebuild: false
-
-host:
-  # The parent directory of a job's working directory.
-  # If it's empty, $HOME/.cache/act/ will be used.
-  workdir_parent:
--- a/infrastructure/gitea/docker-compose.gitea.yml
+++ b/infrastructure/gitea/docker-compose.gitea.yml
@@ -1,74 +0,0 @@
-services:
-  # Gitea
-  gitea:
-    image: gitea/gitea:latest-rootless
-    container_name: gitea
-    profiles:
-      - gitea
-    restart: on-failure:5
-    depends_on:
-      - database_gitea
-      - caddy
-    ports:
-      - "22:22"
-    env_file:
-      - ./gitea/env/gitea.env
-    volumes:
-      - gitea_data:/var/lib/gitea
-      - gitea_config:/etc/gitea
-#      - /etc/timezone:/etc/timezone:ro
-#      - /etc/localtime:/etc/localtime:ro
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-  
-  # Database gitea
-  database_gitea:
-    image: mariadb:latest
-    container_name: database_gitea
-    profiles:
-      - database
-      - gitea
-    depends_on:
-      - caddy
-    restart: on-failure:5
-    volumes:
-      - gitea_db:/var/lib/mysql:rw
-    env_file:
-      - ./gitea/env/gitea_db.env
-    command: '--default-authentication-plugin=mysql_native_password'
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-
-  # Gitea-runner
-  gitea-runner:
-    image: gitea/act_runner:latest
-    container_name: gitea-runner
-    profiles:
-      - gitea-runner
-    depends_on:
-      - gitea
-    restart: on-failure:5
-    env_file:
-      - ./gitea/env/gitea-runner.env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - gitea_runner:/data
-      - ./gitea/config/gitea_runner/config.yaml:/config.yaml:ro
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-
-volumes:
-  gitea_data:
-    name: gitea_data
-  gitea_config:
-    name: gitea_config
-  gitea_db:
-    name: gitea_db
-  gitea_runner:
-    name: gitea_runner
--- a/infrastructure/gitea/env/gitea-runner.env
+++ b/infrastructure/gitea/env/gitea-runner.env
@@ -1,5 +0,0 @@
-GITEA_INSTANCE_URL=https://git.bensuperpc.org
-GITEA_RUNNER_REGISTRATION_TOKEN=TBGzS0m823Xk732zRqjrbcSWFTEPajj5V5OFzXWP
-GITEA_RUNNER_NAME=runner-1
-#GITEA_RUNNER_LABELS=
-CONFIG_FILE=/config.yaml
--- a/infrastructure/gitea/env/gitea.env
+++ b/infrastructure/gitea/env/gitea.env
@@ -1,15 +0,0 @@
-USER_UID=1000
-USER_GID=1000
-GITEA__database__DB_TYPE=mysql
-GITEA__database__HOST=database_gitea:3306
-GITEA__database__NAME=gitea
-GITEA__database__USER=bensuperpc
-GITEA__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
-#GITEA__security__INTERNAL_TOKEN=
-GITEA__server__DOMAIN=git.bensuperpc.org
-GITEA__server__SSH_DOMAIN=git.bensuperpc.org
-GITEA__server__HTTP_PORT=3000
-GITEA__server__SSH_LISTEN_PORT=22
-GITEA__server__SSH_PORT=22
-GITEA__server__ROOT_URL=https://git.bensuperpc.org
--- a/infrastructure/openssh/docker-compose.openssh.yml
+++ b/infrastructure/openssh/docker-compose.openssh.yml
@@ -1,42 +0,0 @@
-services:
-  # openssh
-  openssh:
-    image: linuxserver/openssh-server:latest
-    container_name: openssh
-    profiles:
-      - openssh
-    depends_on:
-      - caddy
-    restart: on-failure:5
-    env_file:
-      - ./openssh/env/openssh.env
-    environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-    volumes:
-      - openssh_config:/config:rw
-      - ./openssh/config/authorized_keys:/authorized_ssh_keys:ro
-      - public_data:/public:rw
-      - private_data:/private:rw
-      - caddy_data:/caddy_data:rw
-      - caddy_config:/caddy_config:rw
-      - caddy_backup:/caddy_backup:rw
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:false
-    ports:
-      - 2222:2222
-volumes:
-  openssh_config:
-    name: openssh_config
-  public_data:
-    name: public_data
-  private_data:
-    name: private_data
-  caddy_data:
-    name: caddy_data
-  caddy_config:
-    name: caddy_config
-  caddy_backup:
-    name: caddy_backup
--- a/infrastructure/qbittorrent/env/qbittorrent.env
+++ b/infrastructure/qbittorrent/env/qbittorrent.env
@@ -1,3 +0,0 @@
-TZ=Etc/UTC
-WEBUI_PORT=8080
-TORRENTING_PORT=6881
--- a/infrastructure/services/7daystodie-server
+++ b/infrastructure/services/7daystodie-server
--- a/infrastructure/services/caddy/config/Caddyfile
+++ b/infrastructure/services/caddy/config/Caddyfile
@@ -0,0 +1,15 @@
+{
+	email {$MAIL_DOMAIN}
+	key_type p384
+
+	log {
+		output file /data/logs/access.log {
+			roll_size 1GiB
+			roll_keep 20
+			roll_keep_for 720h
+		}
+		format json
+	}
+}
+
+import website/*
--- a/infrastructure/services/caddy/config/website/cyberchef.caddy
+++ b/infrastructure/services/caddy/config/website/cyberchef.caddy
@@ -0,0 +1,9 @@
+cyberchef.{$MAIN_DOMAIN} {
+	# Load balance between 2 instances
+	reverse_proxy {
+		to cyberchef0:8000 cyberchef1:8000
+		lb_policy round_robin
+		lb_retries 3
+		lb_try_interval 1s
+	}
+}
--- a/infrastructure/services/caddy/config/website/dufs.caddy
+++ b/infrastructure/services/caddy/config/website/dufs.caddy
@@ -0,0 +1,3 @@
+dufs.{$MAIN_DOMAIN} {
+	reverse_proxy dufs:5000
+}
--- a/infrastructure/services/caddy/config/website/forgejo.caddy
+++ b/infrastructure/services/caddy/config/website/forgejo.caddy
@@ -0,0 +1,7 @@
+git.{$MAIN_DOMAIN} {
+	reverse_proxy forgejo:3000
+}
+
+forgejo.{$MAIN_DOMAIN} {
+	redir https://git.{$MAIN_DOMAIN}{uri} permanent
+}
--- a/infrastructure/services/caddy/config/website/header.caddy
+++ b/infrastructure/services/caddy/config/website/header.caddy
@@ -0,0 +1,14 @@
+(header_common) {
+	Permissions-Policy: geolocation=(), camera=(), microphone=(), clipboard-read=(), usb=()
+	Strict-Transport-Security: max-age=31536000; includeSubDomains
+	X-Content-Type-Options: nosniff
+	X-Frame-Options: DENY
+	Referrer-Policy: strict-origin-when-cross-origin
+	# Only useful for old browsers
+	X-XSS-Protection: "1; mode=block"
+
+	# Can cause issues with external resources
+	#Cross-Origin-Embedder-Policy: require-corp
+	Cross-Origin-Opener-Policy: same-origin
+	#Cross-Origin-Resource-Policy: same-origin
+}
--- a/infrastructure/services/caddy/config/website/homepage.caddy
+++ b/infrastructure/services/caddy/config/website/homepage.caddy
@@ -0,0 +1,3 @@
+homepage.{$MAIN_DOMAIN} {
+	reverse_proxy homepage:3000
+}
--- a/infrastructure/services/caddy/config/website/it-tools.caddy
+++ b/infrastructure/services/caddy/config/website/it-tools.caddy
@@ -0,0 +1,9 @@
+it-tools.{$MAIN_DOMAIN} {
+	# Load balance between 2 instances
+	reverse_proxy {
+		to it-tools0:8080 it-tools1:8080
+		lb_policy round_robin
+		lb_retries 3
+		lb_try_interval 1s
+	}
+}
--- a/infrastructure/services/caddy/config/website/jellyfin.caddy
+++ b/infrastructure/services/caddy/config/website/jellyfin.caddy
@@ -0,0 +1,3 @@
+jellyfin.{$MAIN_DOMAIN} {
+	reverse_proxy jellyfin:8096
+}
--- a/infrastructure/services/caddy/config/website/main.caddy
+++ b/infrastructure/services/caddy/config/website/main.caddy
@@ -0,0 +1,27 @@
+www.{$MAIN_DOMAIN} {
+	header {
+		Cache-Control "public, max-age=10"
+		import header_common
+	}
+
+	handle_errors {
+		@notFound expression `{http.error.status_code} == 404`
+		redir @notFound https://www.{$MAIN_DOMAIN} permanent
+	}
+
+	reverse_proxy homepage:3000
+}
+
+{$MAIN_DOMAIN} {
+	redir https://www.{host}{uri} permanent
+}
+
+public.{$MAIN_DOMAIN} {
+	root * /public_data
+	file_server browse
+
+	header / {
+		Cache-Control "no-store"
+		import header_common
+	}
+}
--- a/infrastructure/services/caddy/config/website/memos.caddy
+++ b/infrastructure/services/caddy/config/website/memos.caddy
@@ -0,0 +1,3 @@
+memos.{$MAIN_DOMAIN} {
+	reverse_proxy memos:5230
+}
--- a/infrastructure/services/caddy/config/website/omni-tools.caddy
+++ b/infrastructure/services/caddy/config/website/omni-tools.caddy
@@ -0,0 +1,9 @@
+omni-tools.{$MAIN_DOMAIN} {
+	# Load balance between 2 instances
+	reverse_proxy {
+		to omni-tools0:80 omni-tools1:80
+		lb_policy round_robin
+		lb_retries 3
+		lb_try_interval 1s
+	}
+}
--- a/infrastructure/services/caddy/config/website/open-webui.caddy
+++ b/infrastructure/services/caddy/config/website/open-webui.caddy
@@ -0,0 +1,3 @@
+open-webui.{$MAIN_DOMAIN} {
+	reverse_proxy open-webui:8080
+}
--- a/infrastructure/services/caddy/config/website/picoshare.caddy
+++ b/infrastructure/services/caddy/config/website/picoshare.caddy
@@ -0,0 +1,3 @@
+picoshare.{$MAIN_DOMAIN} {
+	reverse_proxy picoshare:4001
+}
--- a/infrastructure/services/caddy/config/website/privatebin.caddy
+++ b/infrastructure/services/caddy/config/website/privatebin.caddy
@@ -0,0 +1,7 @@
+privatebin.{$MAIN_DOMAIN} {
+	reverse_proxy privatebin:8080
+}
+
+pastebin.{$MAIN_DOMAIN} {
+	redir https://privatebin.{$MAIN_DOMAIN} permanent
+}
--- a/infrastructure/services/caddy/config/website/projectsend.caddy
+++ b/infrastructure/services/caddy/config/website/projectsend.caddy
@@ -0,0 +1,3 @@
+projectsend.{$MAIN_DOMAIN} {
+	reverse_proxy projectsend:80
+}
--- a/infrastructure/services/caddy/config/website/psitransfer.caddy
+++ b/infrastructure/services/caddy/config/website/psitransfer.caddy
@@ -0,0 +1,7 @@
+transfer.{$MAIN_DOMAIN} {
+	reverse_proxy psitransfer:3000
+}
+
+psitransfer.{$MAIN_DOMAIN} {
+	redir https://transfer.{$MAIN_DOMAIN}{uri} permanent
+}
--- a/infrastructure/services/caddy/config/website/qbittorrent.caddy
+++ b/infrastructure/services/caddy/config/website/qbittorrent.caddy
@@ -0,0 +1,11 @@
+torrent.{$MAIN_DOMAIN} {
+	reverse_proxy qbittorrent:8080
+	header {
+		Cache-Control "no-store"
+		import header_common
+	}
+}
+
+qbittorrent.{$MAIN_DOMAIN} {
+	redir https://torrent.{$MAIN_DOMAIN} permanent
+}
--- a/infrastructure/services/caddy/config/website/stirlingpdf.caddy
+++ b/infrastructure/services/caddy/config/website/stirlingpdf.caddy
@@ -0,0 +1,3 @@
+stirlingpdf.{$MAIN_DOMAIN} {
+	reverse_proxy stirlingpdf:8080
+}
--- a/infrastructure/services/caddy/config/website/syncthing.caddy
+++ b/infrastructure/services/caddy/config/website/syncthing.caddy
@@ -0,0 +1,5 @@
+syncthing.{$MAIN_DOMAIN} {
+	reverse_proxy syncthing:8384 {
+		header_up Host {upstream_hostport}
+	}
+}
--- a/infrastructure/services/caddy/config/website/transmission.caddy
+++ b/infrastructure/services/caddy/config/website/transmission.caddy
@@ -0,0 +1,3 @@
+transmission.{$MAIN_DOMAIN} {
+	reverse_proxy transmission:9091
+}
--- a/infrastructure/services/caddy/config/website/uptimekuma.caddy
+++ b/infrastructure/services/caddy/config/website/uptimekuma.caddy
@@ -0,0 +1,3 @@
+uptimekuma.{$MAIN_DOMAIN} {
+	reverse_proxy uptime-kuma:3001
+}
--- a/infrastructure/services/caddy/config/website/wordpress.caddy
+++ b/infrastructure/services/caddy/config/website/wordpress.caddy
@@ -0,0 +1,34 @@
+wordpress.{$MAIN_DOMAIN} {
+	root * /var/www/html
+	php_fastcgi wordpress:9000
+
+	file_server
+	encode zstd gzip
+
+	@disallowed {
+		path /xmlrpc.php
+		path *.sql
+		path /wp-content/uploads/*.php
+	}
+
+	rewrite @disallowed '/index.php'
+
+	respond /uploads/*.php 404
+
+	header {
+		# disable FLoC tracking
+		Permissions-Policy interest-cohort=()
+
+		# enable HSTS
+		Strict-Transport-Security max-age=31536000;
+
+		# disable clients from sniffing the media type
+		X-Content-Type-Options nosniff
+
+		# clickjacking protection
+		# X-Frame-Options DENY
+
+		# Disable powerful features we don't need
+		Permissions-Policy "geolocation=(), camera=(), microphone=() interest-cohort=()"
+	}
+}
--- a/infrastructure/services/caddy/docker-compose.caddy.yml
+++ b/infrastructure/services/caddy/docker-compose.caddy.yml
@@ -1,7 +1,7 @@
 services:
  # Caddy
  caddy:
-    image: caddy:latest
+    image: bensuperpc/caddy-l4:latest
    container_name: caddy
    profiles:
      - caddy
@@ -10,19 +10,21 @@ services:
        condition: service_completed_successfully
    restart: on-failure:5
    ports:
-      - 80:80
-      - 443:443
+      - 80:80/tcp
+      - 80:80/udp
+      - 443:443/tcp
+      - 443:443/udp
    volumes:
      - caddy_data:/data:rw
      - caddy_config:/config:rw
-      - ./caddy/config:/etc/caddy:ro
+      - ./config:/etc/caddy:ro
      - wordpress:/var/www/html:rw
      - public_data:/public_data:ro

    networks:
      - infra-network
    env_file:
-      - ./caddy/env/caddy.env
+      - ./env/caddy.env
    security_opt:
      - no-new-privileges:true
    healthcheck:
@@ -40,7 +42,7 @@ services:
      - caddy
    restart: on-failure:5
    env_file:
-      - ./caddy/env/caddy_backup.env
+      - ./env/caddy_backup.env
    volumes:
      - caddy_backup:/mnt/restic
      - caddy_data:/data:ro
--- a/infrastructure/services/caddy/env/caddy.env
+++ b/infrastructure/services/caddy/env/caddy.env
@@ -0,0 +1,2 @@
+MAIN_DOMAIN=bensuperpc.org
+MAIL_DOMAIN=bensuperpc@gmail.com
--- a/infrastructure/services/caddy/env/caddy_backup.env
+++ b/infrastructure/services/caddy/env/caddy_backup.env
--- a/infrastructure/services/cyberchef/docker-compose.cyberchef.yml
+++ b/infrastructure/services/cyberchef/docker-compose.cyberchef.yml
@@ -0,0 +1,51 @@
+services:
+  # cyberchef
+  cyberchef0:
+    image: mpepping/cyberchef:latest
+    container_name: cyberchef0
+    profiles:
+      - cyberchef
+    restart: on-failure:5
+    depends_on:
+      - caddy
+    networks:
+      - infra-network
+    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
+    container_name: cyberchef1
+    profiles:
+      - cyberchef
+    restart: on-failure:5
+    depends_on:
+      - caddy
+    networks:
+      - infra-network
+    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
--- a/infrastructure/services/dufs/docker-compose.dufs.yml
+++ b/infrastructure/services/dufs/docker-compose.dufs.yml
@@ -10,7 +10,7 @@ services:
    depends_on:
      - caddy
    env_file:
-      - ./dufs/env/dufs.env
+      - ./env/dufs.env
    volumes:
      - public_data:/data
    networks:
--- a/infrastructure/services/dufs/env/dufs.env
+++ b/infrastructure/services/dufs/env/dufs.env
--- a/infrastructure/services/forgejo/docker-compose.forgejo.yml
+++ b/infrastructure/services/forgejo/docker-compose.forgejo.yml
@@ -0,0 +1,96 @@
+services:
+  # forgejo
+  forgejo:
+    image: codeberg.org/forgejo/forgejo:13-rootless
+    container_name: forgejo
+    profiles:
+      - forgejo
+    restart: on-failure:5
+    depends_on:
+      - database_forgejo
+      - caddy
+    ports:
+      - "22:2222"
+    env_file:
+      - ./env/forgejo.env
+    volumes:
+      - forgejo_data:/var/lib/gitea
+      - forgejo_config:/etc/gitea
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    networks:
+      - infra-network
+    user: ${PUID:-1000}:${PGID:-1000} 
+    security_opt:
+      - no-new-privileges:true
+  
+  # Database forgejo
+  database_forgejo:
+    image: mariadb:latest
+    container_name: database_forgejo
+    profiles:
+      - forgejo
+    depends_on:
+      - caddy
+    restart: on-failure:5
+    volumes:
+      - forgejo_db:/var/lib/mysql:rw
+    env_file:
+      - ./env/forgejo_db.env
+    command: '--default-authentication-plugin=mysql_native_password'
+    networks:
+      - infra-network
+    security_opt:
+      - no-new-privileges:true
+
+  # forgejo-runner
+  docker-in-docker:
+    image: code.forgejo.org/oci/docker:dind
+    container_name: 'docker_dind'
+    hostname: docker
+    networks:
+      - infra-network
+    profiles:
+      - forgejo-runner
+    privileged: true
+    environment:
+      DOCKER_TLS_CERTDIR: /certs
+      DOCKER_HOST: docker-in-docker
+    volumes:
+      - forgejo_certs:/certs
+
+  forgejo_runner:
+    image: data.forgejo.org/forgejo/runner:9
+    networks:
+      - infra-network
+    profiles:
+      - forgejo-runner
+    links:
+      - docker-in-docker
+    depends_on:
+      docker-in-docker:
+        condition: service_started
+    container_name: 'forgejo_runner'
+    env_file:
+      - ./env/forgejo_runner.env
+    user: ${PUID:-1000}:${PGID:-1000} 
+    volumes:
+#      - ./config/forgejo_runner/config.yaml:/config.yaml:ro
+      - forgejo_runner:/data
+      - forgejo_certs:/certs
+    restart: 'unless-stopped'
+
+#    command: '/bin/sh -c "while : ; do sleep 1 ; done ;"'
+    command: '/bin/sh -c "sleep 5; forgejo-runner -c /data/config.yml daemon"'
+
+volumes:
+  forgejo_data:
+    name: forgejo_data
+  forgejo_config:
+    name: forgejo_config
+  forgejo_db:
+    name: forgejo_db
+  forgejo_certs:
+    name: forgejo_certs
+  forgejo_runner:
+    name: forgejo_runner
--- a/infrastructure/services/forgejo/env/forgejo.env
+++ b/infrastructure/services/forgejo/env/forgejo.env
@@ -0,0 +1,25 @@
+USER_UID=1000
+USER_GID=1000
+FORGEJO__database__DB_TYPE=mysql
+FORGEJO__database__HOST=database_forgejo:3306
+FORGEJO__database__NAME=forgejo
+FORGEJO__database__USER=bensuperpc
+FORGEJO__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
+FORGEJO__APP_NAME=Bensuperpc's Forgejo
+FORGEJO__APP_SLOGAN=Personal Code, Mirrors, and More
+FORGEJO__server__DOMAIN=git.bensuperpc.org
+FORGEJO__server__SSH_DOMAIN=git.bensuperpc.org
+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=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
+#FORGEJO__security__INTERNAL_TOKEN=
+#FORGEJO__security__INSTALL_LOCK=true
+FORGEJO__security__MIN_PASSWORD_LENGTH=8
+FORGEJO__actions__ENABLED=true
+FORGEJO__actions__DEFAULT_ACTIONS_URL="https://git.bensuperpc.org"
+#FORGEJO__log__LEVEL: "debug"
+FORGEJO__repository__ENABLE_PUSH_CREATE_USER=true
+FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE=false
+FORGEJO__repository__DEFAULT_REPO_UNITS=repo.code,repo.actions
--- a/infrastructure/services/forgejo/env/forgejo_db.env
+++ b/infrastructure/services/forgejo/env/forgejo_db.env
@@ -1,4 +1,4 @@
 MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
 MARIADB_USER=bensuperpc
 MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-MARIADB_DATABASE=gitea
+MARIADB_DATABASE=forgejo
--- a/infrastructure/services/forgejo/env/forgejo_runner.env
+++ b/infrastructure/services/forgejo/env/forgejo_runner.env
@@ -0,0 +1,3 @@
+DOCKER_HOST=tcp://docker:2376
+DOCKER_CERT_PATH=/certs/client
+DOCKER_TLS_VERIFY=1
--- a/infrastructure/services/homepage/config/bookmarks.yaml
+++ b/infrastructure/services/homepage/config/bookmarks.yaml
@@ -1,6 +1,6 @@
 ---
 # For configuration options and examples, please see:
-# https://gethomepage.dev/latest/configs/bookmarks
+# https://gethomepage.dev/configs/bookmarks

 - Developer:
    - Github:
--- a/infrastructure/services/homepage/config/custom.css
+++ b/infrastructure/services/homepage/config/custom.css
--- a/infrastructure/services/homepage/config/custom.js
+++ b/infrastructure/services/homepage/config/custom.js
--- a/infrastructure/services/homepage/config/docker.yaml
+++ b/infrastructure/services/homepage/config/docker.yaml
@@ -1,6 +1,6 @@
 ---
 # For configuration options and examples, please see:
-# https://gethomepage.dev/latest/configs/docker/
+# https://gethomepage.dev/configs/docker

 #jellyfin:
 #  host: jellyfin
--- a/infrastructure/services/homepage/config/kubernetes.yaml
+++ b/infrastructure/services/homepage/config/kubernetes.yaml
--- a/infrastructure/services/homepage/config/proxmox.yaml
+++ b/infrastructure/services/homepage/config/proxmox.yaml
@@ -0,0 +1,4 @@
+---
+# url: https://proxmox.host.or.ip:8006
+# token: username@pam!Token ID
+# secret: secret
--- a/infrastructure/services/homepage/config/services.yaml
+++ b/infrastructure/services/homepage/config/services.yaml
@@ -1,6 +1,6 @@
 ---
 # For configuration options and examples, please see:
-# https://gethomepage.dev/latest/configs/services
+# https://gethomepage.dev/configs/services/

 - Personal:
    - wordpress:
@@ -64,12 +64,12 @@
        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
+#    - 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:
@@ -78,38 +78,36 @@
        description: IT Tools
        ping: it-tools.bensuperpc.org
        container: it-tools0
+    - 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
+        container: omni-tools0
+    - 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
+        container: cyberchef0
    - 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
        container: stirlingpdf
-    - gitea:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/gitea.png
-        href: https://gitea.bensuperpc.org/
-        description: Gitea
-        ping: gitea.bensuperpc.org
-        container: gitea
-
- Admin:
-    - uptime-kuma:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/uptime-kuma.png
-        href: https://uptimekuma.bensuperpc.org/
-        description: Uptime Kuma
-        ping: uptimekuma.bensuperpc.org
-        container: uptime-kuma
-    - yacht:
-#        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/yacht.png
-        href: https://yacht.bensuperpc.org/
-        description: Yacht
-        ping: yacht.bensuperpc.org
-        container: yacht
-    - adminer:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/adminer.png
-        href: https://adminer.bensuperpc.org/
-        description: Adminer
-        ping: adminer.bensuperpc.org
-        container: adminer
+    - 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
+        container: forgejo
+    - open-webui:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/open-webui.png
+        href: https://open-webui.bensuperpc.org/
+        description: ChatGPT local
+        ping: open-webui.bensuperpc.org
+        container: open-webui

 - Games:
    - minecraft:
@@ -123,11 +121,19 @@
 #        href: https://7dtd.bensuperpc.org/
        description: 7 Days to Die server
 #        ping: 7dtd.bensuperpc.org
-        container: 7dtd-server
+        container: 7daystodie_server
    - 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
+
+- Admin:
+    - uptime-kuma:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/uptime-kuma.png
+        href: https://uptimekuma.bensuperpc.org/
+        description: Uptime Kuma
+        ping: uptimekuma.bensuperpc.org
+        container: uptime-kuma

--- a/infrastructure/services/homepage/config/settings.yaml
+++ b/infrastructure/services/homepage/config/settings.yaml
@@ -1,9 +1,11 @@
 ---
 # For configuration options and examples, please see:
-# https://gethomepage.dev/latest/configs/settings
+# https://gethomepage.dev/configs/settings/

 title: Bensuperpc

+description: Bensuperpc's homepage
+
 base: https://www.bensuperpc.org

 favicon: /image/favicon.ico
--- a/infrastructure/services/homepage/config/widgets.yaml
+++ b/infrastructure/services/homepage/config/widgets.yaml
@@ -1,7 +1,7 @@
 ---
 # For configuration options and examples, please see:
-# https://gethomepage.dev/latest/configs/service-widgets
-# https://gethomepage.dev/main/widgets/services/qbittorrent
+# https://gethomepage.dev/widgets/services/
+# https://gethomepage.dev/widgets/services/qbittorrent/

 #- logo:
 #    icon: /image/daisy.jpg
--- a/infrastructure/services/homepage/docker-compose.homepage.yml
+++ b/infrastructure/services/homepage/docker-compose.homepage.yml
@@ -6,14 +6,17 @@ services:
    profiles:
      - homepage
    restart: on-failure:5
+#    environment:
+#      - PUID=${PUID:-1000}
+#      - PGID=${PGID:-1000}
    depends_on:
      - caddy
    env_file:
-      - ./homepage/env/homepage.env
+      - ./env/homepage.env
    volumes:
      - homepage_log:/app/logs
-      - ./homepage/config:/app/config:ro
-      - ./homepage/image:/app/public/image:ro
+      - ./config:/app/config
+      - ./image:/app/public/image:ro
      - /var/run/docker.sock:/var/run/docker.sock:ro
 #    develop:
 #      watch:
--- a/infrastructure/services/homepage/env/homepage.env
+++ b/infrastructure/services/homepage/env/homepage.env
@@ -1,2 +1,3 @@
 PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn
 #PSITRANSFER_PORT=3000
+HOMEPAGE_ALLOWED_HOSTS=www.bensuperpc.org
--- a/infrastructure/services/homepage/image/background.jpg
+++ b/infrastructure/services/homepage/image/background.jpg
--- a/infrastructure/services/homepage/image/daisy.jpg
+++ b/infrastructure/services/homepage/image/daisy.jpg
--- a/infrastructure/services/homepage/image/favicon.ico
+++ b/infrastructure/services/homepage/image/favicon.ico
--- a/infrastructure/services/it-tools/docker-compose.it-tools.yml
+++ b/infrastructure/services/it-tools/docker-compose.it-tools.yml
@@ -1,7 +1,7 @@
 services:
  # it-tools
  it-tools0:
-    image: corentinth/it-tools:latest
+    image: ghcr.io/sharevb/it-tools:latest
    container_name: it-tools0
    profiles:
      - it-tools
@@ -26,7 +26,7 @@ services:
          memory: 20M

  it-tools1:
-    image: corentinth/it-tools:latest
+    image: ghcr.io/sharevb/it-tools:latest
    container_name: it-tools1
    profiles:
      - it-tools
--- a/infrastructure/services/jellyfin/docker-compose.jellyfin.yml
+++ b/infrastructure/services/jellyfin/docker-compose.jellyfin.yml
@@ -12,7 +12,7 @@ services:
    depends_on:
      - caddy
    env_file:
-      - ./jellyfin/env/jellyfin.env
+      - ./env/jellyfin.env
    volumes:
      - jellyfin_config:/config
      - jellyfin_cache:/cache
--- a/infrastructure/services/jellyfin/env/jellyfin.env
+++ b/infrastructure/services/jellyfin/env/jellyfin.env
--- a/infrastructure/services/main/docker-compose.main.yml
+++ b/infrastructure/services/main/docker-compose.main.yml
@@ -28,7 +28,3 @@ networks:
  infra-network:
    driver: bridge
    name: infra-network
-  intern-network:
-    driver: bridge
-    internal: true
-    name: intern-network
--- a/infrastructure/services/memos/docker-compose.memos.yml
+++ b/infrastructure/services/memos/docker-compose.memos.yml
@@ -0,0 +1,22 @@
+services:
+  # memos
+  memos:
+    image: neosmemo/memos:latest
+    container_name: memos
+    profiles:
+      - memos
+    restart: on-failure:5
+    depends_on:
+      - caddy
+    env_file:
+      - ./env/memos.env
+    volumes:
+      - memos_config:/var/opt/memos
+    networks:
+      - infra-network
+    security_opt:
+      - no-new-privileges:true
+
+volumes:
+  memos_config:
+    name: memos_config
--- a/infrastructure/services/memos/env/memos.env
+++ b/infrastructure/services/memos/env/memos.env
@@ -0,0 +1 @@
+
--- a/infrastructure/services/minecraft-server
+++ b/infrastructure/services/minecraft-server
--- a/infrastructure/services/omni-tools/docker-compose.omni-tools.yml
+++ b/infrastructure/services/omni-tools/docker-compose.omni-tools.yml
@@ -0,0 +1,51 @@
+services:
+  # omni-tools
+  omni-tools0:
+    image: iib0011/omni-tools:latest
+    container_name: omni-tools0
+    profiles:
+      - omni-tools
+    restart: on-failure:5
+    depends_on:
+      - caddy
+    networks:
+      - infra-network
+    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
+
+  omni-tools1:
+    image: iib0011/omni-tools:latest
+    container_name: omni-tools1
+    profiles:
+      - omni-tools
+    restart: on-failure:5
+    depends_on:
+      - caddy
+    networks:
+      - infra-network
+    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
--- a/infrastructure/services/open-webui/docker-compose.open-webui.yml
+++ b/infrastructure/services/open-webui/docker-compose.open-webui.yml
@@ -0,0 +1,42 @@
+services:
+  ollama:
+    image: ollama/ollama:latest
+    #platform: linux/amd64
+    container_name: ollama
+    profiles:
+      - open-webui
+    depends_on:
+      - caddy
+    restart: on-failure:5
+    tty: true
+    volumes:
+      - ollama:/root/.ollama
+    security_opt:
+      - no-new-privileges:true
+    networks:
+      - infra-network
+
+  open-webui:
+    image: ghcr.io/open-webui/open-webui:main
+    container_name: open-webui
+    profiles:
+      - open-webui
+    volumes:
+      - open-webui:/app/backend/data
+    depends_on:
+      - ollama
+      - caddy
+    env_file:
+      - ./env/open-webui.env
+    #environment:
+    #  - UID=${PUID:-1000}
+    #  - GID=${PGID:-1000}
+    restart: on-failure:5
+    networks:
+      - infra-network
+    security_opt:
+      - no-new-privileges:true
+
+volumes:
+  ollama: {}
+  open-webui: {}
--- a/infrastructure/services/open-webui/env/open-webui.env
+++ b/infrastructure/services/open-webui/env/open-webui.env
@@ -0,0 +1,16 @@
+OLLAMA_BASE_URL=http://ollama:11434
+#WEBUI_SECRET_KEY=
+#HF_HUB_OFFLINE=1
+# Disable analytics
+SCARF_NO_ANALYTICS=true
+DO_NOT_TRACK=true
+ANONYMIZED_TELEMETRY=false
+
+#OPENAI_API_BASE_URL=
+#OPENAI_API_KEY=
+
+# Only with stable-diffusion-webui
+#ENABLE_IMAGE_GENERATION=true
+#AUTOMATIC1111_BASE_URL=http://stable-diffusion-webui:7860
+#IMAGE_SIZE=64x64
+#IMAGE_STEPS=3
--- a/infrastructure/services/openssh/config/authorized_keys/id_ed25519.pub
+++ b/infrastructure/services/openssh/config/authorized_keys/id_ed25519.pub
--- a/infrastructure/services/openssh/docker-compose.openssh.yml
+++ b/infrastructure/services/openssh/docker-compose.openssh.yml
@@ -0,0 +1,94 @@
+services:
+  # openssh
+  openssh:
+    image: linuxserver/openssh-server:latest
+    container_name: openssh
+    profiles:
+      - openssh
+    restart: on-failure:5
+    env_file:
+      - ./env/openssh.env
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
+    volumes:
+      - openssh_config:/config:rw
+      - ./config/authorized_keys:/authorized_ssh_keys:ro
+      - public_data:/public_data:rw
+      - private_data:/private_data:rw
+      - caddy_data:/caddy_data:rw
+      - caddy_config:/caddy_config:rw
+      - caddy_backup:/caddy_backup:rw
+      - 7daystodie_backup:/7daystodie_backup:rw
+      - 7daystodie_server_save:/7daystodie_server_save:rw
+      - 7daystodie_server_config_lgsm:/7daystodie_server_config_lgsm:rw
+      - 7daystodie_server_file:/7daystodie_server_file:rw
+      - 7daystodie_server_log:/7daystodie_server_log:rw
+      - satisfactory_backup:/satisfactory_backup:rw
+      - satisfactory_server_config:/satisfactory_server_config:rw
+      - 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_config:/forgejo_config:rw
+      - forgejo_db:/forgejo_db:rw
+      - teamfortress2_backup:/teamfortress2_backup:rw
+      - teamfortress2_data:/teamfortress2_data:rw
+
+    networks:
+      - infra-network
+    security_opt:
+      - no-new-privileges:false
+    ports:
+      - 2222:2222
+volumes:
+  openssh_config:
+    name: openssh_config
+  public_data:
+    name: public_data
+  private_data:
+    name: private_data
+  caddy_data:
+    name: caddy_data
+  caddy_config:
+    name: caddy_config
+  caddy_backup:
+    name: caddy_backup
+# 7daystodie-server
+  7daystodie_backup:
+    name: 7daystodie_backup
+  7daystodie_server_save:
+    name: 7daystodie_server_save
+  7daystodie_server_config_lgsm:
+    name: 7daystodie_server_config_lgsm
+  7daystodie_server_file:
+    name: 7daystodie_server_file
+  7daystodie_server_log:
+    name: 7daystodie_server_log
+# satisfactory-server
+  satisfactory_backup:
+    name: satisfactory_backup
+  satisfactory_server_config:
+    name: satisfactory_server_config
+# minecraft-server
+  minecraft_server_backup:
+    name: minecraft_server_backup
+  minecraft_server_data:
+    name: minecraft_server_data
+  minecraft_proxy_data:
+    name: minecraft_proxy_data
+  minecraft_rcon_data:
+    name: minecraft_rcon_data
+# teamfortress2
+  teamfortress2_backup:
+    name: teamfortress2_backup
+  teamfortress2_data:
+    name: teamfortress2_data
+# forgejo
+  forgejo_data:
+    name: forgejo_data
+  forgejo_config:
+    name: forgejo_config
+  forgejo_db:
+    name: forgejo_db
--- a/infrastructure/services/openssh/env/openssh.env
+++ b/infrastructure/services/openssh/env/openssh.env
--- a/infrastructure/services/picoshare/docker-compose.picoshare.yml
+++ b/infrastructure/services/picoshare/docker-compose.picoshare.yml
@@ -9,7 +9,7 @@ services:
    depends_on:
      - caddy
    env_file:
-      - ./picoshare/env/picoshare.env
+      - ./env/picoshare.env
    volumes:
      - picoshare_data:/data
    networks:
--- a/infrastructure/services/picoshare/env/picoshare.env
+++ b/infrastructure/services/picoshare/env/picoshare.env
--- a/infrastructure/services/privatebin/config/conf.php
+++ b/infrastructure/services/privatebin/config/conf.php
@@ -39,16 +39,29 @@ defaultformatter = "plaintext"
 ; (optional) set a syntax highlighting theme, as found in css/prettify/
 ; syntaxhighlightingtheme = "sons-of-obsidian"

-; size limit per paste or comment in bytes, defaults to 10 Mebibytes
-sizelimit = 10485760
+; size limit per document or comment in bytes, defaults to 10 Megabytes
+sizelimit = 10000000

-; template to include, default is "bootstrap" (tpl/bootstrap.php), also
-; available are "page" (tpl/page.php), the classic ZeroBin style and several
-; bootstrap variants: "bootstrap-dark", "bootstrap-compact", "bootstrap-page",
-; which can be combined with "-dark" and "-compact" for "bootstrap-dark-page"
-; and finally "bootstrap-compact-page" - previews at:
+; by default PrivateBin use "bootstrap5" template (tpl/bootstrap5.php).
+; Optionally you can enable the template selection menu, which uses
+; a session cookie to store the choice until the browser is closed.
+templateselection = false
+
+; List of available for selection templates when "templateselection" option is enabled
+availabletemplates[] = "bootstrap5"
+availabletemplates[] = "bootstrap"
+availabletemplates[] = "bootstrap-page"
+availabletemplates[] = "bootstrap-dark"
+availabletemplates[] = "bootstrap-dark-page"
+availabletemplates[] = "bootstrap-compact"
+availabletemplates[] = "bootstrap-compact-page"
+
+; set the template your installs defaults to, defaults to "bootstrap5" (tpl/bootstrap5.php), also
+; bootstrap template (tpl/bootstrap.php) and it's variants: "bootstrap-dark", "bootstrap-compact", "bootstrap-page",
+; which can be combined with "-dark" and "-compact" for "bootstrap-dark-page",
+; "bootstrap-compact-page" - previews at:
 ; https://privatebin.info/screenshots.html
-template = "bootstrap-dark"
+; template = "bootstrap5"

 ; (optional) info text to display
 ; use single, instead of double quotes for HTML attributes
@@ -66,17 +79,22 @@ languageselection = false
 ; if this is set and language selection is disabled, this will be the only language
 ; languagedefault = "en"

-; (optional) URL shortener address to offer after a new paste is created.
+; (optional) URL shortener address to offer after a new document is created.
 ; It is suggested to only use this with self-hosted shorteners as this will leak
-; the pastes encryption key.
+; the documents encryption key.
 ; urlshortener = "https://shortener.example.com/api?link="

-; (optional) Let users create a QR code for sharing the paste URL with one click.
-; It works both when a new paste is created and when you view a paste.
+; (optional) Whether to shorten the URL by default when a new document is created.
+; If set to true, the "Shorten URL" functionality will be automatically called.
+; This only works if the "urlshortener" option is set.
+; shortenbydefault = false
+
+; (optional) Let users create a QR code for sharing the document URL with one click.
+; It works both when a new document is created and when you view a document.
 ; qrcode = true

-; (optional) Let users send an email sharing the paste URL with one click.
-; It works both when a new paste is created and when you view a paste.
+; (optional) Let users send an email sharing the document URL with one click.
+; It works both when a new document is created and when you view a document.
 ; email = true

 ; (optional) IP based icons are a weak mechanism to detect if a comment was from
@@ -84,7 +102,7 @@ languageselection = false
 ; used to get the IP of a comment poster if the server salt is leaked and a
 ; SHA512 HMAC rainbow table is generated for all (relevant) IPs.
 ; Can be set to one these values:
-; "none" / "identicon" (default) / "jdenticon" / "vizhash".
+; "none" / "identicon" / "jdenticon" (default) / "vizhash".
 ; icon = "none"

 ; Content Security Policy headers allow a website to restrict what sources are
@@ -93,24 +111,21 @@ languageselection = false
 ; scripts or run your site behind certain DDoS-protection services.
 ; Check the documentation at https://content-security-policy.com/
 ; Notes:
-; - If you use any bootstrap theme, you can remove the allow-popups from the
-;   sandbox restrictions.
-; - If you use the bootstrap5 theme, you must change default-src to 'self' to
-;   enable display of the svg icons
 ; - By default this disallows to load images from third-party servers, e.g. when
-;   they are embedded in pastes. If you wish to allow that, you can adjust the
+;   they are embedded in documents. If you wish to allow that, you can adjust the
 ;   policy here. See https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-it-load-embedded-images
 ;   for details.
-; - The 'unsafe-eval' is used in two cases; to check if the browser supports
-;   async functions and display an error if not and for Chrome to enable
-;   webassembly support (used for zlib compression). You can remove it if Chrome
-;   doesn't need to be supported and old browsers don't need to be warned.
-; cspheader = "default-src 'none'; base-uri 'self'; form-action 'none'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'unsafe-eval'; style-src 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads"
-
-; stay compatible with PrivateBin Alpha 0.19, less secure
-; if enabled will use base64.js version 1.7 instead of 2.1.9 and sha1 instead of
-; sha256 in HMAC for the deletion token
-; zerobincompatibility = false
+; - The 'wasm-unsafe-eval' is used to enable webassembly support (used for zlib
+;   compression). You can remove it if compression doesn't need to be supported.
+; - The 'unsafe-inline' style-src is used by Chrome when displaying PDF previews
+;   and can be omitted if attachment upload is disabled (which is the default).
+;   See https://issues.chromium.org/issues/343754409
+; - To allow displaying PDF previews in Firefox or Chrome, sandboxing must also
+;   get turned off. The following CSP allows PDF previews:
+; cspheader = "default-src 'none'; base-uri 'self'; form-action 'none'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'wasm-unsafe-eval'; style-src 'self' 'unsafe-inline'; font-src 'self'; frame-ancestors 'none'; frame-src blob:; img-src 'self' data: blob:; media-src blob:; object-src blob:"
+;
+; The recommended and default used CSP is:
+; cspheader = "default-src 'none'; base-uri 'self'; form-action 'none'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'wasm-unsafe-eval'; style-src 'self'; font-src 'self'; frame-ancestors 'none'; frame-src blob:; img-src 'self' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-modals allow-downloads"

 ; Enable or disable the warning message when the site is served over an insecure
 ; connection (insecure HTTP instead of HTTPS), defaults to true.
@@ -119,7 +134,7 @@ languageselection = false
 ; See https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-it-show-me-an-error-about-an-insecure-connection for more information.
 ; httpwarning = true

-; Pick compression algorithm or disable it. Only applies to pastes/comments
+; Pick compression algorithm or disable it. Only applies to documents & comments
 ; created after changing the setting.
 ; Can be set to one these values: "none" / "zlib" (default).
 ; compression = "zlib"
@@ -160,9 +175,9 @@ limit = 10
 ; exempted = "1.2.3.4,10.10.10/24"

 ; (optional) If you want only some source IP addresses (v4 or v6) or subnets
-; (CIDR) to be allowed to create pastes, set these here. Invalid IPs will be
+; (CIDR) to be allowed to create documents, set these here. Invalid IPs will be
 ; ignored. If multiple values are to be exempted, the list needs to be comma
-; separated. Leave unset to allow anyone to create pastes.
+; separated. Leave unset to allow anyone to create documents.
 ; creators = "1.2.3.4,10.10.10/24"

 ; (optional) if your website runs behind a reverse proxy or load balancer,
@@ -170,12 +185,12 @@ limit = 10
 ; header = "X_FORWARDED_FOR"

 [purge]
-; minimum time limit between two purgings of expired pastes, it is only
-; triggered when pastes are created
-; Set this to 0 to run a purge every time a paste is created.
+; minimum time limit between two purgings of expired documents, it is only
+; checked when documents get created
+; Set this to 0 to run a purge every time a document is created.
 limit = 300

-; maximum amount of expired pastes to delete in one purge
+; maximum amount of expired documents to delete in one purge
 ; Set this to 0 to disable purging. Set it higher, if you are running a large
 ; site
 batchsize = 10
@@ -259,7 +274,7 @@ dir = PATH "data"
 ;version = "latest"
 ;bucket = "my-bucket"

-[yourls]
+;[yourls]
 ; When using YOURLS as a "urlshortener" config item:
 ; - By default, "urlshortener" will point to the YOURLS API URL, with or without
 ;   credentials, and will be visible in public on the PrivateBin web page.
@@ -280,4 +295,4 @@ dir = PATH "data"
 ; Subresource integrity (SRI) hashes used in template files. Uncomment and set
 ; these for all js files used. See:
 ; https://github.com/PrivateBin/PrivateBin/wiki/FAQ#user-content-how-to-make-privatebin-work-when-i-have-changed-some-javascript-files
-;privatebin.js = sha512-[…]
+;js/privatebin.js = "sha512-[…]"
--- a/infrastructure/services/privatebin/docker-compose.privatebin.yml
+++ b/infrastructure/services/privatebin/docker-compose.privatebin.yml
@@ -10,7 +10,7 @@ services:
      - caddy
    volumes:
      - privatebin_data:/srv/data
-      - ./privatebin/config/conf.php:/srv/cfg/conf.php:ro
+      - ./config/conf.php:/srv/cfg/conf.php:ro
    networks:
      - infra-network
    security_opt:
--- a/infrastructure/services/projectsend/docker-compose.projectsend.yml
+++ b/infrastructure/services/projectsend/docker-compose.projectsend.yml
@@ -9,7 +9,7 @@ services:
    depends_on:
      - caddy
    env_file:
-      - ./projectsend/env/projectsend.env
+      - ./env/projectsend.env
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
      - projectsend_config:/config
@@ -34,7 +34,7 @@ services:
    volumes:
      - projectsend_db:/var/lib/mysql:rw
    env_file:
-      - ./projectsend/env/projectsend_db.env
+      - ./env/projectsend_db.env
    command: '--default-authentication-plugin=mysql_native_password'
    networks:
      - infra-network
--- a/infrastructure/services/projectsend/env/projectsend.env
+++ b/infrastructure/services/projectsend/env/projectsend.env
--- a/infrastructure/services/projectsend/env/projectsend_db.env
+++ b/infrastructure/services/projectsend/env/projectsend_db.env
--- a/infrastructure/services/psitransfer/docker-compose.psitransfer.yml
+++ b/infrastructure/services/psitransfer/docker-compose.psitransfer.yml
@@ -10,7 +10,7 @@ services:
    depends_on:
      - caddy
    env_file:
-      - ./psitransfer/env/psitransfer.env
+      - ./env/psitransfer.env
    volumes:
      - psitransfer_data:/data
    networks:
--- a/infrastructure/services/psitransfer/env/psitransfer.env
+++ b/infrastructure/services/psitransfer/env/psitransfer.env
--- a/infrastructure/services/qbittorrent/docker-compose.qbittorrent.yml
+++ b/infrastructure/services/qbittorrent/docker-compose.qbittorrent.yml
@@ -9,13 +9,17 @@ services:
    depends_on:
      - caddy
    env_file:
-      - ./qbittorrent/env/qbittorrent.env
+      - ./env/qbittorrent.env
    environment:
      - PUID=${PUID:-1000}
      - PGID=${PGID:-1000}
+    ports:
+      - 6881:6881
+      - 6881:6881/udp
    volumes:
      - qbittorrent_config:/config
      - public_data:/downloads
+      - private_data:/private_downloads
    networks:
      - infra-network
    security_opt:
--- a/infrastructure/services/qbittorrent/env/qbittorrent.env
+++ b/infrastructure/services/qbittorrent/env/qbittorrent.env
@@ -0,0 +1,5 @@
+TZ=Etc/UTC
+WEBUI_PORT=8080
+TORRENTING_PORT=6881
+# Use alternative WebUI: /vuetorrent
+DOCKER_MODS=ghcr.io/vuetorrent/vuetorrent-lsio-mod:latest
--- a/infrastructure/services/satisfactory-server
+++ b/infrastructure/services/satisfactory-server
--- a/infrastructure/services/stirlingpdf/docker-compose.stirlingpdf.yml
+++ b/infrastructure/services/stirlingpdf/docker-compose.stirlingpdf.yml
@@ -9,7 +9,7 @@ services:
    depends_on:
      - caddy
    env_file:
-      - ./stirlingpdf/env/stirlingpdf.env
+      - ./env/stirlingpdf.env
    volumes:
      - stirlingpdf_config:/configs
      - stirlingpdf_tessdata:/usr/share/tessdata
--- a/infrastructure/services/stirlingpdf/env/stirlingpdf.env
+++ b/infrastructure/services/stirlingpdf/env/stirlingpdf.env
--- a/infrastructure/services/syncthing/docker-compose.syncthing.yml
+++ b/infrastructure/services/syncthing/docker-compose.syncthing.yml
@@ -9,7 +9,7 @@ services:
      - caddy
    restart: on-failure:5
    env_file:
-      - ./syncthing/env/syncthing.env
+      - ./env/syncthing.env
    environment:
      - PUID=${PUID:-1000}
      - PGID=${PGID:-1000}
--- a/infrastructure/services/syncthing/env/syncthing.env
+++ b/infrastructure/services/syncthing/env/syncthing.env
--- a/infrastructure/services/teamfortress2-server/DockerCompose.mk
+++ b/infrastructure/services/teamfortress2-server/DockerCompose.mk
@@ -0,0 +1,85 @@
+#//////////////////////////////////////////////////////////////
+#//                                                          //
+#//  docker-multimedia, 2024                                 //
+#//  Created: 30, May, 2021                                  //
+#//  Modified: 14 November, 2024                             //
+#//  file: -                                                 //
+#//  -                                                       //
+#//  Source:                                                 //
+#//  OS: ALL                                                 //
+#//  CPU: ALL                                                //
+#//                                                          //
+#//////////////////////////////////////////////////////////////
+
+PROJECT_DIRECTORY ?= infrastructure
+
+DOCKER_EXEC ?= docker
+
+DOCKER_PROFILES ?= main_infrastructure
+
+PROFILE_CMD ?= $(addprefix --profile ,$(DOCKER_PROFILES))
+
+COMPOSE_FILES ?=  $(shell find ./$(PROJECT_DIRECTORY) -maxdepth 1 -name 'docker-compose*.yml' -type f | sed -e 's/^/--file /')
+COMPOSE_DIR ?= --project-directory ./$(PROJECT_DIRECTORY)
+
+UID ?= 1000
+GID ?= 1000
+
+ENV_ARG_VAR ?= PUID=$(UID) PGID=$(GID)
+
+DOCKER_COMPOSE_COMMAND ?= $(ENV_ARG_VAR) $(DOCKER_EXEC) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD)
+
+.PHONY: build all
+all: start
+
+.PHONY: build
+build:
+	$(DOCKER_COMPOSE_COMMAND) build
+
+.PHONY: start
+start:
+	$(DOCKER_COMPOSE_COMMAND) up -d
+
+.PHONY: start-at
+start-at:
+	$(DOCKER_COMPOSE_COMMAND) up
+
+.PHONY: docker-check
+docker-check:
+	$(DOCKER_COMPOSE_COMMAND) config
+
+.PHONY: stop
+stop: down
+
+.PHONY: down
+down:
+	$(DOCKER_COMPOSE_COMMAND) down
+
+.PHONY: restart
+restart: stop start
+
+.PHONY: logs
+logs:
+	$(DOCKER_COMPOSE_COMMAND) logs
+
+.PHONY: state
+state:
+	$(DOCKER_COMPOSE_COMMAND) ps
+	$(DOCKER_COMPOSE_COMMAND) top
+
+.PHONY: update-docker
+update-docker:
+	$(DOCKER_COMPOSE_COMMAND) pull
+
+.PHONY: update
+update: update-docker
+#	git submodule update --init --recursive --remote
+	git pull --recurse-submodules --all --progress
+
+.PHONY: clean
+clean:
+	docker system prune -f
+
+.PHONY: purge
+purge:
+	$(ENV_ARG_VAR) $(DOCKER_EXEC) compose $(COMPOSE_DIR) $(COMPOSE_FILES) down -v --rmi all
--- a/infrastructure/services/teamfortress2-server/Makefile
+++ b/infrastructure/services/teamfortress2-server/Makefile
@@ -0,0 +1,18 @@
+#//////////////////////////////////////////////////////////////
+#//                                                          //
+#//  Script, 2022                                            //
+#//  Created: 14, April, 2022                                //
+#//  Modified: 30, November, 2024                            //
+#//  file: -                                                 //
+#//  -                                                       //
+#//  Source:                                                 //
+#//  OS: ALL                                                 //
+#//  CPU: ALL                                                //
+#//                                                          //
+#//////////////////////////////////////////////////////////////
+
+PROJECT_DIRECTORY := teamfortress2-server
+
+DOCKER_PROFILES := team_fortress_server team_fortress_backup
+
+include DockerCompose.mk
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bensuperpc	bf80b3a405	Remove Gitea Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-10-18 23:08:12 +02:00
Bensuperpc	5dea9bf9cf	Move presets Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-10-18 22:35:37 +02:00
Bensuperpc	91ed7ef60f	Update submodule Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-10-14 19:39:16 +02:00
Bensuperpc	876e35b736	Add config files and optimize Makefile Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-10-06 23:32:48 +02:00
Bensuperpc	dcdf02e3ce	Merge pull request #2 from bensuperpc/dependabot/github_actions/actions/checkout-5 Bump actions/checkout from 4 to 5	2025-10-06 21:35:57 +02:00
Bensuperpc	ad3fb75871	Update qbittorrent webui Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-09-17 23:12:44 +02:00
Bensuperpc	6e447b865b	Update 7daystodie Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-09-17 23:12:19 +02:00
Bensuperpc	897be921a6	Fix HTTP3 caddy, update TF2 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-09-08 00:07:41 +02:00
Bensuperpc	d8d00cbd24	Add Teamfortress 2 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-09-01 22:36:21 +02:00
Bensuperpc	6b39245125	Update Forgejo to rootless image Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-08-24 20:09:28 +02:00
Bensuperpc	f48cbcc522	Add cyberchef and update config Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-08-22 23:44:57 +02:00
Bensuperpc	36e57c4a47	Fix Rsync/SSH transfert speed	2025-08-16 00:53:47 +02:00
Bensuperpc	31596675b9	Fix Caddy config, update Makefile	2025-08-15 22:52:05 +02:00
dependabot[bot]	183c181c8f	Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [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/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-12 06:52:35 +00:00
Bensuperpc	2b902e54be	Update caddy config Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-08-06 14:01:14 +02:00
Bensuperpc	fcd4dc85bc	Update caddy Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-07-19 21:02:21 +02:00
Bensuperpc	840c6fa5b5	Update Makefile Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-07-14 15:51:30 +02:00
Bensuperpc	628c6fe906	Add tools and fix deps Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-07-07 23:38:20 +02:00
Bensuperpc	19a6c49949	Update minecraft-server Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-07-03 00:17:45 +02:00
Bensuperpc	045d142e27	Update readme Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-07-01 22:24:44 +02:00
Bensuperpc	e5e13b11e8	Update readme and Caddy	2025-06-30 23:17:40 +02:00
Bensuperpc	736959c540	Improve forgejo	2025-06-30 00:01:37 +02:00
Bensuperpc	e942d364fe	Improve Forgejo	2025-06-29 20:58:20 +02:00
Bensuperpc	c7b7ce8585	Forgejo	2025-06-29 13:42:09 +02:00
Bensuperpc	2d268629b5	Update scripts	2025-06-22 11:35:04 +02:00
Bensuperpc	ccc7f82f0a	Update Minecraft server	2025-04-25 23:01:37 +02:00
Bensuperpc	49af326783	Add omni-tools	2025-04-24 23:48:06 +02:00
Bensuperpc	d6d8fedc11	Update config	2025-04-22 23:22:37 +02:00
Bensuperpc	22f4237b49	Update submodule	2025-03-22 11:19:52 +01:00
Bensuperpc	81c1188014	Update homepage	2025-02-05 21:00:27 +01:00
Bensuperpc	ee2ed9273a	Update volumes's names	2025-02-03 22:42:12 +01:00
Bensuperpc	14ca102a0f	Move services Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-02-02 13:15:46 +01:00
Bensuperpc	4fc62cb648	Fix DL open-webui model Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-02-02 12:27:39 +01:00
Bensuperpc	e7e544e774	Fix readme Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-02-02 01:11:10 +01:00
Bensuperpc	e5472d4abb	Fix wrong container for homepage Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-02-02 01:08:50 +01:00
Bensuperpc	f90b8301bd	Simplify docker-compose include Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-02-02 01:01:24 +01:00
Bensuperpc	970aad479c	Add satisfactory Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-02-02 00:53:06 +01:00
Bensuperpc	81c81a5d83	Add open-webui and improve readme Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-02-01 02:32:58 +01:00
Bensuperpc	7595072298	Add working 7 days to die Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-29 00:13:51 +01:00
Bensuperpc	ec5cb3c38c	Add 7 days to die Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-28 23:10:27 +01:00
Bensuperpc	591eb61c40	Update submodule Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-27 08:13:24 +01:00
Bensuperpc	b486ac3d0d	Add working minecraft server Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-26 19:15:42 +01:00
Bensuperpc	d111652a1c	Update Mincraft server Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-26 17:02:35 +01:00
Bensuperpc	18db276b49	Add Mincraft server Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-26 17:00:47 +01:00
Bensuperpc	4c910bdf2e	Update diagram Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-26 16:53:00 +01:00
Bensuperpc	2fbbba051f	Fix makefile Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-26 13:05:31 +01:00
Bensuperpc	9a6ac97872	Add demos Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-26 09:30:49 +01:00
Bensuperpc	951d1130b0	Remove adminer Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-24 22:52:50 +01:00
Bensuperpc	3b4c3cb54c	Improve docker-compose Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-19 21:08:53 +01:00
Bensuperpc	3bdcd4d459	Update makefile template Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-01-19 15:20:16 +01:00