Fix Rsync/SSH transfert speed

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

.github/workflows/main.yml

@@ -26,8 +26,10 @@ jobs:
         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"

.gitignore

@@ -1 +1,2 @@
 
+/*.tar.gz

.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

DockerCompose.mk

@@ -0,0 +1,96 @@
+#//////////////////////////////////////////////////////////////
+#//                                                          //
+#//  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: no-start
+no-start:
+	$(DOCKER_COMPOSE_COMMAND) up --no-start
+
+.PHONY: check
+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: volumes
+volumes:
+	$(DOCKER_COMPOSE_COMMAND) config --volumes
+
+.PHONY: image-update
+image-update:
+	$(DOCKER_COMPOSE_COMMAND) pull
+
+.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

Makefile

@@ -1,8 +1,8 @@
 #//////////////////////////////////////////////////////////////
 #//                                                          //
-#//  Infrastructure, 2024                                    //
+#//  Script, 2022                                            //
 #//  Created: 14, April, 2022                                //
-#//  Modified: 05, May, 2024                                 //
+#//  Modified: 30, November, 2024                            //
 #//  file: -                                                 //
 #//  -                                                       //
 #//  Source:                                                 //
@@ -11,73 +11,25 @@
 #//                                                          //
 #//////////////////////////////////////////////////////////////
 
-DOCKER := docker
+ADMIN_SERVICES := openssh uptime-kuma yacht
-
+BLOG_SERVICES := wordpress
+#7DAYS_TO_DIE_SERVICES := 7daystodie_server 7daystodie_backup
+#MINECRAFT_SERVICES := minecraft_server minecraft_backup
+#SATISFACTORY_SERVICES := satisfactory_server satisfactory_backup
+GIT_SERVICES := forgejo
+# forgejo-runner
+# gitea gitea-runner
+IA_SERVICES := open-webui
+SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs syncthing
 TORRENTS_SERVICES := qbittorrent transmission
-SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs
+UTILS_SERVICES := it-tools stirlingpdf omni-tools
-ADMIN_SERVICES := yacht uptime-kuma adminer
+MAIN_SERVICES := main_infrastructure caddy homepage
-UTILS_SERVICES := it-tools stirlingpdf
 
-PROFILES := caddy wordpress syncthing gitea homepage $(SHARING_SERVICES) $(TORRENTS_SERVICES) $(ADMIN_SERVICES) $(UTILS_SERVICES)
+PROJECT_DIRECTORY := infrastructure
-PROFILE_CMD := $(addprefix --profile ,$(PROFILES))
 
-# gitea-runner
+DOCKER_PROFILES := $(MAIN_SERVICES) $(ADMIN_SERVICES) $(BLOG_SERVICES) \
+	$(7DAYS_TO_DIE_SERVICES) $(MINECRAFT_SERVICES) $(SATISFACTORY_SERVICES) \
+	$(GIT_SERVICES) $(IA_SERVICES) $(SHARING_SERVICES) \
+	$(TORRENTS_SERVICES) $(UTILS_SERVICES)
 
-COMPOSE_FILES :=  $(shell find . -name 'docker-compose*.yml' -type f | sed -e 's/^/--file /')
+include DockerCompose.mk
-
-COMPOSE_DIR := --project-directory ./infrastructure
-
-.PHONY: build all
-all: start
-
-.PHONY: build
-build:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) build
-
-.PHONY: start
-start:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up -d
-
-.PHONY: start-at
-start-at:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up
-
-.PHONY: docker-check
-docker-check:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) config
-
-.PHONY: stop
-stop: down
-
-.PHONY: down
-down:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down
-
-.PHONY: restart
-restart: stop start
-
-.PHONY: logs
-logs:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) logs
-
-.PHONY: state
-state:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) ps
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) top
-
-.PHONY: update-docker
-update-docker:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) pull
-
-.PHONY: update
-update: update-docker
-	git submodule update --init --recursive --remote
-	git pull --recurse-submodules --all --progress
-
-.PHONY: clean
-clean:
-	$(DOCKER) images --filter=reference='bensuperpc/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
-
-.PHONY: purge
-purge:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down -v --rmi all

README.md

@@ -10,23 +10,34 @@ If you have any **questions** or **suggestions**, feel free to open an issue or
 
 ## Features
 
-- [x] caddy 2 reverse proxy
+- [x] caddy 2 HTTP/S reverse proxy
 - [x] Docker / docker-compose
-- [x] Caddy
 - [x] Wordpress (Via FASTCGI/caddy)
-- [x] Adminer (MariaDB)
 - [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 (File sharing)
+- [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)
+- [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
+
+![Architecture](ressources/arch_infra.png)
 
 ## Screenshots
 
+The homepage is a dashboard with many widgets and services.
+
+![Homepage](ressources/homepagev1.jpg)
+
 ## Installation and configuration
 
 ### Requirements
@@ -35,9 +46,26 @@ If you have any **questions** or **suggestions**, feel free to open an issue or
 - [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 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 |
+| 5555        | Gitea         | Git/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
 
@@ -53,6 +81,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...
@@ -61,33 +91,36 @@ 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 |
+| Domain name                                                        | Type | Description                                                  |
-| --- | --- | --- |
+| ------------------------------------------------------------------ | ---- | ------------------------------------------------------------ |
-| [www.bensuperpc.org](https://www.bensuperpc.org) | Main | Homepage |
+| [bensuperpc.org](https://bensuperpc.org)                           | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
-| [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org) | Sub | Wordpress website |
+| [www.bensuperpc.org](https://www.bensuperpc.org)                   | Main | Homepage                                                     |
-| [adminer.bensuperpc.org](https://adminer.bensuperpc.org) | Sub | Adminer for MariaDB for wordpress only |
+| [open-webui.bensuperpc.org](https://open-webui.bensuperpc.org)     | Sub  | For local chatGPT                                            |
-| [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | Sub | Uptime Kuma for monitoring |
+| [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org)       | Sub  | Wordpress website                                            |
-| [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server |
+| [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org)     | Sub  | Uptime Kuma for monitoring                                   |
-| [transmission.bensuperpc.org](https://transmission.bensuperpc.org) | Sub | Torrent client/server |
+| [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org)   | Sub  | Torrent client/server                                        |
-| [git.bensuperpc.org](https://git.bensuperpc.org) | Sub | Gitea for git |
+| [transmission.bensuperpc.org](https://transmission.bensuperpc.org) | Sub  | Torrent client/server                                        |
-| [link.bensuperpc.org](https://link.bensuperpc.org) | Sub | For link shortener |
+| [gitea.bensuperpc.org](https://gitea.bensuperpc.org)               | Sub  | Gitea for git                                                |
-| [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org) | Sub | Jellyfin for media server |
+| [forgejo.bensuperpc.org](https://forgejo.bensuperpc.org/)          | Sub  | Fork of Gitea for git                                        |
-| [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) | Sub | SyncThing for file synchronization |
+| [git.bensuperpc.org](https://git.bensuperpc.org)                   | Sub  | Fork of Gitea for git                                        |
-| [psitransfer.bensuperpc.org](https://psitransfer.bensuperpc.org) | Sub | PsiTransfer for file sharing |
+| [link.bensuperpc.org](https://link.bensuperpc.org)                 | Sub  | For link shortener                                           |
-| [it-tools.bensuperpc.org](https://it-tools.bensuperpc.org) | Sub | Tools for IT |
+| [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org)         | Sub  | Jellyfin for media server                                    |
-| [privatebin.bensuperpc.org](https://privatebin.bensuperpc.org) | Sub | Pastebin |
+| [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org)       | Sub  | SyncThing for file synchronization                           |
-| [yacht.bensuperpc.org](https://yacht.bensuperpc.org) | Sub | Web interface for managing docker containers |
+| [psitransfer.bensuperpc.org](https://psitransfer.bensuperpc.org)   | Sub  | PsiTransfer for file sharing                                 |
-| [projectsend.bensuperpc.org](https://projectsend.bensuperpc.org) | Sub | ProjectSend for file sharing |
+| [it-tools.bensuperpc.org](https://it-tools.bensuperpc.org)         | Sub  | Tools for IT                                                 |
-| [picoshare.bensuperpc.org](https://picoshare.bensuperpc.org) | Sub | Picoshare for file sharing |
+| [omni-tools.bensuperpc.org](https://omni-tools.bensuperpc.org)     | Sub  | Tools for IT                                                 |
-| [dufs.bensuperpc.org](https://dufs.bensuperpc.org) | Sub | Dufs for file sharing |
+| [privatebin.bensuperpc.org](https://privatebin.bensuperpc.org)     | Sub  | Pastebin                                                     |
-| bensuperpc.com | Main | Redirect to bensuperpc.org |
+| [yacht.bensuperpc.org](https://yacht.bensuperpc.org)               | Sub  | Web interface for managing docker containers                 |
-| bensuperpc.fr | Main | Redirect to bensuperpc.org |
+| [projectsend.bensuperpc.org](https://projectsend.bensuperpc.org)   | Sub  | ProjectSend for file sharing                                 |
-| bensuperpc.net | Main | Redirect to bensuperpc.org |
+| [picoshare.bensuperpc.org](https://picoshare.bensuperpc.org)       | Sub  | Picoshare for file sharing                                   |
-| bensuperpc.ovh | Main | Redirect to bensuperpc.org |
+| [dufs.bensuperpc.org](https://dufs.bensuperpc.org)                 | Sub  | Dufs for file sharing                                        |
+| [public.bensuperpc.org](https://public.bensuperpc.org)             | Sub  | Caddy 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
 
@@ -99,93 +132,98 @@ You can generate a password with 32 characters:
 openssl rand -base64 32
 ```
 
-For the [wordpress.env](infrastructure/wordpress/env/wordpress.env) file, you need to change the password and user for the database.
+Or online: [passwordsgenerator.net](https://passwordsgenerator.net/)
+
+#### Caddy
+
+For [caddy_backup.env](infrastructure/services/caddy/env/caddy_backup.env) file, you need to change the password(s) for the restic backup.
+
+```sh
+RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
+```
+
+#### 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
-WORDPRESS_DB_NAME=wordpress
-WORDPRESS_DB_HOST=wordpress_db:3306
 ```
 
-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
-MARIADB_DATABASE=wordpress
 ```
 
-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.
+#### Gitea
+
+For [gitea.env](infrastructure/services/gitea/env/gitea.env) file, you need to change the password(s) and user for the database.
 
 ```sh
-MYSQL_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-MYSQL_USER=bensuperpc
-MYSQL_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
-ADMINER_DEFAULT_SERVER=wordpress_db
-```
-
-For [gitea.env](infrastructure/gitea/env/gitea.env) file, you need to change the password(s) and user for the database.
-
-```sh
-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
 ```
 
-For [gitea_db.env](infrastructure/gitea/env/gitea_db.env) file, you need to change the password(s) and user for the database.
+For [gitea_db.env](infrastructure/services/gitea/env/gitea_db.env) file, you need to change the password(s) and user for the database.
 
 ```sh
-MYSQL_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
+MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
-MYSQL_USER=bensuperpc
+MARIADB_USER=bensuperpc
-MYSQL_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
+MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-MYSQL_DATABASE=gitea
 ```
 
-For [psitransfer.env](infrastructure/psitransfer/env/psitransfer.env) file, you need to change the secret key.
+#### PsiTransfer
+
+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.
+For [yacht.env](infrastructure/services/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
 MARIADB_USER=bensuperpc
 MARIADB_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
-MARIADB_DATABASE=projectsend
 ```
 
-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|@/"
+DUFS_AUTH="admin:heqihlOfBmJDESGFlpbPi7P7Mi6F7RkV@/:rw|@/:ro"
 ```
 
+#### Stirling PDF
 
-For [stirlingpdf.env](infrastructure/stirlingpdf/env/stirlingpdf.env) file, it's **completly optional**, you can change the password(s) and user.
+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
@@ -197,6 +235,32 @@ SECURITY_INITIALLOGIN_USERNAME=admin
 SECURITY_INITIALLOGIN_PASSWORD=Jw9U039f5xc2mFcacvGvPD9RjwIh4DzO
 ```
 
+#### OpenSSH
+
+You can need to add/change the public ssh key [id_ed25519.pub](infrastructure/services/openssh/config/authorized_keys/id_ed25519.pub) (its my public key), also change the config/password in [openssh.env](infrastructure/services/openssh/env/openssh.env):
+
+```sh
+SUDO_ACCESS=true
+#PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
+PUBLIC_KEY_DIR=/authorized_ssh_keys
+USER_PASSWORD=rdUwf36C11PLmpU9Lvq7tP5pfFBKAuCh
+
+#PUBLIC_KEY=yourpublickey
+#PUBLIC_KEY_FILE=/path/to/file
+#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
+#USER_PASSWORD_FILE=/path/to/file
+```
+
+#### Open-WebUI
+
+For [open-webui.env](infrastructure/services/open-webui/env/open-webui.env) file, entirely optional.
+
+To download the model, you can use:
+
+```sh
+docker exec -it ollama ollama run deepseek-r1:8b
+```
+
 ### Start the infrastructure
 
 Start the website with:
@@ -217,32 +281,77 @@ Remove countainers with:
 make down
 ```
 
-### All services
-
-You can find all service on this table:
-
-| Service | Description | URL |
-| --- | --- | --- |
-| Homepage | Homepage | [www.bensuperpc.org](https://www.bensuperpc.org) |
-| Wordpress | Wordpress website | [wordpress.bensuperpc.org](https://bensuperpc.org) |
-| Adminer | Adminer for MariaDB | [adminer.bensuperpc.org](https://adminer.bensuperpc.org) |
-| Uptime Kuma | Uptime Kuma for monitoring | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) |
-| qbittorrent | qbittorrent server | [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) |
-| transmission | transmission server | [transmission.bensuperpc.org](https://transmission.bensuperpc.org) |
-| Gitea | Gitea for git | [git.bensuperpc.org](https://git.bensuperpc.org) |
-| Jellyfin | Jellyfin for media server | [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org) |
-| SyncThing | SyncThing for file synchronization | [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) |
-| PsiTransfer | PsiTransfer for file sharing | [psitransfer.bensuperpc.org](https://psitransfer.bensuperpc.org) |
-| it-tools | Tools for IT | [it-tools.bensuperpc.org](https://it-tools.bensuperpc.org) |
-| Privatebin | Pastebin | [privatebin.bensuperpc.org](https://privatebin.bensuperpc.org) |
-| Yacht | Web interface for managing docker containers | [yacht.bensuperpc.org](https://yacht.bensuperpc.org) |
-| ProjectSend | ProjectSend for file sharing | [projectsend.bensuperpc.org](https://projectsend.bensuperpc.org) |
-| Picoshare | Picoshare for file sharing | [picoshare.bensuperpc.org](https://picoshare.bensuperpc.org) |
-| Dufs | Dufs for file sharing | [dufs.bensuperpc.org](https://dufs.bensuperpc.org) |
-
 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/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
+
+```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                                                                                               |
+
+### SSH access
+
+The default port for ssh/rsync is is 2222.
+
+You can access to the server with:
+
+```sh
+ssh -p 2222 admin@bensuperpc.org
+```
 
 ## Sources
 
@@ -267,6 +376,7 @@ To enable the gitea CI: https://medium.com/@lokanx/how-to-build-docker-container
 - [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/)
@@ -274,6 +384,12 @@ To enable the gitea CI: https://medium.com/@lokanx/how-to-build-docker-container
 - [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
 

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/*

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

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

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

infrastructure/caddy/config/bensuperpc.org/Caddyfile

@@ -1,165 +0,0 @@
-www.bensuperpc.org {
-	reverse_proxy homepage:3000
-}
-
-bensuperpc.org {
-	redir https://www.bensuperpc.org permanent
-}
-
-homepage.bensuperpc.org {
-	redir https://www.bensuperpc.org{uri} permanent
-}
-
-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
-}

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

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
+# Gitea
+  - services/gitea/docker-compose.gitea.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
+# 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
+# Yacht
+  - services/yacht/docker-compose.yacht.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

infrastructure/gitea/env/gitea_db.env

@@ -1,4 +0,0 @@
-MYSQL_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
-MYSQL_USER=bensuperpc
-MYSQL_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-MYSQL_DATABASE=gitea

infrastructure/homepage/config/widgets.yaml

@@ -1,19 +0,0 @@
----
-# For configuration options and examples, please see:
-# https://gethomepage.dev/latest/configs/service-widgets
-
-- resources:
-    cpu: true
-    memory: true
-    disk: /
-
-- search:
-    provider: duckduckgo
-    target: _blank
-
-- datetime:
-    text_size: xl
-    locale: fr
-    format:
-        timeStyle: long
-        dateStyle: long

infrastructure/jellyfin/docker-compose.jellyfin.yml

@@ -1,44 +0,0 @@
-services:
-  # Jellyfin
-  jellyfin:
-    image: jellyfin/jellyfin:latest
-    container_name: jellyfin
-    profiles:
-      - jellyfin
-    restart: on-failure:5
-    user: 1000:1000
-    depends_on:
-      - caddy
-    env_file:
-      - ./jellyfin/env/jellyfin.env
-    volumes:
-      - jellyfin_config:/config
-      - jellyfin_data_movies:/movies:rw
-      - jellyfin_data_series:/series:rw
-      - jellyfin_data_documentaries:/documentaries:rw
-      - jellyfin_data_musics:/musics:rw
-      - public_data:/public:rw
-      - jellyfin_cache:/cache
-    # Hardware acceleration (For Intel and AMD GPUs)
-    devices:
-      - /dev/dri:/dev/dri
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-
-volumes:
-  jellyfin_config:
-    name: jellyfin_config
-  jellyfin_data_movies:
-    name: jellyfin_data_movies
-  jellyfin_data_series:
-    name: jellyfin_data_series
-  jellyfin_data_documentaries:
-    name: jellyfin_data_documentaries
-  jellyfin_data_musics:
-    name: jellyfin_data_musics
-  public_data:
-    name: public_data
-  jellyfin_cache:
-    name: jellyfin_cache

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/*

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

@@ -0,0 +1,3 @@
+dufs.{$MAIN_DOMAIN} {
+	reverse_proxy dufs:5000
+}

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
+}

infrastructure/services/caddy/config/website/gitea.caddy

@@ -0,0 +1,3 @@
+gitea.{$MAIN_DOMAIN} {
+	reverse_proxy gitea:3000
+}

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
+}

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

@@ -0,0 +1,3 @@
+homepage.{$MAIN_DOMAIN} {
+	reverse_proxy homepage:3000
+}

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:80 it-tools1:80
+		lb_policy round_robin
+		lb_retries 3
+		lb_try_interval 1s
+	}
+}

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

@@ -0,0 +1,3 @@
+jellyfin.{$MAIN_DOMAIN} {
+	reverse_proxy jellyfin:8096
+}

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
+	}
+}

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

@@ -0,0 +1,3 @@
+memos.{$MAIN_DOMAIN} {
+	reverse_proxy memos:5230
+}

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
+	}
+}

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

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

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

@@ -0,0 +1,3 @@
+picoshare.{$MAIN_DOMAIN} {
+	reverse_proxy picoshare:4001
+}

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
+}

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

@@ -0,0 +1,3 @@
+projectsend.{$MAIN_DOMAIN} {
+	reverse_proxy projectsend:80
+}

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
+}

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

@@ -0,0 +1,7 @@
+torrent.{$MAIN_DOMAIN} {
+	reverse_proxy qbittorrent:8080
+}
+
+qbittorrent.{$MAIN_DOMAIN} {
+	redir https://torrent.{$MAIN_DOMAIN} permanent
+}

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

@@ -0,0 +1,3 @@
+stirlingpdf.{$MAIN_DOMAIN} {
+	reverse_proxy stirlingpdf:8080
+}

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

@@ -0,0 +1,5 @@
+syncthing.{$MAIN_DOMAIN} {
+	reverse_proxy syncthing:8384 {
+		header_up Host {upstream_hostport}
+	}
+}

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

@@ -0,0 +1,3 @@
+transmission.{$MAIN_DOMAIN} {
+	reverse_proxy transmission:9091
+}

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

@@ -0,0 +1,3 @@
+uptimekuma.{$MAIN_DOMAIN} {
+	reverse_proxy uptime-kuma:3001
+}

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=()"
+	}
+}

infrastructure/services/caddy/config/website/yacht.caddy

@@ -0,0 +1,3 @@
+yacht.{$MAIN_DOMAIN} {
+	reverse_proxy yacht:8000
+}

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

@@ -5,25 +5,26 @@ services:
     container_name: caddy
     profiles:
       - caddy
+    depends_on:
+      main_infrastructure:
+        condition: service_completed_successfully
     restart: on-failure:5
     ports:
       - 80:80
       - 443:443
     volumes:
-      - wordpress:/var/www/html:rw
       - 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
-    #cap_drop:
-    #  - ALL
-    cap_add:
-      - NET_ADMIN
     healthcheck:
       test: pidof caddy || exit 1
       interval: 120s
@@ -39,14 +40,15 @@ 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
-    networks:
+    network_mode: none
-      - infra-network
+    cap_drop:
-    security_opt:
+      - NET_ADMIN
-      - no-new-privileges:true
+      - NET_RAW
+      - SYS_ADMIN
 
 volumes:
   caddy_data:
@@ -55,8 +57,7 @@ volumes:
     name: caddy_config
   caddy_backup:
     name: caddy_backup
-
+  wordpress:
-networks:
+    name: wordpress
-  infra-network:
+  public_data:
-    driver: bridge
+    name: public_data
-    name: infra-network

infrastructure/services/caddy/env/caddy.env

@@ -0,0 +1,2 @@
+MAIN_DOMAIN=bensuperpc.org
+MAIL_DOMAIN=bensuperpc@gmail.com

infrastructure/services/caddy/env/caddy_backup.env

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

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

@@ -5,12 +5,12 @@ services:
     container_name: dufs
     profiles:
       - dufs
-    user: 1000:1000
+    user: ${PUID:-1000}:${PGID:-1000} 
     restart: on-failure:5
     depends_on:
       - caddy
     env_file:
-      - ./dufs/env/dufs.env
+      - ./env/dufs.env
     volumes:
       - public_data:/data
     networks:
@@ -21,3 +21,5 @@ services:
 volumes:
   public_data:
     name: public_data
+  private_data:
+    name: private_data

infrastructure/services/dufs/env/dufs.env

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

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

@@ -0,0 +1,95 @@
+services:
+  # forgejo
+  forgejo:
+    image: codeberg.org/forgejo/forgejo:11-rootless
+    container_name: forgejo
+    profiles:
+      - forgejo
+    restart: on-failure:5
+    depends_on:
+      - database_forgejo
+      - caddy
+    ports:
+      - "22:22"
+    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
+    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
+    privileged: true
+    environment:
+      DOCKER_TLS_CERTDIR: /certs
+      DOCKER_HOST: docker-in-docker
+    volumes:
+      - forgejo_certs:/certs
+
+  forgejo_runner:
+    image: 'code.forgejo.org/forgejo/runner:6.3.1'
+    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: 1001:1001
+    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

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=The Homelab Git
+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=22
+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

infrastructure/services/forgejo/env/forgejo_db.env

@@ -0,0 +1,4 @@
+MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
+MARIADB_DATABASE=forgejo

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

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

@@ -10,14 +10,14 @@ services:
       - database_gitea
       - caddy
     ports:
-      - "22:22"
+      - "5555:5555"
     env_file:
-      - ./gitea/env/gitea.env
+      - ./env/gitea.env
     volumes:
       - gitea_data:/var/lib/gitea
       - gitea_config:/etc/gitea
-#      - /etc/timezone:/etc/timezone:ro
+      - /etc/timezone:/etc/timezone:ro
-#      - /etc/localtime:/etc/localtime:ro
+      - /etc/localtime:/etc/localtime:ro
     networks:
       - infra-network
     security_opt:
@@ -28,13 +28,14 @@ services:
     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
+      - ./env/gitea_db.env
     command: '--default-authentication-plugin=mysql_native_password'
     networks:
       - infra-network
@@ -51,11 +52,11 @@ services:
       - gitea
     restart: on-failure:5
     env_file:
-      - ./gitea/env/gitea-runner.env
+      - ./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
+      - ./config/gitea_runner/config.yaml:/config.yaml:ro
     networks:
       - infra-network
     security_opt:

infrastructure/services/gitea/env/gitea.env

@@ -10,6 +10,6 @@ GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
 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_LISTEN_PORT=5555
-GITEA__server__SSH_PORT=22
+GITEA__server__SSH_PORT=5555
 GITEA__server__ROOT_URL=https://git.bensuperpc.org

infrastructure/services/gitea/env/gitea_db.env

@@ -0,0 +1,4 @@
+MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
+MARIADB_DATABASE=gitea

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:
@@ -21,6 +21,10 @@
         - abbr: BS
           href: https://bsky.app/profile/bensuperpc.bsky.social
           description: bsky.app
+    - Mastodon:
+        - abbr: MA
+          href: https://mastodon.social/@bensuperpc
+          description: mastodon.social
 
 - Entertainment:
     - YouTube:

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

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:
@@ -9,25 +9,19 @@
         description: Wordpress
         ping: wordpress.bensuperpc.org
         container: wordpress
-    - 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
-- Sharing:
     - jellyfin:
         icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/jellyfin.png
         href: https://jellyfin.bensuperpc.org/
         description: Jellyfin
         ping: jellyfin.bensuperpc.org
         container: jellyfin
+    - projectsend:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/projectsend.png
+        href: https://projectsend.bensuperpc.org/
+        description: ProjectSend
+        ping: projectsend.bensuperpc.org
+        container: projectsend
+- Sharing:
     - psitransfer:
         icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/psitransfer.png
         href: https://psitransfer.bensuperpc.org/
@@ -64,18 +58,18 @@
         description: Transmission
         ping: transmission.bensuperpc.org
         container: transmission
-    - projectsend:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/projectsend.png
-        href: https://projectsend.bensuperpc.org/
-        description: ProjectSend
-        ping: projectsend.bensuperpc.org
-        container: projectsend
     - dufs:
 #        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/dufs.png
         href: https://dufs.bensuperpc.org/
         description: Dufs
         ping: dufs.bensuperpc.org
         container: dufs
+    - caddy:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/caddy.png
+        href: https://public.bensuperpc.org/
+        description: File browser
+        ping: public.bensuperpc.org
+        container: caddy
 
 - Utils:
     - it-tools:
@@ -84,19 +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
     - 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
+    - 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:
@@ -110,12 +121,25 @@
 #        href: https://7dtd.bensuperpc.org/
         description: 7 Days to Die server
 #        ping: 7dtd.bensuperpc.org
-        container: 7dtd-server
+        container: 7daystodie_server
-- Others:
+    - satisfactory:
-    - gitea-runner:
+#        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/7dtd.png
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/gitea.png
+#        href: https://7dtd.bensuperpc.org/
-#        href: https://gitea.bensuperpc.org/
+        description: Satisfactory server
-        description: Gitea Runner
+#        ping: 7dtd.bensuperpc.org
-        ping: gitea.bensuperpc.org
+        container: satisfactory_server
-        container: gitea-runner
+
+- 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
 

infrastructure/services/homepage/config/settings.yaml

@@ -1,17 +1,19 @@
 ---
 # 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: /images/favicon.ico
+favicon: /image/favicon.ico
 
 logpath: /app/logs
 
 background: 
-  image: /images/electronic.jpg
+  image: /image/background.jpg
   blur: md
   opacity: 50
   brightness: 50
@@ -25,17 +27,13 @@ layout:
   Personal:
     style: row
     columns: 6
-  Media:
-    style: row
-    columns: 6
   Sharing:
     style: row
     columns: 6
-  Utils:
+  Admin:
     style: row
     columns: 6
-    initiallyCollapsed: false
+  Utils:
-  Others:
     style: row
     columns: 6
     initiallyCollapsed: false

infrastructure/services/homepage/config/widgets.yaml

@@ -0,0 +1,37 @@
+---
+# For configuration options and examples, please see:
+# https://gethomepage.dev/widgets/services/
+# https://gethomepage.dev/widgets/services/qbittorrent/
+
+#- logo:
+#    icon: /image/daisy.jpg
+
+- resources:
+    cpu: true
+    cputemp: true
+    memory: true
+    disk: /
+    uptime: true
+    refresh: 3000
+
+#- search:
+#    provider: duckduckgo
+#    target: _blank
+#    showSearchSuggestions: true
+
+- datetime:
+    text_size: xl
+    locale: fr
+    format:
+        timeStyle: short
+        dateStyle: short
+
+- openmeteo:
+    label: Nantes # optional
+    latitude: 47.216671
+    longitude: -1.55
+    timezone: Europe/Paris # optional
+    units: metric # or imperial
+    cache: 5 # Time in minutes to cache API responses, to stay within limits
+    format: # optional, Intl.NumberFormat options
+      maximumFractionDigits: 1

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

@@ -6,15 +6,23 @@ 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
+      - ./config:/app/config:ro
-      - ./homepage/image:/app/public/images:ro
+      - ./image:/app/public/image:ro
       - /var/run/docker.sock:/var/run/docker.sock:ro
+#    develop:
+#      watch:
+#        - action: sync+restart
+#          path: ./homepage/image
+#          target: /app/public/image
     networks:
       - infra-network
     security_opt:

infrastructure/services/homepage/env/homepage.env

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

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

@@ -10,9 +10,12 @@ services:
       - caddy
     networks:
       - infra-network
+    read_only: false
     security_opt:
       - no-new-privileges:true
-    read_only: false
+    cap_drop:
+      - SYS_ADMIN
+
     deploy:
       resources:
         limits:
@@ -21,6 +24,7 @@ services:
         reservations:
           cpus: '0.001'
           memory: 20M
+
   it-tools1:
     image: corentinth/it-tools:latest
     container_name: it-tools1
@@ -31,9 +35,12 @@ services:
       - caddy
     networks:
       - infra-network
+    read_only: false
     security_opt:
       - no-new-privileges:true
-    read_only: false
+    cap_drop:
+      - SYS_ADMIN
+
     deploy:
       resources:
         limits:

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

@@ -0,0 +1,37 @@
+services:
+  # Jellyfin
+  jellyfin:
+    image: lscr.io/linuxserver/jellyfin:latest
+    container_name: jellyfin
+    profiles:
+      - jellyfin
+    restart: on-failure:5
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
+    depends_on:
+      - caddy
+    env_file:
+      - ./env/jellyfin.env
+    volumes:
+      - jellyfin_config:/config
+      - jellyfin_cache:/cache
+      - public_data:/public
+      - private_data:/private
+    # Hardware acceleration (For Intel and AMD GPUs)
+    devices:
+      - /dev/dri:/dev/dri
+    networks:
+      - infra-network
+    security_opt:
+      - no-new-privileges:true
+
+volumes:
+  jellyfin_config:
+    name: jellyfin_config
+  jellyfin_cache:
+    name: jellyfin_cache
+  public_data:
+    name: public_data
+  private_data:
+    name: private_data

infrastructure/services/jellyfin/env/jellyfin.env

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

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

@@ -0,0 +1,34 @@
+services:
+  main_infrastructure:
+    container_name: main_infrastructure
+    image: alpine:latest
+    profiles:
+      - main_infrastructure
+    volumes:
+      - public_data:/public_data:rw
+      - private_data:/private_data:rw
+    read_only: true
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    cap_add:
+      - CHOWN
+      - DAC_OVERRIDE
+    # Fix root permissions on mounted volumes
+    command: chown -R ${PUID:-1000}:${PGID:-1000} /public_data /private_data
+
+volumes:
+  public_data:
+    name: public_data
+  private_data:
+    name: private_data
+
+networks:
+  infra-network:
+    driver: bridge
+    name: infra-network
+  intern-network:
+    driver: bridge
+    internal: true
+    name: intern-network

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

infrastructure/services/memos/env/memos.env

@@ -0,0 +1 @@
+

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

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: {}

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

infrastructure/services/openssh/config/authorized_keys/id_ed25519.pub

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

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

@@ -0,0 +1,97 @@
+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:rw
+      - private_data:/private: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
+      - gitea_data:/gitea_data:rw
+      - gitea_config:/gitea_config:rw
+      - gitea_db:/gitea_db: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
+# forgejo
+  forgejo_data:
+    name: forgejo_data
+  forgejo_config:
+    name: forgejo_config
+  forgejo_db:
+    name: forgejo_db
+# gitea
+  gitea_data:
+    name: gitea_data
+  gitea_config:
+    name: gitea_config
+  gitea_db:
+    name: gitea_db

infrastructure/services/openssh/env/openssh.env

@@ -0,0 +1,15 @@
+TZ=Etc/UTC
+SUDO_ACCESS=true
+PASSWORD_ACCESS=false
+DOCKER_MODS=linuxserver/mods:openssh-server-rsync
+#PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
+PUBLIC_KEY_DIR=/authorized_ssh_keys
+USER_NAME=admin
+USER_PASSWORD=rdUwf36C11PLmpU9Lvq7tP5pfFBKAuCh
+
+#PUBLIC_KEY=yourpublickey
+#PUBLIC_KEY_FILE=/path/to/file
+#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
+#PUBLIC_KEY_URL=https://github.com/username.keys
+#USER_PASSWORD_FILE=/path/to/file
+#LOG_STDOUT=

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

@@ -9,16 +9,18 @@ services:
     depends_on:
       - caddy
     env_file:
-      - ./picoshare/env/picoshare.env
+      - ./env/picoshare.env
     volumes:
       - picoshare_data:/data
     networks:
       - infra-network
     security_opt:
       - no-new-privileges:true
-    read_only: true
+    read_only: false
-    tmpfs:
+    cap_drop:
-      - /tmp
+      - SYS_ADMIN
+#    tmpfs:
+#      - /tmp
     deploy:
       resources:
         limits:

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:

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
@@ -18,6 +18,9 @@ services:
       - infra-network
     security_opt:
       - no-new-privileges:true
+    cap_drop:
+      - SYS_ADMIN
+
   # Database projectsend
   projectsend_db:
     image: mariadb:latest
@@ -31,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

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

@@ -6,11 +6,11 @@ services:
     profiles:
       - psitransfer
     restart: on-failure:5
-    user: 1000:1000
+    user: ${PUID:-1000}:${PGID:-1000} 
     depends_on:
       - caddy
     env_file:
-      - ./psitransfer/env/psitransfer.env
+      - ./env/psitransfer.env
     volumes:
       - psitransfer_data:/data
     networks:

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

@@ -9,7 +9,10 @@ services:
     depends_on:
       - caddy
     env_file:
-      - ./qbittorrent/env/qbittorrent.env
+      - ./env/qbittorrent.env
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
     volumes:
       - qbittorrent_config:/config
       - public_data:/downloads
@@ -23,3 +26,5 @@ volumes:
     name: qbittorrent_config
   public_data:
     name: public_data
+  private_data:
+    name: private_data

infrastructure/services/qbittorrent/env/qbittorrent.env

@@ -1,5 +1,3 @@
-PUID=1000
-PGID=1000
 TZ=Etc/UTC
 WEBUI_PORT=8080
 TORRENTING_PORT=6881

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

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

@@ -9,10 +9,14 @@ services:
       - caddy
     restart: on-failure:5
     env_file:
-      - ./syncthing/env/syncthing.env
+      - ./env/syncthing.env
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
     volumes:
       - syncthing_config:/config
-      - syncthing_data:/data1
+      - public_data:/data1
+      - private_data:/data2
     networks:
       - infra-network
     security_opt:
@@ -21,5 +25,7 @@ services:
 volumes:
   syncthing_config:
     name: syncthing_config
-  syncthing_data:
+  public_data:
-    name: syncthing_data
+    name: public_data
+  private_data:
+    name: private_data

infrastructure/services/syncthing/env/syncthing.env

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

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

@@ -9,7 +9,10 @@ services:
     depends_on:
       - caddy
     env_file:
-      - ./transmission/env/transmission.env
+      - ./env/transmission.env
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
     volumes:
       - transmission_config:/config
       - public_data:/downloads
@@ -22,7 +25,9 @@ services:
 volumes:
   transmission_config:
     name: transmission_config
-  public_data:
-    name: public_data
   transmission_watch:
     name: transmission_watch
+  public_data:
+    name: public_data
+  private_data:
+    name: private_data

infrastructure/services/transmission/env/transmission.env

@@ -1,5 +1,3 @@
-PUID=1000
-PGID=1000
 TZ=Etc/UTC
 USER=admin
 PASS=4vqXCNGG09JUBe7rXkuQS8MG7ovE6Vxj