Update Minecraft server

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"

.gitmodules

@@ -1,3 +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

@@ -44,8 +44,8 @@ start:
 start-at:
 	$(DOCKER_COMPOSE_COMMAND) up
 
-.PHONY: docker-check
+.PHONY: check
-docker-check:
+check:
 	$(DOCKER_COMPOSE_COMMAND) config
 
 .PHONY: stop
@@ -67,15 +67,18 @@ state:
 	$(DOCKER_COMPOSE_COMMAND) ps
 	$(DOCKER_COMPOSE_COMMAND) top
 
-.PHONY: update-docker
+.PHONY: image-update
-update-docker:
+image-update:
 	$(DOCKER_COMPOSE_COMMAND) pull
 
-.PHONY: update
+.PHONY: git-update
-update: update-docker
+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

Makefile

@@ -15,12 +15,12 @@ BLOG_SERVICES := wordpress
 TORRENTS_SERVICES := qbittorrent transmission
 SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs gitea syncthing
 ADMIN_SERVICES := yacht uptime-kuma openssh
-UTILS_SERVICES := it-tools stirlingpdf
+UTILS_SERVICES := it-tools stirlingpdf omni-tools
+IA_SERVICES := open-webui
 # gitea-runner
-GAME_SERVICES := mc-server
+#GAME_SERVICES := mc-server mc-backup 7daystodie_server 7daystodie_backup satisfactory_server satisfactory_backup
-
 PROJECT_DIRECTORY := infrastructure
 
-DOCKER_PROFILES := main_infrastructure caddy homepage $(BLOG_SERVICES) $(SHARING_SERVICES) $(TORRENTS_SERVICES) $(ADMIN_SERVICES) $(UTILS_SERVICES) $(GAME_SERVICES)
+DOCKER_PROFILES := main_infrastructure caddy homepage $(BLOG_SERVICES) $(SHARING_SERVICES) $(TORRENTS_SERVICES) $(ADMIN_SERVICES) $(UTILS_SERVICES) $(IA_SERVICES) $(GAME_SERVICES) 
 
 include DockerCompose.mk

README.md

@@ -19,10 +19,13 @@ If you have any **questions** or **suggestions**, feel free to open an issue or
 - [x] qbittorrent and transmission (Torrent client/server)
 - [x] SyncThing (File synchronization)
 - [x] PsiTransfer, ProjectSend, Picoshare (File sharing)
-- [x] it-tools (Tools for IT)
+- [x] it-tools and omni-tools (Tools for IT)
+- [x] Open-WebUI (Local chatGPT)
 - [x] Privatebin (Pastebin)
 - [x] Yacht (Web interface for managing docker containers)
-- [ ] Integrate games ([Satisfactory](https://github.com/bensuperpc/docker-satisfactory), [7 days to die](https://github.com/bensuperpc/docker-7daystodie), Minecraft...)
+- [X] [Satisfactory](https://github.com/bensuperpc/docker-satisfactory)
+- [x] [7 days to die](https://github.com/bensuperpc/docker-7daystodie)
+- [x] [minecraft](https://github.com/bensuperpc/docker-minecraft-server)
 
 ## Architecture
 
@@ -43,8 +46,9 @@ The homepage is a dashboard with many widgets and services.
 - [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/)
+- 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...***
+**To avoid get rate limit from letsencrypt (10 certificates per 3 hours), you need to disable some certificates in the caddyfiles and enable them 3h later...**
 
 ### Clone
 
@@ -60,6 +64,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...
@@ -76,6 +82,7 @@ And then, caddy will generate the certificate for you and renew it automatically
 | --- | --- | --- |
 | [bensuperpc.org](https://bensuperpc.org) | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
 | [www.bensuperpc.org](https://www.bensuperpc.org) | Main | Homepage |
+| [open-webui.bensuperpc.org](https://open-webui.bensuperpc.org) | Sub | For local chatGPT |
 | [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org) | Sub | Wordpress website |
 | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | Sub | Uptime Kuma for monitoring |
 | [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server |
@@ -86,6 +93,7 @@ And then, caddy will generate the certificate for you and renew it automatically
 | [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) | Sub | SyncThing for file synchronization |
 | [psitransfer.bensuperpc.org](https://psitransfer.bensuperpc.org) | Sub | PsiTransfer for file sharing |
 | [it-tools.bensuperpc.org](https://it-tools.bensuperpc.org) | Sub | Tools for IT |
+| [omni-tools.bensuperpc.org](https://omni-tools.bensuperpc.org) | Sub | Tools for IT |
 | [privatebin.bensuperpc.org](https://privatebin.bensuperpc.org) | Sub | Pastebin |
 | [yacht.bensuperpc.org](https://yacht.bensuperpc.org) | Sub | Web interface for managing docker containers |
 | [projectsend.bensuperpc.org](https://projectsend.bensuperpc.org) | Sub | ProjectSend for file sharing |
@@ -93,6 +101,7 @@ And then, caddy will generate the certificate for you and renew it automatically
 | [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 |
 | 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) |
@@ -110,12 +119,16 @@ openssl rand -base64 32
 
 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
@@ -137,6 +150,8 @@ For [wordpress_backup.env](infrastructure/services/wordpress/env/wordpress_backu
 RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
 ```
 
+#### Gitea
+
 For [gitea.env](infrastructure/services/gitea/env/gitea.env) file, you need to change the password(s) and user for the database.
 
 ```sh
@@ -153,6 +168,8 @@ MARIADB_USER=bensuperpc
 MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
 ```
 
+#### PsiTransfer
+
 For [psitransfer.env](infrastructure/services/psitransfer/env/psitransfer.env) file, you need to change the secret key.
 
 ```sh
@@ -173,18 +190,24 @@ MARIADB_USER=bensuperpc
 MARIADB_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
 ```
 
+#### Picoshare
+
 For [picoshare.env](infrastructure/services/picoshare/env/picoshare.env) file, you need to change the secret key.
 
 ```sh
 PS_SHARED_SECRET=CBuS4DJLqIe93xF1KGYRrnhxUFBqLD2n
 ```
 
+#### Dufs
+
 For [dufs.env](infrastructure/services/dufs/env/dufs.env) file, you need to change the secret key and if you want the user name.
 
 ```sh
 DUFS_AUTH="admin:heqihlOfBmJDESGFlpbPi7P7Mi6F7RkV@/:rw|@/:ro"
 ```
 
+#### Stirling PDF
+
 For [stirlingpdf.env](infrastructure/services/stirlingpdf/env/stirlingpdf.env) file, it's **completly optional**, you can change the password(s) and user.
 
 ```sh
@@ -197,6 +220,8 @@ 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
@@ -211,6 +236,16 @@ USER_PASSWORD=rdUwf36C11PLmpU9Lvq7tP5pfFBKAuCh
 #USER_PASSWORD_FILE=/path/to/file
 ```
 
+#### Open-WebUI
+
+For [open-webui.env](infrastructure/services/open-webui/env/open-webui.env) file, entirely optional.
+
+To download the model, you can use:
+
+```sh
+docker exec -it ollama ollama run deepseek-r1:8b
+```
+
 ### Start the infrastructure
 
 Start the website with:
@@ -286,6 +321,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/)
@@ -294,6 +330,8 @@ ssh -p 2222 admin@bensuperpc.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)
 
 ## License

infrastructure/docker-compose.yml

@@ -13,6 +13,8 @@ include:
   - 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
@@ -37,7 +39,11 @@ include:
   - 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/minecraft-server/docker-compose.yml
+  - services/minecraft-server/minecraft-server/docker-compose.yml
-# Backup minecraft
+# 7daystodie
-  - services/minecraft-server/minecraft-server/backup/docker-compose.backup.yml
+  - services/7daystodie-server/7daystodie-server/docker-compose.yml
+# Satisfactory
+  - services/satisfactory-server/satisfactory-server/docker-compose.yml

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,85 +60,95 @@ 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
+	redir https://git.{$MAIN_DOMAIN} permanent
 }
 
-git.bensuperpc.org {
+git.{$MAIN_DOMAIN} {
 	reverse_proxy gitea:3000
 }
 
-jellyfin.bensuperpc.org {
+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
 }
 
-link.bensuperpc.org {
+open-webui.{$MAIN_DOMAIN} {
+	reverse_proxy open-webui:8080
+}
+
+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 @@
+MAIN_DOMAIN=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,32 @@
         description: Gitea
         ping: gitea.bensuperpc.org
         container: gitea
+    - 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:
+        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:
@@ -105,23 +137,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

@@ -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/docker-compose.openssh.yml

@@ -21,6 +21,18 @@ 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
+
     networks:
       - infra-network
     security_opt:
@@ -40,3 +52,28 @@ 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