cam added ftps, ddp added homarr v1 - but import didnt work, both need more work, but commiting for now as ftps did not have a restart clause and would not come back on reboot, fixed now

docker-compose.yml

@@ -145,7 +145,7 @@ services:
   emby:
     container_name: emby
 #    image:  emby/embyserver:latest
-    image: emby/embyserver:4.9.0.41
+    image: emby/embyserver:4.9.0.42
     restart: always
     network_mode: host
     environment:
@@ -1206,18 +1206,63 @@ services:
       - "com.centurylinklabs.watchtower.enable=true"
       - "traefik.enable=false"
 
+  ftps:
+    build: /srv/docker/container/ftps
+    container_name: ftps
+    restart: always
+      #restart: unless-stopped
+      #network_mode: host
+    ports:
+    # active ports
+      - "40021:21"
+    # passive ports
+      - "30000-30010:30000-30010"
+    volumes:
+      - /home:/home
+      - /srv/docker/container/ftps/certs:/etc/vsftpd/certs
+      - /srv/docker/container/ftps/ftp_data:/var/ftp
+      - /srv/docker/container/ftps/nslcd.conf.template:/etc/nslcd.conf.template
+      - /srv/docker/container/ftps/vsftpd.conf:/etc/vsftpd.conf
+      - /srv/docker/container/ftps/pam.d/vsftpd:/etc/pam.d/vsftpd
+    env_file:
+      - /srv/docker/container/ftps/.env
+    depends_on:
+      - adguard
+    labels:
+      - "com.centurylinklabs.watchtower.enable=false"
+
   homarr:
     container_name: homarr
-    image: ghcr.io/ajnart/homarr:latest
+    image: ghcr.io/ajnart/homarr:0.15.10
     restart: unless-stopped
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock # Optional, only if you want docker integration
-      - /srv/docker/container/homarr/configs:/app/data/configs
+      - /srv/docker/container/oldhomarr/configs:/app/data/configs
-      - /srv/docker/container/homarr/icons:/app/public/icons
+      - /srv/docker/container/oldhomarr/icons:/app/public/icons
-      - /srv/docker/container/homarr/data:/data
+      - /srv/docker/container/oldhomarr/data:/data
+#    ports:
+#        - "7575:7575"
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
+      - "traefik.enable=true"
+      - "traefik.http.routers.oldhomarr.rule=Host(`homarr.ddp.net`) || Host(`mara.ddp.net`)"
+      - "traefik.http.routers.oldhomarr.entrypoints=web"
+      - "traefik.http.services.oldhomarr.loadbalancer.server.port=7575"
+      - "last.commit.url=https://api.github.com/repos/ajnart/homarr/commits"
+
+  newhomarr:
+    container_name: newhomarr
+    image: ghcr.io/homarr-labs/homarr:latest
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock # Optional, only if you want docker integration
+      - /srv/docker/container/homarr/appdata:/appdata
+    env_file:
+      - /srv/docker/config/secrets/homarr
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
       - "traefik.enable=true"
       - "traefik.http.routers.homarr.rule=Host(`homarr.ddp.net`) || Host(`mara.ddp.net`)"
       - "traefik.http.routers.homarr.entrypoints=web"
-      - "last.commit.url=https://api.github.com/repos/ajnart/homarr/commits"
+      - "traefik.http.services.homarr.loadbalancer.server.port=7575"
+      - "last.commit.url=https://api.github.com/repos/homarr-labs/homarr/commits"

secrets/pihole

@@ -1 +0,0 @@
-WEBPASSWORD='O701JH&%fDqIw836eTiw1LxzlGw!sn%c'

secrets/wiki-common_old

@@ -1,2 +0,0 @@
-POSTGRES_PASSWORD=NOE82KzuLOr46EvJOJEmSXr4WW8Lt79Gdmr4n6eD765UHjaD22bvgs1cnU9x4RCn
-DB_PASS=${POSTGRES_PASSWORD}