Update caddy

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

.gitmodules

@@ -2,5 +2,8 @@
 	path = infrastructure/services/minecraft-server
 	url = git@github.com:bensuperpc/docker-minecraft-server.git
 [submodule "infrastructure/services/7daystodie"]
-	path = 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

@@ -44,6 +44,10 @@ start:
 start-at:
 	$(DOCKER_COMPOSE_COMMAND) up
 
+.PHONY: no-start
+no-start:
+	$(DOCKER_COMPOSE_COMMAND) up --no-start
+
 .PHONY: check
 check:
 	$(DOCKER_COMPOSE_COMMAND) config
@@ -67,6 +71,10 @@ 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

Makefile

@@ -11,16 +11,26 @@
 #//                                                          //
 #//////////////////////////////////////////////////////////////
 
+ADMIN_SERVICES := openssh uptime-kuma yacht
 BLOG_SERVICES := wordpress
-TORRENTS_SERVICES := qbittorrent transmission
+7DAYS_TO_DIE_SERVICES := 7daystodie_server 7daystodie_backup
-SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs gitea syncthing
+MINECRAFT_SERVICES := minecraft_server minecraft_backup
-ADMIN_SERVICES := yacht uptime-kuma openssh
+SATISFACTORY_SERVICES := satisfactory_server satisfactory_backup
-UTILS_SERVICES := it-tools stirlingpdf
+GIT_SERVICES := forgejo forgejo-runner
+# gitea gitea-runner
 IA_SERVICES := open-webui
-# gitea-runner
+SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs syncthing
-GAME_SERVICES := mc-server mc-backup 7daystodie_server 7daystodie_backup
+TORRENTS_SERVICES := qbittorrent transmission
+UTILS_SERVICES := it-tools stirlingpdf omni-tools
+
+MAIN_SERVICES := main_infrastructure caddy homepage
+
 PROJECT_DIRECTORY := infrastructure
 
-DOCKER_PROFILES := main_infrastructure caddy homepage $(BLOG_SERVICES) $(SHARING_SERVICES) $(TORRENTS_SERVICES) $(ADMIN_SERVICES) $(UTILS_SERVICES) $(IA_SERVICES) $(GAME_SERVICES) 
+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)
 
 include DockerCompose.mk

README.md

@@ -15,14 +15,16 @@ If you have any **questions** or **suggestions**, feel free to open an issue or
 - [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)
-- [ ] [Satisfactory](https://github.com/bensuperpc/docker-satisfactory)
+- [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)
 
@@ -44,9 +46,26 @@ 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 |
+| 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
 
@@ -62,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...
@@ -74,33 +95,36 @@ Check if all bensuperpc.* are replaced by your domain in [Caddyfile](caddy/servi
 
 And then, caddy will generate the certificate for you and renew it automatically :D
 
-| Domain name | Type | Description |
+| Domain name                                                        | Type | Description                                                  |
-| --- | --- | --- |
+| ------------------------------------------------------------------ | ---- | ------------------------------------------------------------ |
-| [bensuperpc.org](https://bensuperpc.org) | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
+| [bensuperpc.org](https://bensuperpc.org)                           | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
-| [www.bensuperpc.org](https://www.bensuperpc.org) | Main | Homepage |
+| [www.bensuperpc.org](https://www.bensuperpc.org)                   | Main | Homepage                                                     |
-| [open-webui.bensuperpc.org](https://open-webui.bensuperpc.org) | Sub | For local chatGPT |
+| [open-webui.bensuperpc.org](https://open-webui.bensuperpc.org)     | Sub  | For local chatGPT                                            |
-| [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org) | Sub | Wordpress website |
+| [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org)       | Sub  | Wordpress website                                            |
-| [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | Sub | Uptime Kuma for monitoring |
+| [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org)     | Sub  | Uptime Kuma for monitoring                                   |
-| [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server |
+| [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org)   | Sub  | Torrent client/server                                        |
-| [transmission.bensuperpc.org](https://transmission.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 |
+| [gitea.bensuperpc.org](https://gitea.bensuperpc.org)               | Sub  | Gitea for git                                                |
-| [link.bensuperpc.org](https://link.bensuperpc.org) | Sub | For link shortener |
+| [forgejo.bensuperpc.org](https://forgejo.bensuperpc.org/)          | Sub  | Fork of Gitea for git                                        |
-| [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org) | Sub | Jellyfin for media server |
+| [git.bensuperpc.org](https://git.bensuperpc.org)                   | Sub  | Fork of Gitea for git                                        |
-| [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) | Sub | SyncThing for file synchronization |
+| [link.bensuperpc.org](https://link.bensuperpc.org)                 | Sub  | For link shortener                                           |
-| [psitransfer.bensuperpc.org](https://psitransfer.bensuperpc.org) | Sub | PsiTransfer for file sharing |
+| [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org)         | Sub  | Jellyfin for media server                                    |
-| [it-tools.bensuperpc.org](https://it-tools.bensuperpc.org) | Sub | Tools for IT |
+| [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org)       | Sub  | SyncThing for file synchronization                           |
-| [privatebin.bensuperpc.org](https://privatebin.bensuperpc.org) | Sub | Pastebin |
+| [psitransfer.bensuperpc.org](https://psitransfer.bensuperpc.org)   | Sub  | PsiTransfer for file sharing                                 |
-| [yacht.bensuperpc.org](https://yacht.bensuperpc.org) | Sub | Web interface for managing docker containers |
+| [it-tools.bensuperpc.org](https://it-tools.bensuperpc.org)         | Sub  | Tools for IT                                                 |
-| [projectsend.bensuperpc.org](https://projectsend.bensuperpc.org) | Sub | ProjectSend for file sharing |
+| [omni-tools.bensuperpc.org](https://omni-tools.bensuperpc.org)     | Sub  | Tools for IT                                                 |
-| [picoshare.bensuperpc.org](https://picoshare.bensuperpc.org) | Sub | Picoshare for file sharing |
+| [privatebin.bensuperpc.org](https://privatebin.bensuperpc.org)     | Sub  | Pastebin                                                     |
-| [dufs.bensuperpc.org](https://dufs.bensuperpc.org) | Sub | Dufs for file sharing |
+| [yacht.bensuperpc.org](https://yacht.bensuperpc.org)               | Sub  | Web interface for managing docker containers                 |
-| [public.bensuperpc.org](https://public.bensuperpc.org) | Sub | Caddy for file sharing |
+| [projectsend.bensuperpc.org](https://projectsend.bensuperpc.org)   | Sub  | ProjectSend for file sharing                                 |
-| [memos.bensuperpc.org](https://memos.bensuperpc.org) | Sub | Caddy for file sharing |
+| [picoshare.bensuperpc.org](https://picoshare.bensuperpc.org)       | Sub  | Picoshare for file sharing                                   |
-| [stirlingpdf.bensuperpc.org](https://stirlingpdf.bensuperpc.org) | Sub | Stirling PDF tools |
+| [dufs.bensuperpc.org](https://dufs.bensuperpc.org)                 | Sub  | Dufs for file sharing                                        |
-| bensuperpc.com | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
+| [public.bensuperpc.org](https://public.bensuperpc.org)             | Sub  | Caddy for file sharing                                       |
-| bensuperpc.fr | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
+| [memos.bensuperpc.org](https://memos.bensuperpc.org)               | Sub  | Caddy for file sharing                                       |
-| bensuperpc.net | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
+| [stirlingpdf.bensuperpc.org](https://stirlingpdf.bensuperpc.org)   | Sub  | Stirling PDF tools                                           |
-| bensuperpc.ovh | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
+| bensuperpc.com                                                     | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
+| bensuperpc.fr                                                      | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
+| bensuperpc.net                                                     | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
+| bensuperpc.ovh                                                     | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
 
 ### Configure the infrastructure
 
@@ -238,7 +262,7 @@ For [open-webui.env](infrastructure/services/open-webui/env/open-webui.env) file
 To download the model, you can use:
 
 ```sh
-docker exec ollama ollama run deepseek-r1:8b
+docker exec -it ollama ollama run deepseek-r1:8b
 ```
 
 ### Start the infrastructure
@@ -274,14 +298,54 @@ You can change the homepage config in these files:
 - [settings.yaml](infrastructure/services/homepage/config/settings.yaml)
 - [widgets.yaml](infrastructure/services/homepage/config/widgets.yaml)
 
+### Forgejo
+
+```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 |
+| Volume name  | Description                                                                                                |
-| --- | --- |
+| ------------ | ---------------------------------------------------------------------------------------------------------- |
-| public_data | Public data reachable on internet via [dufs.bensuperpc.org](https://dufs.bensuperpc.org), can be disabled. |
+| public_data  | Public data reachable on internet via [dufs.bensuperpc.org](https://dufs.bensuperpc.org), can be disabled. |
-| private_data | Private data |
+| private_data | Private data                                                                                               |
 
 ### SSH access
 
@@ -316,6 +380,7 @@ 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/)
@@ -327,6 +392,8 @@ ssh -p 2222 admin@bensuperpc.org
 - [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/docker-compose.yml

@@ -9,10 +9,14 @@ include:
   - 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
@@ -40,10 +44,8 @@ include:
 # open-webui
   - services/open-webui/docker-compose.open-webui.yml
 # Minecraft
-  - services/minecraft-server/minecraft-server/minecraft-server/docker-compose.yml
+  - services/minecraft-server/minecraft-server/docker-compose.yml
-# Backup minecraft
-  - services/minecraft-server/minecraft-server/backup/docker-compose.backup.yml
 # 7daystodie
-  - services/7daystodie/7daystodie-server/7daystodie/docker-compose.7daystodie.yml
+  - services/7daystodie-server/7daystodie-server/docker-compose.yml
-# Backup 7daystodie
+# Satisfactory
-  - services/7daystodie/7daystodie-server/backup/docker-compose.backup.yml
+  - services/satisfactory-server/satisfactory-server/docker-compose.yml

infrastructure/services/caddy/config/Caddyfile

@@ -1,5 +1,5 @@
 {
-	email bensuperpc@gmail.com
+	email {$MAIL_DOMAIN}
 	key_type p384
 
 	log {

infrastructure/services/caddy/config/bensuperpc.org/Caddyfile

@@ -1,21 +1,21 @@
-www.bensuperpc.org {
+www.{$MAIN_DOMAIN} {
 	reverse_proxy homepage:3000
 }
 
-bensuperpc.org {
+{$MAIN_DOMAIN} {
 	redir https://www.{host}{uri} permanent
 }
 
-homepage.bensuperpc.org {
+homepage.{$MAIN_DOMAIN} {
-	redir https://www.bensuperpc.org{uri} permanent
+	redir https://www.{$MAIN_DOMAIN}{uri} permanent
 }
 
-public.bensuperpc.org {
+public.{$MAIN_DOMAIN} {
 	root * /public_data
 	file_server browse
 }
 
-wordpress.bensuperpc.org {
+wordpress.{$MAIN_DOMAIN} {
 	root * /var/www/html
 	php_fastcgi wordpress:9000
 
@@ -46,11 +46,11 @@ wordpress.bensuperpc.org {
 		# X-Frame-Options DENY
 
 		# Disable powerful features we don't need
-        Permissions-Policy "geolocation=(), camera=(), microphone=() interest-cohort=()"
+		Permissions-Policy "geolocation=(), camera=(), microphone=() interest-cohort=()"
 	}
 }
 
-it-tools.bensuperpc.org {
+it-tools.{$MAIN_DOMAIN} {
 	# Load balance between 2 instances
 	reverse_proxy {
 		to it-tools0:80 it-tools1:80
@@ -60,89 +60,99 @@ it-tools.bensuperpc.org {
 	}
 }
 
-uptimekuma.bensuperpc.org {
+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
+	}
+}
+
+uptimekuma.{$MAIN_DOMAIN} {
 	reverse_proxy uptime-kuma:3001
 }
 
-torrent.bensuperpc.org {
+torrent.{$MAIN_DOMAIN} {
 	reverse_proxy qbittorrent:8080
 }
 
-qbittorrent.bensuperpc.org {
+qbittorrent.{$MAIN_DOMAIN} {
-	redir https://torrent.bensuperpc.org permanent
+	redir https://torrent.{$MAIN_DOMAIN} permanent
 }
 
-transmission.bensuperpc.org {
+transmission.{$MAIN_DOMAIN} {
 	reverse_proxy transmission:9091
 }
 
-gitea.bensuperpc.org {
+gitea.{$MAIN_DOMAIN} {
-	redir https://git.bensuperpc.org permanent
-}
-
-git.bensuperpc.org {
 	reverse_proxy gitea:3000
 }
 
-jellyfin.bensuperpc.org {
+git.{$MAIN_DOMAIN} {
+	reverse_proxy forgejo:3000
+}
+
+forgejo.{$MAIN_DOMAIN} {
+	redir https://git.{$MAIN_DOMAIN}{uri} permanent
+}
+
+jellyfin.{$MAIN_DOMAIN} {
 	reverse_proxy jellyfin:8096
 }
 
-transfer.bensuperpc.org {
+transfer.{$MAIN_DOMAIN} {
 	reverse_proxy psitransfer:3000
 }
 
-psitransfer.bensuperpc.org {
+psitransfer.{$MAIN_DOMAIN} {
-	redir https://transfer.bensuperpc.org{uri} permanent
+	redir https://transfer.{$MAIN_DOMAIN}{uri} permanent
 }
 
-picoshare.bensuperpc.org {
+picoshare.{$MAIN_DOMAIN} {
 	reverse_proxy picoshare:4001
 }
 
-syncthing.bensuperpc.org {
+syncthing.{$MAIN_DOMAIN} {
 	reverse_proxy syncthing:8384 {
 		header_up Host {upstream_hostport}
 	}
 }
 
-tools.bensuperpc.org {
+privatebin.{$MAIN_DOMAIN} {
-	redir https://it-tools.bensuperpc.org permanent
-}
-
-privatebin.bensuperpc.org {
 	reverse_proxy privatebin:8080
 }
 
-pastebin.bensuperpc.org {
+pastebin.{$MAIN_DOMAIN} {
-	redir https://privatebin.bensuperpc.org permanent
+	redir https://privatebin.{$MAIN_DOMAIN} permanent
 }
 
-yacht.bensuperpc.org {
+yacht.{$MAIN_DOMAIN} {
 	reverse_proxy yacht:8000
 }
 
-projectsend.bensuperpc.org {
+projectsend.{$MAIN_DOMAIN} {
 	reverse_proxy projectsend:80
 }
 
-dufs.bensuperpc.org {
+dufs.{$MAIN_DOMAIN} {
 	reverse_proxy dufs:5000
 }
 
-stirlingpdf.bensuperpc.org {
+stirlingpdf.{$MAIN_DOMAIN} {
 	reverse_proxy stirlingpdf:8080
 }
 
-memos.bensuperpc.org {
+memos.{$MAIN_DOMAIN} {
 	reverse_proxy memos:5230
 }
 
-open-webui.bensuperpc.org {
+open-webui.{$MAIN_DOMAIN} {
 	reverse_proxy open-webui:8080
 }
 
-link.bensuperpc.org {
+link.{$MAIN_DOMAIN} {
 	# TODO: Use service with database
 	# Friendly links
 	redir /gnous https://gnous.eu permanent

infrastructure/services/caddy/env/caddy.env

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

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
+    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:
       - ./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,7 +28,6 @@ services:
     image: mariadb:latest
     container_name: database_gitea
     profiles:
-      - database
       - gitea
     depends_on:
       - caddy

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

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:
@@ -78,6 +78,12 @@
         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/
@@ -90,6 +96,12 @@
         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/
@@ -97,6 +109,26 @@
         ping: open-webui.bensuperpc.org
         container: open-webui
 
+- Games:
+    - minecraft:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/minecraft.png
+#        href: https://minecraft.bensuperpc.org/
+        description: Minecraft server
+#        ping: minecraft.bensuperpc.org
+        container: minecraft-server
+    - 7dtd:
+#        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/7dtd.png
+#        href: https://7dtd.bensuperpc.org/
+        description: 7 Days to Die server
+#        ping: 7dtd.bensuperpc.org
+        container: 7daystodie_server
+    - 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
+
 - Admin:
     - uptime-kuma:
         icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/uptime-kuma.png
@@ -111,23 +143,3 @@
         ping: yacht.bensuperpc.org
         container: yacht
 
-- Games:
-    - minecraft:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/minecraft.png
-#        href: https://minecraft.bensuperpc.org/
-        description: Minecraft server
-#        ping: minecraft.bensuperpc.org
-        container: minecraft-server
-    - 7dtd:
-#        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/7dtd.png
-#        href: https://7dtd.bensuperpc.org/
-        description: 7 Days to Die server
-#        ping: 7dtd.bensuperpc.org
-        container: 7dtd-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
-

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

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/widgets/services/
-# https://gethomepage.dev/main/widgets/services/qbittorrent
+# https://gethomepage.dev/widgets/services/qbittorrent/
 
 #- logo:
 #    icon: /image/daisy.jpg

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

@@ -6,6 +6,9 @@ services:
     profiles:
       - homepage
     restart: on-failure:5
+#    environment:
+#      - PUID=${PUID:-1000}
+#      - PGID=${PGID:-1000}
     depends_on:
       - caddy
     env_file:

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

@@ -1,4 +1,3 @@
-
 services:
   ollama:
     image: ollama/ollama:latest

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

@@ -1,13 +1,6 @@
 OLLAMA_BASE_URL=http://ollama:11434
 #WEBUI_SECRET_KEY=
 #HF_HUB_OFFLINE=1
-
-# Only with stable-diffusion-webui
-#ENABLE_IMAGE_GENERATION=true
-#AUTOMATIC1111_BASE_URL=http://stable-diffusion-webui:7860
-#IMAGE_SIZE=64x64
-#IMAGE_STEPS=3
-
 # Disable analytics
 SCARF_NO_ANALYTICS=true
 DO_NOT_TRACK=true
@@ -16,3 +9,8 @@ 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/docker-compose.openssh.yml

@@ -5,8 +5,6 @@ services:
     container_name: openssh
     profiles:
       - openssh
-    depends_on:
-      - caddy
     restart: on-failure:5
     env_file:
       - ./env/openssh.env
@@ -21,6 +19,24 @@ services:
       - 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:
@@ -40,3 +56,42 @@ volumes:
     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

tools/docker_volumes_export.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+volumes=(
+    7daystodie_backup
+    7daystodie_server_save
+    7daystodie_server_config_lgsm
+    7daystodie_server_log
+#    7daystodie_server_file
+#    satisfactory_server_config
+    forgejo_data
+    wordpress_db
+    minecraft_proxy_data
+    stirlingpdf_tessdata
+    wordpress
+    gitea_db
+#    wordpress_backup
+    projectsend_share
+    transmission_config
+#    public_data
+    projectsend_db
+    projectsend_config
+    open-webui
+    minecraft_rcon_data
+    jellyfin_cache
+    caddy_backup
+#    satisfactory_backup
+    homepage_log
+    syncthing_config
+    openssh_config
+    minecraft_server_backup
+    qbittorrent_config
+    gitea_runner
+    gitea_config
+    minecraft_server_data
+    ollama
+    caddy_data
+    forgejo_config
+    stirlingpdf_config
+    uptimekuma_data
+#    private_data
+    yacht_config
+    transmission_watch
+    forgejo_db
+    privatebin_data
+    caddy_config
+    psitransfer_data
+    forgejo_certs
+    forgejo_runner
+    gitea_data
+    jellyfin_config
+    picoshare_data
+)
+
+export_volume() {
+    local volume="$1"
+    echo "Exporting volume: $volume to $(pwd)/$volume.tar.gz"
+    docker run --rm -v "$volume:/source" -v "$(pwd):/dest" alpine sh -c 'apk add --no-cache tar && tar --numeric-owner -cpvzf /dest/"$0.tar.gz" -C /source .' "$volume"
+
+}
+
+import_volume() {
+    local volume="$1"
+    echo "Importing volume: $volume from $(pwd)/$volume.tar.gz"
+    docker run --rm -v "$volume:/dest" -v "$(pwd):/source" alpine sh -c 'apk add --no-cache tar && tar --numeric-owner -xpvzf /source/"$0.tar.gz" -C /dest' "$volume"
+}
+
+echo "Starting sync process..."
+
+for ((i=0; i < ${#volumes[@]}; i++)); do
+    export_volume "${volumes[$i]}"
+done
+
+echo "Sync process completed."

tools/sync_data.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [ "$#" -ne 2 ]; then
+    echo "Usage: $0 <source> <destination>"
+    echo "Example: $0 admin@192.168.1.2:/mydata/backup /local/backup"
+    exit 1
+fi
+
+SOURCE="${1}"
+DEST="${2}"
+
+rsync -e 'ssh -p 2222' --progress --human-readable --archive --verbose --compress --acls --xattrs --bwlimit=30000 --stats --delete-during "${SOURCE}" "${DEST}"