Syncthing working on truenas

compose/truenas-apps.yaml

@@ -36,7 +36,6 @@ services:
       - /mnt/hdd/apps/adguard/work:/opt/adguardhome/work
       - /mnt/hdd/apps/adguard/conf:/opt/adguardhome/conf
       - /mnt/hdd/apps/certbot/etc:/etc/letsencrypt
-      - /mnt/hdd/apps/certbot/var:/var/lib/letsencrypt
 
   certbot:
     container_name: certbot
@@ -85,7 +84,7 @@ services:
       - "--console-address"
       - "s3.balsillie.house:443"
       - "--certs-dir"
-      - "/etc/letsencrypt/live/adguard.balsillie.house"
+      - "/etc/letsencrypt/live/adguard.balsillie.house-0002"
       - "/data"
     networks:
       apps:
@@ -94,7 +93,6 @@ services:
     volumes:
       - /mnt/hdd/s3:/data
       - /mnt/hdd/apps/certbot/etc:/etc/letsencrypt
-      - /mnt/hdd/apps/certbot/var:/var/lib/letsencrypt
 
   registry:
     container_name: registry
@@ -112,7 +110,6 @@ services:
       - /mnt/hdd/apps/registry:/etc/distribution
       - /mnt/hdd/registry:/var/lib/registry
       - /mnt/hdd/apps/certbot/etc:/etc/letsencrypt
-      - /mnt/hdd/apps/certbot/var:/var/lib/letsencrypt
 
   sort:
     container_name: sort
@@ -134,11 +131,13 @@ services:
 
   sync:
     container_name: sync
-    image: syncthing/syncthing:1
+    image: code.balsillie.net/michael/containers/syncthing:latest
     pull_policy: always
-    entrypoint: ["/bin/syncthing", "serve", "--config=/config", ]
-    command: []
     restart: unless-stopped
+    command:
+      - serve
+      - --home=/config
+      - --gui-address=http://10.96.10.15:8080
     networks: 
       apps:
         ipv4_address: 10.96.10.15
@@ -146,8 +145,6 @@ services:
     volumes:
       - /mnt/hdd/apps/syncthing:/config
       - /mnt/hdd/sync:/sync
-      - /mnt/hdd/apps/certbot/etc:/etc/letsencrypt
-      - /mnt/hdd/apps/certbot/var:/var/lib/letsencrypt
 
   nginx:
     container_name: nginx
@@ -161,17 +158,16 @@ services:
     volumes:
       - /mnt/hdd/apps/nginx/default.conf:/etc/nginx/conf.d/default.conf
       - /mnt/hdd/apps/certbot/etc:/etc/letsencrypt
-      - /mnt/hdd/apps/certbot/var:/var/lib/letsencrypt
 
-  unifi:
+  # unifi:
-    container_name: unifi
+  #   container_name: unifi
-    image: goofball222/unifi:8.6.9
+  #   image: goofball222/unifi:8.6.9
-    pull_policy: always
+  #   pull_policy: always
-    restart: unless-stopped
+  #   restart: unless-stopped
-    networks: 
+  #   networks: 
-      apps:
+  #     apps:
-        ipv4_address: 10.96.10.17
+  #       ipv4_address: 10.96.10.17
-        link_local_ips: []
+  #       link_local_ips: []
-    volumes:
+  #   volumes:
-      - /mnt/hdd/apps/unifi:/usr/lib/unifi/data
+  #     - /mnt/hdd/apps/unifi:/usr/lib/unifi/data
 

nginx/truenas.conf

@@ -0,0 +1,39 @@
+server {
+	listen 80 default_server;
+	server_name _;
+	return 301 https://$host$request_uri;
+}
+
+                             
+ssl_certificate /etc/letsencrypt/live/adguard.balsillie.house/fullchain.pem;
+ssl_certificate_key /etc/letsencrypt/live/adguard.balsillie.house/privkey.pem;
+
+server {
+    listen 443 ssl;
+    server_name sync-admin.balsillie.house;
+    http2 on;
+    location / {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://10.96.10.15:8080/;
+        proxy_read_timeout      600s;
+        proxy_send_timeout      600s;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name unifi.balsillie.house;
+    http2 on;
+    location / {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://10.96.10.17:8080/;
+        proxy_read_timeout      600s;
+        proxy_send_timeout      600s;
+    }
+}