Revert "Add fleet"

This reverts commit 6817b3deb0.

Makefile

@@ -13,61 +13,65 @@
 
 DOCKER := docker
 
+BLOG_SERVICES := wordpress
 TORRENTS_SERVICES := qbittorrent transmission
-SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs
+SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs gitea syncthing
 ADMIN_SERVICES := yacht uptime-kuma adminer
 UTILS_SERVICES := it-tools stirlingpdf
-
-PROFILES := caddy wordpress syncthing gitea homepage $(SHARING_SERVICES) $(TORRENTS_SERVICES) $(ADMIN_SERVICES) $(UTILS_SERVICES)
-PROFILE_CMD := $(addprefix --profile ,$(PROFILES))
-
 # gitea-runner
 
-COMPOSE_FILES :=  $(shell find . -name 'docker-compose*.yml' -type f | sed -e 's/^/--file /')
+PROFILES := caddy homepage $(BLOG_SERVICES) $(SHARING_SERVICES) $(TORRENTS_SERVICES) $(ADMIN_SERVICES) $(UTILS_SERVICES)
+PROFILE_CMD := $(addprefix --profile ,$(PROFILES))
 
+COMPOSE_FILES :=  $(shell find . -name 'docker-compose*.yml' -type f | sed -e 's/^/--file /')
 COMPOSE_DIR := --project-directory ./infrastructure
 
+UID := 1000
+GID := 1000
+
+ENV_ARG_VAR := PUID=$(UID) PGID=$(GID)
+
 .PHONY: build all
 all: start
 
 .PHONY: build
 build:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) build
+	$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) build
 
 .PHONY: start
 start:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up -d
+	$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up -d
 
 .PHONY: start-at
 start-at:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up
+	$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up
 
 .PHONY: docker-check
 docker-check:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) config
+	$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) config
 
 .PHONY: stop
 stop: down
 
 .PHONY: down
 down:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down
+	$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down
 
 .PHONY: restart
 restart: stop start
 
 .PHONY: logs
 logs:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) logs
+	$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) logs
 
 .PHONY: state
 state:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) ps
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) top
+	$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) ps
+	$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) top
 
 .PHONY: update-docker
 update-docker:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) pull
+	$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) pull
 
 .PHONY: update
 update: update-docker
@@ -76,8 +80,8 @@ update: update-docker
 
 .PHONY: clean
 clean:
-	$(DOCKER) images --filter=reference='bensuperpc/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
+	$(ENV_ARG_VAR) $(DOCKER) images --filter=reference='bensuperpc/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
 
 .PHONY: purge
 purge:
-	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down -v --rmi all
+	$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down -v --rmi all

infrastructure/caddy/config/bensuperpc.org/Caddyfile

@@ -3,7 +3,7 @@ www.bensuperpc.org {
 }
 
 bensuperpc.org {
-	redir https://www.bensuperpc.org permanent
+	redir https://www.{host}{uri} permanent
 }
 
 homepage.bensuperpc.org {

infrastructure/dufs/docker-compose.dufs.yml

@@ -5,7 +5,7 @@ services:
     container_name: dufs
     profiles:
       - dufs
-    user: 1000:1000
+    user: ${PUID:-1000}:${PGID:-1000} 
     restart: on-failure:5
     depends_on:
       - caddy

infrastructure/jellyfin/docker-compose.jellyfin.yml

@@ -6,7 +6,7 @@ services:
     profiles:
       - jellyfin
     restart: on-failure:5
-    user: 1000:1000
+    user: ${PUID:-1000}:${PGID:-1000} 
     depends_on:
       - caddy
     env_file:

infrastructure/projectsend/docker-compose.projectsend.yml

@@ -32,6 +32,9 @@ services:
       - projectsend_db:/var/lib/mysql:rw
     env_file:
       - ./projectsend/env/projectsend_db.env
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
     command: '--default-authentication-plugin=mysql_native_password'
     networks:
       - infra-network

infrastructure/projectsend/env/projectsend.env

@@ -1,3 +1 @@
-PUID=1000
-PGID=1000
 MAX_UPLOAD=50000

infrastructure/psitransfer/docker-compose.psitransfer.yml

@@ -6,7 +6,7 @@ services:
     profiles:
       - psitransfer
     restart: on-failure:5
-    user: 1000:1000
+    user: ${PUID:-1000}:${PGID:-1000} 
     depends_on:
       - caddy
     env_file:

infrastructure/qbittorrent/docker-compose.qbittorrent.yml

@@ -10,6 +10,9 @@ services:
       - caddy
     env_file:
       - ./qbittorrent/env/qbittorrent.env
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
     volumes:
       - qbittorrent_config:/config
       - public_data:/downloads

infrastructure/qbittorrent/env/qbittorrent.env

@@ -1,5 +1,3 @@
-PUID=1000
-PGID=1000
 TZ=Etc/UTC
 WEBUI_PORT=8080
 TORRENTING_PORT=6881

infrastructure/syncthing/docker-compose.syncthing.yml

@@ -10,9 +10,12 @@ services:
     restart: on-failure:5
     env_file:
       - ./syncthing/env/syncthing.env
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
     volumes:
       - syncthing_config:/config
-      - syncthing_data:/data1
+      - public_data:/data1
     networks:
       - infra-network
     security_opt:
@@ -21,5 +24,5 @@ services:
 volumes:
   syncthing_config:
     name: syncthing_config
-  syncthing_data:
-    name: syncthing_data
+  public_data:
+    name: public_data

infrastructure/syncthing/env/syncthing.env

@@ -1,2 +0,0 @@
-PUID=1000
-PGID=1000

infrastructure/transmission/docker-compose.transmission.yml

@@ -10,6 +10,9 @@ services:
       - caddy
     env_file:
       - ./transmission/env/transmission.env
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
     volumes:
       - transmission_config:/config
       - public_data:/downloads

infrastructure/transmission/env/transmission.env

@@ -1,5 +1,3 @@
-PUID=1000
-PGID=1000
 TZ=Etc/UTC
 USER=admin
 PASS=4vqXCNGG09JUBe7rXkuQS8MG7ovE6Vxj