Fix Caddy config, update Makefile

This commit is contained in:
2025-08-15 22:52:05 +02:00
parent 2b902e54be
commit 31596675b9
25 changed files with 18 additions and 57 deletions

View File

@@ -11,26 +11,24 @@
#// // #// //
#////////////////////////////////////////////////////////////// #//////////////////////////////////////////////////////////////
ADMIN_SERVICES := openssh ADMIN_SERVICES := openssh uptime-kuma yacht
#uptime-kuma yacht BLOG_SERVICES := wordpress
#BLOG_SERVICES := wordpress
#7DAYS_TO_DIE_SERVICES := 7daystodie_server 7daystodie_backup #7DAYS_TO_DIE_SERVICES := 7daystodie_server 7daystodie_backup
#MINECRAFT_SERVICES := minecraft_server minecraft_backup #MINECRAFT_SERVICES := minecraft_server minecraft_backup
#SATISFACTORY_SERVICES := satisfactory_server satisfactory_backup #SATISFACTORY_SERVICES := satisfactory_server satisfactory_backup
#GIT_SERVICES := forgejo forgejo-runner GIT_SERVICES := forgejo
# forgejo-runner
# gitea gitea-runner # gitea gitea-runner
#IA_SERVICES := open-webui IA_SERVICES := open-webui
#SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs syncthing SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs syncthing
#TORRENTS_SERVICES := qbittorrent transmission TORRENTS_SERVICES := qbittorrent transmission
#UTILS_SERVICES := it-tools stirlingpdf omni-tools UTILS_SERVICES := it-tools stirlingpdf omni-tools
MAIN_SERVICES := main_infrastructure caddy homepage MAIN_SERVICES := main_infrastructure caddy homepage
PROJECT_DIRECTORY := infrastructure PROJECT_DIRECTORY := infrastructure
DOCKER_PROFILES := $(MAIN_SERVICES) \ DOCKER_PROFILES := $(MAIN_SERVICES) $(ADMIN_SERVICES) $(BLOG_SERVICES) \
$(ADMIN_SERVICES) $(BLOG_SERVICES) $(7DAYS_TO_DIE_SERVICES) $(MINECRAFT_SERVICES) \ $(7DAYS_TO_DIE_SERVICES) $(MINECRAFT_SERVICES) $(SATISFACTORY_SERVICES) \
$(SATISFACTORY_SERVICES) \
$(GIT_SERVICES) $(IA_SERVICES) $(SHARING_SERVICES) \ $(GIT_SERVICES) $(IA_SERVICES) $(SHARING_SERVICES) \
$(TORRENTS_SERVICES) $(UTILS_SERVICES) $(TORRENTS_SERVICES) $(UTILS_SERVICES)

View File

@@ -1,5 +1,3 @@
import header.caddy
dufs.{$MAIN_DOMAIN} { dufs.{$MAIN_DOMAIN} {
reverse_proxy dufs:5000 reverse_proxy dufs:5000
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
git.{$MAIN_DOMAIN} { git.{$MAIN_DOMAIN} {
reverse_proxy forgejo:3000 reverse_proxy forgejo:3000
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
gitea.{$MAIN_DOMAIN} { gitea.{$MAIN_DOMAIN} {
reverse_proxy gitea:3000 reverse_proxy gitea:3000
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
homepage.{$MAIN_DOMAIN} { homepage.{$MAIN_DOMAIN} {
redir reverse_proxy homepage:3000 reverse_proxy homepage:3000
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
it-tools.{$MAIN_DOMAIN} { it-tools.{$MAIN_DOMAIN} {
# Load balance between 2 instances # Load balance between 2 instances
reverse_proxy { reverse_proxy {

View File

@@ -1,5 +1,3 @@
import header.caddy
jellyfin.{$MAIN_DOMAIN} { jellyfin.{$MAIN_DOMAIN} {
reverse_proxy jellyfin:8096 reverse_proxy jellyfin:8096
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
www.{$MAIN_DOMAIN} { www.{$MAIN_DOMAIN} {
header { header {
Cache-Control "public, max-age=10" Cache-Control "public, max-age=10"

View File

@@ -1,5 +1,3 @@
import header.caddy
memos.{$MAIN_DOMAIN} { memos.{$MAIN_DOMAIN} {
reverse_proxy memos:5230 reverse_proxy memos:5230
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
omni-tools.{$MAIN_DOMAIN} { omni-tools.{$MAIN_DOMAIN} {
# Load balance between 2 instances # Load balance between 2 instances
reverse_proxy { reverse_proxy {

View File

@@ -1,5 +1,3 @@
import header.caddy
open-webui.{$MAIN_DOMAIN} { open-webui.{$MAIN_DOMAIN} {
reverse_proxy open-webui:8080 reverse_proxy open-webui:8080
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
picoshare.{$MAIN_DOMAIN} { picoshare.{$MAIN_DOMAIN} {
reverse_proxy picoshare:4001 reverse_proxy picoshare:4001
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
privatebin.{$MAIN_DOMAIN} { privatebin.{$MAIN_DOMAIN} {
reverse_proxy privatebin:8080 reverse_proxy privatebin:8080
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
projectsend.{$MAIN_DOMAIN} { projectsend.{$MAIN_DOMAIN} {
reverse_proxy projectsend:80 reverse_proxy projectsend:80
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
transfer.{$MAIN_DOMAIN} { transfer.{$MAIN_DOMAIN} {
reverse_proxy psitransfer:3000 reverse_proxy psitransfer:3000
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
torrent.{$MAIN_DOMAIN} { torrent.{$MAIN_DOMAIN} {
reverse_proxy qbittorrent:8080 reverse_proxy qbittorrent:8080
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
stirlingpdf.{$MAIN_DOMAIN} { stirlingpdf.{$MAIN_DOMAIN} {
reverse_proxy stirlingpdf:8080 reverse_proxy stirlingpdf:8080
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
syncthing.{$MAIN_DOMAIN} { syncthing.{$MAIN_DOMAIN} {
reverse_proxy syncthing:8384 { reverse_proxy syncthing:8384 {
header_up Host {upstream_hostport} header_up Host {upstream_hostport}

View File

@@ -1,5 +1,3 @@
import header.caddy
transmission.{$MAIN_DOMAIN} { transmission.{$MAIN_DOMAIN} {
reverse_proxy transmission:9091 reverse_proxy transmission:9091
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
uptimekuma.{$MAIN_DOMAIN} { uptimekuma.{$MAIN_DOMAIN} {
reverse_proxy uptime-kuma:3001 reverse_proxy uptime-kuma:3001
} }

View File

@@ -1,5 +1,3 @@
import header.caddy
wordpress.{$MAIN_DOMAIN} { wordpress.{$MAIN_DOMAIN} {
root * /var/www/html root * /var/www/html
php_fastcgi wordpress:9000 php_fastcgi wordpress:9000

View File

@@ -1,5 +1,3 @@
import header.caddy
yacht.{$MAIN_DOMAIN} { yacht.{$MAIN_DOMAIN} {
reverse_proxy yacht:8000 reverse_proxy yacht:8000
} }

View File

@@ -63,7 +63,7 @@ services:
networks: networks:
- infra-network - infra-network
profiles: profiles:
- forgejo - forgejo-runner
links: links:
- docker-in-docker - docker-in-docker
depends_on: depends_on:

View File

@@ -51,6 +51,11 @@ volumes=(
gitea_data gitea_data
jellyfin_config jellyfin_config
picoshare_data picoshare_data
forgejo_data
forgejo_config
forgejo_db
forgejo_certs
forgejo_runner
) )
export_volume() { export_volume() {