Makefile

@@ -13,7 +13,7 @@
 
 DOCKER := docker
 
-PROFILES := webserver wordpress adminer uptime-kuma portainer qbittorrent gitea jellyfin watchtower backup openssh
+PROFILES := webserver wordpress adminer uptime-kuma portainer qbittorrent gitea jellyfin watchtower backup
 PROFILE_CMD := $(addprefix --profile ,$(PROFILES))
 
 COMPOSE_FILES :=  $(shell find docker-compose*.yml | sed -e 's/^/--file /')

caddy/bensuperpc.org/Caddyfile

@@ -56,10 +56,6 @@ jellyfin.bensuperpc.org {
 	reverse_proxy jellyfin:8096
 }
 
-ssh.bensuperpc.org {
-	reverse_proxy openssh:2222
-}
-
 link.bensuperpc.org {
 	redir /rickroll https://www.youtube.com/watch?v=dQw4w9WgXcQ permanent
 	redir /babyshark https://www.youtube.com/watch?v=XqZsoesa55w permanent

docker-compose.adminer.yml

@@ -1,19 +0,0 @@
-version: '3.9'
-
-services:
-  # Adminer
-  adminer:
-    image: adminer:latest
-    container_name: adminer
-    profiles:
-      - adminer
-    restart: on-failure
-    env_file: 
-      - env/adminer.env
-    depends_on:
-      - wordpress_db
-      - caddy
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true

docker-compose.backup.yml

@@ -12,19 +12,9 @@ services:
       - env/backup.env
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      - backup:/archive
       - caddy_data:/backup/caddy_data:ro
       - caddy_config:/backup/caddy_config:ro
-#      - gitea_data:/backup/gitea_data:ro
-#      - gitea_config:/backup/gitea_config:ro
-#      - database:/backup/database:ro
-#      - wordpress:/backup/wordpress:ro
-#      - jellyfin_config:/backup/jellyfin_config:ro
-#      - jellyfin_data:/backup/jellyfin_data:ro
-#      - jellyfin_cache:/backup/jellyfin_cache:ro
-#      - qbittorrent_config:/backup/qbittorrent_config:ro
-#      - qbittorrent_data:/backup/qbittorrent_data:ro
-#      - uptimekuma_data:/backup/uptimekuma_data:ro
+      - backup:/archive
     networks:
       - infra-network
     security_opt:

docker-compose.openssh.yml

@@ -1,25 +0,0 @@
-version: '3.9'
-
-services:
-  # Openssh
-  openssh:
-    image: linuxserver/openssh-server:latest
-    container_name: openssh
-    profiles:
-      - openssh
-    restart: on-failure
-    env_file:
-      - env/openssh.env
-    volumes:
-      - openssh_config:/config
-      - openssh_data:/data
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-
-volumes:
-  openssh_config:
-    name: openssh_config
-  openssh_data:
-    name: openssh_data

docker-compose.wordpress.yml

@@ -41,6 +41,23 @@ services:
     security_opt:
       - no-new-privileges:true
 
+  # Adminer
+  adminer:
+    image: adminer:latest
+    container_name: adminer
+    profiles:
+      - adminer
+    restart: on-failure
+    env_file: 
+      - env/adminer.env
+    depends_on:
+      - wordpress_db
+      - caddy
+    networks:
+      - infra-network
+    security_opt:
+      - no-new-privileges:true
+
 volumes:
   database:
     name: database

env/openssh.env

@@ -1,11 +0,0 @@
-PUID=1000
-PGID=1000
-PUBLIC_KEY=
-# PUBLIC_KEY_FILE=
-# PUBLIC_KEY_DIR=
-# PUBLIC_KEY_URL=
-SUDO_ACCESS=false
-PASSWORD_ACCESS=false
-# USER_PASSWORD=
-# USER_PASSWORD_FILE=
-# USER_NAME=