Merge branch 'ZFSMigrate': Migrate Nextcloud to per-service ZFS datasets.

beszel/compose.full

@@ -1,27 +0,0 @@
-services:
-  beszel:
-    image: henrygd/beszel:latest
-    container_name: beszel
-    restart: unless-stopped
-    environment:
-      APP_URL: http://localhost:8090
-    ports:
-      - 8090:8090
-    volumes:
-      - ./beszel_data:/beszel_data
-      - ./beszel_socket:/beszel_socket
-
-  beszel-agent:
-    image: henrygd/beszel-agent:latest
-    container_name: beszel-agent
-    restart: unless-stopped
-    network_mode: host
-    volumes:
-      - ./beszel_agent_data:/var/lib/beszel-agent
-      - ./beszel_socket:/beszel_socket
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      LISTEN: /beszel_socket/beszel.sock
-      HUB_URL: http://localhost:8090
-      TOKEN: da52524a-fa93-47ef-908c-dd001c9e8e18
-      KEY: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFgDayLLA8JOzQ7fZtqTlUaRIQvhtoYSZvkUC9PrdQJG"

beszel/compose.hubonly

@@ -1,13 +0,0 @@
-services:
-  beszel:
-    image: henrygd/beszel:latest
-    container_name: beszel
-    restart: unless-stopped
-    environment:
-      APP_URL: http://localhost:8090
-    ports:
-      - 8090:8090
-    volumes:
-      - ./beszel_data:/beszel_data
-      - ./beszel_socket:/beszel_socket
-

beszel/compose.yaml

@@ -8,8 +8,8 @@ services:
     ports:
       - 8090:8090
     volumes:
-      - ./beszel_data:/beszel_data
-      - ./beszel_socket:/beszel_socket
+      - /var/lib/beszel/beszel_data:/beszel_data
+      - /var/lib/beszel/beszel_socket:/beszel_socket
 
   beszel-agent:
     image: henrygd/beszel-agent:latest
@@ -17,8 +17,8 @@ services:
     restart: unless-stopped
     network_mode: host
     volumes:
-      - ./beszel_agent_data:/var/lib/beszel-agent
-      - ./beszel_socket:/beszel_socket
+      - /var/lib/beszel/beszel_agent_data:/var/lib/beszel-agent
+      - /var/lib/beszel/beszel_socket:/beszel_socket
       - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
       LISTEN: /beszel_socket/beszel.sock

gitea/compose.yaml

@@ -18,7 +18,7 @@ services:
     networks:
       - gitea
     volumes:
-      - /mnt/storage/appdata/gitea/data:/data
+      - /var/lib/gitea/data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
@@ -38,6 +38,6 @@ services:
     networks:
       - gitea
     volumes:
-      - /mnt/storage/appdata/gitea/mysql:/var/lib/mysql
+      - /var/lib/gitea/db:/var/lib/mysql
 
       

immich/.env

@@ -1,9 +1,9 @@
 # You can find documentation for all the supported env variables at https://immich.app/docs/install/environment-variables
 
 # The location where your uploaded files are stored
-UPLOAD_LOCATION=/mnt/storage/appdata/immich/library
+UPLOAD_LOCATION=/var/lib/immich/data
 # The location where your database files are stored
-DB_DATA_LOCATION=/mnt/storage/appdata/immich/postgres
+DB_DATA_LOCATION=/var/lib/immich/db
 
 # To set a timezone, uncomment the next line and change Etc/UTC to a TZ identifier from this list: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
 TZ=America/New_York

jellyfin/compose.yaml

@@ -4,19 +4,19 @@ services:
     container_name: jellyfin
     network_mode: 'host'
     volumes:
-      - /mnt/storage/appdata/jellyfin/config:/config
-      - /mnt/storage/appdata/jellyfin/config/web-config.json:/jellyfin/jellyfin-web/config.json
-      - /mnt/storage/appdata/jellyfin/cache:/cache
+      - /etc/jellyfin:/config
+#      - /etc/jellyfin/web-config.json:/jellyfin/jellyfin-web/config.json
+      - /var/lib/jellyfin/cache:/cache
       - /mnt/cygnus:/cygnus:ro
       - type: bind
-        source: /mnt/storage/appdata/jellyfin/media
+        source: /var/lib/jellyfin/media
         target: /media
         read_only: true
     restart: 'unless-stopped'
     # Optional - alternative address used for autodiscovery
-    # environment:
-    #   - JELLYFIN_PublishedServerUrl=http://example.com
+    environment:
+      - JELLYFIN_PublishedServerUrl=http://127.0.0.1:8096
     # Optional - may be necessary for docker healthcheck to pass if running in host network mode
     # extra_hosts:
     #   - 'host.docker.internal:host-gateway'
-      
+    

nextcloud/compose.yaml

@@ -4,7 +4,7 @@ services:
     restart: always
     command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
     volumes:
-      - /mnt/storage/appdata/nextcloud/mysql:/var/lib/mysql
+      - /var/lib/nextcloud/db:/var/lib/mysql
     networks:
       - default
     environment:
@@ -21,7 +21,7 @@ services:
     ports:
       - 8080:80
     volumes:
-      - /mnt/storage/appdata/nextcloud/www/html:/var/www/html
+      - /var/lib/nextcloud/data/www/html:/var/www/html
     networks:
       - default
     environment:

portainer/compose.yaml

@@ -1,33 +1,16 @@
 services:
   portainer:
-    image: portainer/portainer:latest
+    image: portainer/portainer-ce:lts
     container_name: portainer
     restart: unless-stopped
-    security_opt:
-      - no-new-privileges:true
-    networks:
-      - proxy
     volumes:
       - /etc/localtime:/etc/localtime:ro
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-      - /mnt/storage/appdata/portainer/data:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /var/lib/portainer:/data
     ports:
-      - 9000:9000
-    labels:
-      - "traefik.enable=false"
-      - "traefik.http.routers.portainer.entrypoints=http"
-      - "traefik.http.routers.portainer.rule=Host(`portainer.objectbrokers.com`)"
-      - "traefik.http.middlewares.portainer-https-redirect.redirectscheme.scheme=https"
-      - "traefik.http.routers.portainer.middlewares=portainer-https-redirect"
-      - "traefik.http.routers.portainer-secure.entrypoints=https"
-      - "traefik.http.routers.portainer-secure.rule=Host(`portainer.objectbrokers.com`)"
-      - "traefik.http.routers.portainer-secure.tls=true"
-      - "traefik.http.routers.portainer-secure.tls.certresolver=http"
-      - "traefik.http.routers.portainer-secure.service=portainer"
-      - "traefik.http.services.portainer.loadbalancer.server.port=9000"
-      - "traefik.docker.network=proxy"
+      - 9443:9443
+      - 8000:8000
 
 networks:
-  proxy:
-    external: true
-    
+  default:
+    name: portainer_network

prometheus/compose.yaml

@@ -1,88 +0,0 @@
-volumes:
-  prometheus_data: {}
-  grafana_data: {}
-
-networks:
-  monitoring:
-    driver: bridge
-
-services:
-  prometheus:
-    image: prom/prometheus:latest
-    container_name: prometheus
-    volumes:
-      - ./prometheus:/etc/prometheus
-      - prometheus_data:/prometheus
-    command:
-      - '--config.file=/etc/prometheus/prometheus.yml'
-      - '--storage.tsdb.path=/prometheus'
-      - '--web.console.libraries=/usr/share/prometheus/console_libraries'
-      - '--web.console.templates=/usr/share/prometheus/consoles'
-      - '--web.enable-lifecycle'
-    ports:
-      - "9098:9090"
-    networks:
-      - monitoring
-    restart: unless-stopped
-
-  node-exporter:
-    image: prom/node-exporter:latest
-    container_name: node-exporter
-    volumes:
-      - /proc:/host/proc:ro
-      - /sys:/host/sys:ro
-      - /:/rootfs:ro
-    command:
-      - '--path.procfs=/host/proc'
-      - '--path.sysfs=/host/sys'
-      - '--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|host|etc)($|/)'
-    ports:
-      - "9100:9100"
-    networks:
-      - monitoring
-    restart: unless-stopped
-
-  cadvisor:
-    image: gcr.io/cadvisor/cadvisor:latest
-    container_name: cadvisor
-    volumes:
-      - /:/rootfs:ro
-      - /var/run:/var/run:rw
-      - /sys:/sys:ro
-      - /var/lib/docker/:/var/lib/docker:ro
-      - /dev/disk/:/dev/disk:ro
-    ports:
-      - "8080:8080"
-    networks:
-      - monitoring
-    restart: unless-stopped
-
-  grafana:
-    image: grafana/grafana:latest
-    container_name: grafana
-    volumes:
-      - grafana_data:/var/lib/grafana
-      - ./grafana/provisioning:/etc/grafana/provisioning
-    environment:
-      - GF_SECURITY_ADMIN_USER=admin
-      - GF_SECURITY_ADMIN_PASSWORD=admin
-      - GF_USERS_ALLOW_SIGN_UP=false
-    ports:
-      - "3000:3000"
-    networks:
-      - monitoring
-    restart: unless-stopped
-
-  alertmanager:
-    image: prom/alertmanager:latest
-    container_name: alertmanager
-    volumes:
-      - ./alertmanager:/etc/alertmanager
-    command:
-      - '--config.file=/etc/alertmanager/config.yml'
-      - '--storage.path=/alertmanager'
-    ports:
-      - "9093:9093"
-    networks:
-      - monitoring
-    restart: unless-stopped

prometheus/prometheus.yml

@@ -1,13 +0,0 @@
-global:
-  scrape_interval: 15s
-
-scrape_configs:
-  - job_name: 'prometheus'
-    static_configs:
-      - targets: ['localhost:9098']
-
-  - job_name: 'docker'
-    static_configs:
-      - targets: ['172.17.0.1:9323']
-
-

vaultwarden/compose.yaml

@@ -8,10 +8,10 @@ services:
       - 8030:80
     environment:
 #      - DOMAIN='https://vaultwarden.objectbrokers.com'
-      - ADMIN_TOKEN="llanfairpwll"
+      - ADMIN_TOKEN=mfLzuPlsXDqtIwTGSN/oZ3cgmFKWXY/zv+hO94gtqsJeHdl7+O+tJeMZrTzQNMfI
 #      DOMAIN: "https://vaultwarden.objectbrokers.com"  # Your domain; vaultwarden needs to know it's https to work properly with attachments
 #      ADMIN_TOKEN: ADMIN_TOKEN=${VAULTWARDEN_ADMIN_TOKEN}
     volumes:
-      - /mnt/storage/appdata/bitwarden:/data
+      - /var/lib/vaultwarden:/data