diff --git a/.gitmodules b/.gitmodules index 08ecf79..d4e7e89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "infrastructure/services/7daystodie"] path = infrastructure/services/7daystodie url = git@github.com:bensuperpc/docker-7daystodie.git +[submodule "infrastructure/services/satisfactory"] + path = infrastructure/services/satisfactory + url = git@github.com:bensuperpc/docker-satisfactory.git diff --git a/Makefile b/Makefile index 8081adc..4aa7fac 100644 --- a/Makefile +++ b/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 +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) $(IA_SERVICES) $(GAME_SERVICES) diff --git a/README.md b/README.md index d6dea1b..d655424 100644 --- a/README.md +++ b/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) -- [ ] [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) @@ -45,8 +45,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 the port for the game server (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 @@ -62,6 +63,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... diff --git a/infrastructure/docker-compose.yml b/infrastructure/docker-compose.yml index ace6552..1b8818a 100644 --- a/infrastructure/docker-compose.yml +++ b/infrastructure/docker-compose.yml @@ -47,3 +47,7 @@ include: - services/7daystodie/7daystodie-server/7daystodie/docker-compose.7daystodie.yml # Backup 7daystodie - services/7daystodie/7daystodie-server/backup/docker-compose.backup.yml +# Satisfactory + - services/satisfactory/satisfactory-server/satisfactory/docker-compose.satisfactory.yml +# Backup satisfactory + - services/satisfactory/satisfactory-server/backup/docker-compose.backup.yml diff --git a/infrastructure/services/homepage/config/services.yaml b/infrastructure/services/homepage/config/services.yaml index 2e390ea..1ecca44 100644 --- a/infrastructure/services/homepage/config/services.yaml +++ b/infrastructure/services/homepage/config/services.yaml @@ -123,7 +123,7 @@ # href: https://7dtd.bensuperpc.org/ description: 7 Days to Die server # ping: 7dtd.bensuperpc.org - container: 7dtd-server + container: 7daystodie_server - satisfactory: # icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/7dtd.png # href: https://7dtd.bensuperpc.org/ diff --git a/infrastructure/services/open-webui/docker-compose.open-webui.yml b/infrastructure/services/open-webui/docker-compose.open-webui.yml index 307835c..9b9801b 100644 --- a/infrastructure/services/open-webui/docker-compose.open-webui.yml +++ b/infrastructure/services/open-webui/docker-compose.open-webui.yml @@ -1,4 +1,3 @@ - services: ollama: image: ollama/ollama:latest diff --git a/infrastructure/services/open-webui/env/open-webui.env b/infrastructure/services/open-webui/env/open-webui.env index 7f50a22..ae70e03 100644 --- a/infrastructure/services/open-webui/env/open-webui.env +++ b/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 diff --git a/infrastructure/services/satisfactory b/infrastructure/services/satisfactory new file mode 160000 index 0000000..768031f --- /dev/null +++ b/infrastructure/services/satisfactory @@ -0,0 +1 @@ +Subproject commit 768031f47102df6f79cca214f34b651cf9a1f73d