.gitmodules

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

Makefile

@@ -18,7 +18,7 @@ ADMIN_SERVICES := yacht uptime-kuma openssh
 UTILS_SERVICES := it-tools stirlingpdf
 IA_SERVICES := open-webui
 # gitea-runner
-GAME_SERVICES := mc-server mc-backup 7daystodie_server 7daystodie_backup satisfactory_server satisfactory_backup
+GAME_SERVICES := mc-server mc-backup 7daystodie_server 7daystodie_backup
 PROJECT_DIRECTORY := infrastructure
 
 DOCKER_PROFILES := main_infrastructure caddy homepage $(BLOG_SERVICES) $(SHARING_SERVICES) $(TORRENTS_SERVICES) $(ADMIN_SERVICES) $(UTILS_SERVICES) $(IA_SERVICES) $(GAME_SERVICES) 

README.md

@@ -22,7 +22,7 @@ If you have any **questions** or **suggestions**, feel free to open an issue or
 - [x] it-tools (Tools for IT)
 - [x] Privatebin (Pastebin)
 - [x] Yacht (Web interface for managing docker containers)
-- [X] [Satisfactory](https://github.com/bensuperpc/docker-satisfactory)
+- [ ] [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)
 
@@ -45,9 +45,8 @@ 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
 
@@ -63,8 +62,6 @@ 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...

infrastructure/docker-compose.yml

@@ -40,8 +40,10 @@ include:
 # open-webui
   - services/open-webui/docker-compose.open-webui.yml
 # Minecraft
-  - services/minecraft-server/minecraft-server/docker-compose.yml
+  - services/minecraft-server/minecraft-server/minecraft-server/docker-compose.yml
+# Backup minecraft
+  - services/minecraft-server/minecraft-server/backup/docker-compose.backup.yml
 # 7daystodie
-  - services/7daystodie-server/7daystodie-server/docker-compose.yml
-# Satisfactory
-  - services/satisfactory-server/satisfactory-server/docker-compose.yml
+  - services/7daystodie/7daystodie-server/7daystodie/docker-compose.7daystodie.yml
+# Backup 7daystodie
+  - services/7daystodie/7daystodie-server/backup/docker-compose.backup.yml

infrastructure/services/homepage/config/services.yaml

@@ -123,11 +123,11 @@
 #        href: https://7dtd.bensuperpc.org/
         description: 7 Days to Die server
 #        ping: 7dtd.bensuperpc.org
-        container: 7daystodie_server
+        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
+        container: satisfactory-server
 

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

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

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

@@ -1,6 +1,13 @@
 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
@@ -9,8 +16,3 @@ 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/satisfactory-server

@@ -1 +0,0 @@
-Subproject commit 768031f47102df6f79cca214f34b651cf9a1f73d