Merge pull request 'pocketid template fix' (#64 ) from dev into main

Reviewed-on: #64
pocketid template fix
2025-10-04 19:12:23 +00:00 · 2025-10-04 21:07:58 +02:00 · 2025-10-04 19:01:23 +00:00 · 2025-10-04 20:54:12 +02:00 · 2025-09-07 20:58:50 +00:00 · 2025-09-07 22:58:14 +02:00
19 changed files with 804 additions and 62 deletions
--- a/applications-tree.json
+++ b/applications-tree.json
--- a/immich/service-immich.json
+++ b/immich/service-immich.json
@@ -29,7 +29,7 @@
            "IMAGE": "tensorchord/pgvecto-rs:pg14-v0.2.0",
            "UPDATE": "true",
            "NAME": "immichpostgres-db",
-            "MEMORY": "512M",
+            "MEMORY": "768M",
            "NETWORK": "immich-net",
            "SELECTOR": "immichpostgres",
            "VOLUMES": [
@@ -49,6 +49,11 @@
            "ENV_FILES": [
                "/etc/user/secret/immich/immich.json"
            ],
+            "ENVS": [
+                {
+                    "POSTGRES_INITDB_ARGS": "--data-checksums"
+                }
+            ],
            "EXTRA": "--restart always",
            "DEPEND": "null",
            "START_ON_BOOT": "false",
--- a/matrix/domain-matrix-admin.json
+++ b/matrix/domain-matrix-admin.json
@@ -0,0 +1,63 @@
+{
+    "main": {
+        "SERVICE_NAME": "matrix",
+        "DOMAIN": "#ADMINDOMAIN"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/domain-check",
+            "UPDATE": "true",
+            "MEMORY": "64M",
+            "NAME": "domain_checker",
+            "ROLES": "domain_checker",
+            "NETWORK": "host",
+            "SELECTOR": "",
+            "SCALE": "0",
+            "EXTRA": "--rm --privileged",
+            "PRE_START": [],
+            "DEPEND": [],
+            "POST_START": [],
+            "CMD": "",
+            "ENVS": [
+                {
+                    "PROXY": "smarthostloadbalancer"
+                },
+                {
+                    "TARGET": "matrixadmin"
+                },
+                {
+                    "PORT": "80"
+                },
+                {
+                    "DOMAIN": "#ADMINDOMAIN"
+                },
+                {
+                    "SMARTHOST_PROXY_PATH": "/smarthost-domains"
+                },
+                {
+                    "LOCATION": "#SUBPATH"
+                },
+                {
+                    "OPERATION": "CREATE"
+                }
+            ],
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/config/smarthost-domains",
+                    "DEST": "/smarthost-domains",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ]
+        }
+    ]
+}
--- a/matrix/domain-matrix.json
+++ b/matrix/domain-matrix.json
@@ -0,0 +1,60 @@
+{
+    "main": {
+        "SERVICE_NAME": "matrix",
+        "DOMAIN": "#DOMAIN"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/domain-check",
+            "UPDATE": "true",
+            "MEMORY": "64M",
+            "NAME": "domain_checker",
+            "ROLES": "domain_checker",
+            "NETWORK": "host",
+            "SELECTOR": "",
+            "SCALE": "0",
+            "EXTRA": "--rm --privileged",
+            "PRE_START": [],
+            "DEPEND": [],
+            "POST_START": [],
+            "CMD": "",
+            "ENVS": [
+                {
+                    "PROXY": "smarthostloadbalancer"
+                },
+                {
+                    "TARGET": "matrixserver"
+                },
+                {
+                    "PORT": "8008"
+                },
+                {
+                    "DOMAIN": "#DOMAIN"
+                },
+                {
+                    "SMARTHOST_PROXY_PATH": "/smarthost-domains"
+                },
+                {
+                    "OPERATION": "CREATE"
+                }
+            ],
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/config/smarthost-domains",
+                    "DEST": "/smarthost-domains",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ]
+        }
+    ]
+}
--- a/matrix/firewall-matrix-admin.json
+++ b/matrix/firewall-matrix-admin.json
@@ -0,0 +1,75 @@
+{
+    "main": {
+        "SERVICE_NAME": "firewalls",
+        "DOMAIN": "null"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/firewall",
+            "NAME": "firewall",
+            "MEMORY": "64M",
+            "NETWORK": "host",
+            "SCALE": "0",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/run/",
+                    "DEST": "/run/",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services",
+                    "DEST": "/services",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "ENVS": [
+                {
+                    "CHAIN": "DOCKER-USER"
+                },
+                {
+                    "SOURCE": "smarthostbackend"
+                },
+                {
+                    "TARGET": "matrixadmin"
+                },
+                {
+                    "TYPE": "tcp"
+                },
+                {
+                    "TARGET_PORT": "80"
+                },
+                {
+                    "COMMENT": "matrixadmin for proxy"
+                }
+            ],
+            "EXTRA": "--privileged --rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        }
+    ]
+}
--- a/matrix/firewall-matrix-dns.json
+++ b/matrix/firewall-matrix-dns.json
@@ -0,0 +1,76 @@
+{
+    "main": {
+        "SERVICE_NAME": "firewalls",
+        "DOMAIN": "null"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/firewall",
+            "UPDATE": "true",
+            "NAME": "firewall",
+            "MEMORY": "64M",
+            "NETWORK": "host",
+            "SCALE": "0",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/run/",
+                    "DEST": "/run/",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services",
+                    "DEST": "/services",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "ENVS": [
+                {
+                    "CHAIN": "DOCKER-USER"
+                },
+                {
+                    "SOURCE": "matrixserver"
+                },
+                {
+                    "TARGET": "coredns"
+                },
+                {
+                    "TYPE": "udp"
+                },
+                {
+                    "TARGET_PORT": "53"
+                },
+                {
+                    "COMMENT": "matrix nginx access for local dns"
+                }
+            ],
+            "EXTRA": "--privileged --rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "",
+            "PRE_START": [],
+            "POST_START": []
+        }
+    ]
+}
--- a/matrix/firewall-matrix-smtp.json
+++ b/matrix/firewall-matrix-smtp.json
@@ -0,0 +1,75 @@
+{
+    "main": {
+        "SERVICE_NAME": "firewalls",
+        "DOMAIN": "null"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/firewall",
+            "NAME": "firewall",
+            "MEMORY": "64M",
+            "NETWORK": "host",
+            "SCALE": "0",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/run/",
+                    "DEST": "/run/",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services",
+                    "DEST": "/services",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "ENVS": [
+                {
+                    "CHAIN": "DOCKER-USER"
+                },
+                {
+                    "SOURCE": "matrixserver"
+                },
+                {
+                    "TARGET": "smtp"
+                },
+                {
+                    "TYPE": "tcp"
+                },
+                {
+                    "TARGET_PORT": "25"
+                },
+                {
+                    "COMMENT": "matrix to smtp"
+                }
+            ],
+            "EXTRA": "--privileged --rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        }
+    ]
+}
--- a/matrix/firewall-matrix.json
+++ b/matrix/firewall-matrix.json
@@ -0,0 +1,75 @@
+{
+    "main": {
+        "SERVICE_NAME": "firewalls",
+        "DOMAIN": "null"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/firewall",
+            "NAME": "firewall",
+            "MEMORY": "64M",
+            "NETWORK": "host",
+            "SCALE": "0",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/run/",
+                    "DEST": "/run/",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services",
+                    "DEST": "/services",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "ENVS": [
+                {
+                    "CHAIN": "DOCKER-USER"
+                },
+                {
+                    "SOURCE": "smarthostbackend"
+                },
+                {
+                    "TARGET": "matrixserver"
+                },
+                {
+                    "TYPE": "tcp"
+                },
+                {
+                    "TARGET_PORT": "8008"
+                },
+                {
+                    "COMMENT": "matrix"
+                }
+            ],
+            "EXTRA": "--privileged --rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        }
+    ]
+}
--- a/matrix/matrix-secret.json
+++ b/matrix/matrix-secret.json
@@ -0,0 +1,29 @@
+{
+    "matrixpostgres": {
+        "POSTGRES_DB": "#POSTGRES_DB",
+        "POSTGRES_USER": "#POSTGRES_USER",
+        "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
+        "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
+    },
+    "matrixserver": {
+        "DB_TYPE": "psycopg2",
+        "POSTGRES_DB": "#POSTGRES_DB",
+        "POSTGRES_USER": "#POSTGRES_USER",
+        "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
+        "POSTGRES_HOST": "matrixpostgres-db",
+        "DB_PORT": "5432",
+        "SYNAPSE_SERVER_NAME": "#DOMAIN",
+        "SYNAPSE_REPORT_STATS": "no",
+        "ADMIN_USERNAME": "#ADMIN_USERNAME",
+        "ADMIN_PASSWORD": "#ADMIN_PASSWORD",
+        "SYNAPSE_CONFIG_DIR": "/data",
+        "SYNAPSE_CONFIG_PATH": "/data/homeserver.yaml",
+        "SYNAPSE_DATA_DIR": "/data"
+    },
+    "matrixadmin": {
+        "REACT_APP_SERVER": "https://#DOMAIN",
+        "BASE_PATH": "#ADMINDOMAIN",
+        "ADMINDOMAIN": "#ADMINDOMAIN",
+        "SUBPATH": "#SUBPATH"
+    }
+}
--- a/matrix/service-matrix.json
+++ b/matrix/service-matrix.json
@@ -0,0 +1,199 @@
+{
+    "main": {
+        "SERVICE_NAME": "matrix",
+        "DOMAIN": "DOMAIN"
+    },
+    "containers": [
+        {
+            "IMAGE": "alpine:latest",
+            "UPDATE": "true",
+            "NAME": "matrix-init",
+            "NETWORK": "host",
+            "MEMORY": "64M",
+            "VOLUMES": [
+                {
+                    "SOURCE": "USER_DATA",
+                    "DEST": "/etc/user/data",
+                    "TYPE": "rw"
+                }
+            ],
+            "ENV_FILES": [
+                "/etc/user/secret/matrix/matrix.json"
+            ],
+            "EXTRA": "--rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "ENTRYPOINT": "sh -c",
+            "CMD": "mkdir -p /etc/user/data/matrix/db && mkdir -p /etc/user/data/matrix/synapse",
+            "PRE_START": "null",
+            "POST_START": "null"
+        },
+        {
+            "IMAGE": "postgres:alpine",
+            "UPDATE": "true",
+            "NAME": "matrixpostgres-db",
+            "ROLES": "postgres-db",
+            "MEMORY": "256M",
+            "NETWORK": "matrix-net",
+            "SELECTOR": "matrixpostgres-db",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/data/matrix/db",
+                    "DEST": "/var/lib/postgresql/data",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [
+                {
+                    "SOURCE": "null",
+                    "DEST": "5432",
+                    "TYPE": "tcp"
+                }
+            ],
+            "ENV_FILES": [
+                "/etc/user/secret/matrix/matrix.json"
+            ],
+            "ENVS": [
+                {
+                    "POSTGRES_INITDB_ARGS": "--encoding=UTF-8 --lc-collate=C --lc-ctype=C"
+                }
+            ],
+            "EXTRA": "--restart unless-stopped",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": [],
+            "POST_START": []
+        },
+        {
+            "IMAGE": "matrixdotorg/synapse",
+            "UPDATE": "true",
+            "NAME": "matrixserver-init",
+            "ROLES": "backend-www",
+            "MEMORY": "512M",
+            "NETWORK": "matrix-net",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/data/matrix/synapse",
+                    "DEST": "/data",
+                    "TYPE": "rw"
+                }
+            ],
+            "ENV_FILES": [
+                "/etc/user/secret/matrix/matrix.json"
+            ],
+            "EXTRA": "--rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "ENTRYPOINT": "bash -c",
+            "CMD": "if [ ! -f /data/homeserver.yaml ]; then /start.py generate ; else exit 1; fi",
+            "PRE_START": [],
+            "POST_START": []
+        },
+        {
+            "IMAGE": "safebox/matrix-setup:latest",
+            "UPDATE": "true",
+            "NAME": "matrixserver-dbinit",
+            "NETWORK": "host",
+            "MEMORY": "64M",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/data/matrix/synapse",
+                    "DEST": "/data",
+                    "TYPE": "rw"
+                }
+            ],
+            "ENV_FILES": [
+                "/etc/user/secret/matrix/matrix.json"
+            ],
+            "EXTRA": "--rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        },
+        {
+            "IMAGE": "matrixdotorg/synapse",
+            "UPDATE": "true",
+            "NAME": "matrixserver-app",
+            "ROLES": "backend-www",
+            "MEMORY": "512M",
+            "NETWORK": "matrix-net",
+            "SELECTOR": "matrixserver",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/data/matrix/synapse",
+                    "DEST": "/data",
+                    "TYPE": "rw"
+                }
+            ],
+            "ENV_FILES": [
+                "/etc/user/secret/matrix/matrix.json"
+            ],
+            "EXTRA": "--restart unless-stopped",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": [],
+            "POST_START": [
+                "firewall-matrix",
+                "domain-matrix"
+            ]
+        },
+        {
+            "IMAGE": "safebox/matrix-setup:latest",
+            "UPDATE": "true",
+            "NAME": "matrixserver-finalize",
+            "NETWORK": "host",
+            "MEMORY": "64M",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/data/matrix/synapse",
+                    "DEST": "/data",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "SHARED",
+                    "DEST": "/var/tmp/shared",
+                    "TYPE": "rw"
+                }
+            ],
+            "ENV_FILES": [
+                "/etc/user/secret/matrix/matrix.json"
+            ],
+            "EXTRA": "--rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        },
+        {
+            "IMAGE": "awesometechnologies/synapse-admin",
+            "UPDATE": "true",
+            "NAME": "matrixadmin",
+            "ROLES": "backend-www",
+            "MEMORY": "128M",
+            "NETWORK": "matrix-net",
+            "SELECTOR": "matrixadmin",
+            "VOLUMES": [],
+            "PORTS": [
+                {
+                    "SOURCE": "null",
+                    "DEST": "80",
+                    "TYPE": "tcp"
+                }
+            ],
+            "EXTRA": "--restart unless-stopped",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": [],
+            "POST_START": [
+                "firewall-matrix-admin",
+                "domain-matrix-admin"
+            ]
+        }
+    ]
+}
--- a/matrix/template.json
+++ b/matrix/template.json
--- a/nextcloud/domain-nextcloud.json
+++ b/nextcloud/domain-nextcloud.json
@@ -1,48 +1,60 @@
- {
-    "main": { 
-      "SERVICE_NAME": "nextcloud",
-      "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS"
+{
+    "main": {
+        "SERVICE_NAME": "nextcloud",
+        "DOMAIN": "#DOMAIN"
    },
    "containers": [
-      { 
-  "IMAGE": "safebox/domain-check",
-	"UPDATE": "true",
-  "MEMORY": "64M",
-	"NAME": "domain_checker", 
-	"ROLES": "domain_checker", 
-	"NETWORK": "host", 
-	"SELECTOR": "",
-	"SCALE": "0", 
-	"EXTRA": "--rm --privileged",
-	"PRE_START": [], 
-	"DEPEND": [], 
-	"POST_START": [], 
-	"CMD": "",
-        "ENVS": [
-          { "PROXY": "smarthostloadbalancer" },
-          { "TARGET": "nextcloudnginx" },
-          { "PORT": "80" },
-          { "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS" },
-          { "SMARTHOST_PROXY_PATH": "/smarthost-domains" },
-	        { "OPERATION": "CREATE" }
-        ],
-        "VOLUMES": [
-          {
-       	"SOURCE": "/etc/user/config/smarthost-domains",
-        "DEST": "/smarthost-domains",
-        "TYPE": "rw"
-          },
-	        {
-	      "SOURCE": "/etc/system/data/dns/hosts.local",
-	      "DEST": "/etc/dns/hosts.local",
-	      "TYPE": "ro"
-	        },
-          { 
-	      "SOURCE": "/var/run/docker.sock", 
-	      "DEST": "/var/run/docker.sock", 
-	      "TYPE": "rw" 
-          }
-	    ]
-    }
-  ]
-}
+        {
+            "IMAGE": "safebox/domain-check",
+            "UPDATE": "true",
+            "MEMORY": "64M",
+            "NAME": "domain_checker",
+            "ROLES": "domain_checker",
+            "NETWORK": "host",
+            "SELECTOR": "",
+            "SCALE": "0",
+            "EXTRA": "--rm --privileged",
+            "PRE_START": [],
+            "DEPEND": [],
+            "POST_START": [],
+            "CMD": "",
+            "ENVS": [
+                {
+                    "PROXY": "smarthostloadbalancer"
+                },
+                {
+                    "TARGET": "nextcloudnginx"
+                },
+                {
+                    "PORT": "80"
+                },
+                {
+                    "DOMAIN": "#DOMAIN"
+                },
+                {
+                    "SMARTHOST_PROXY_PATH": "/smarthost-domains"
+                },
+                {
+                    "OPERATION": "CREATE"
+                }
+            ],
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/config/smarthost-domains",
+                    "DEST": "/smarthost-domains",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ]
+        }
+    ]
+}
--- a/nextcloud/nextcloud-secret.json
+++ b/nextcloud/nextcloud-secret.json
@@ -8,8 +8,8 @@
    "nextcloudphp": {
        "NEXTCLOUD_ADMIN_USER": "#NEXTCLOUD_ADMIN_USER",
        "NEXTCLOUD_ADMIN_PASSWORD": "#NEXTCLOUD_ADMIN_PASSWORD",
-        "NEXTCLOUD_TRUSTED_DOMAINS": "#NEXTCLOUD_TRUSTED_DOMAINS",
-        "OVERWRITEHOST": "#NEXTCLOUD_TRUSTED_DOMAINS",
+        "DOMAIN": "#DOMAIN",
+        "OVERWRITEHOST": "#DOMAIN",
        "NEXTCLOUD_DATA_DIR": "/var/data",
        "POSTGRES_DB": "#POSTGRES_DB",
        "POSTGRES_USER": "#POSTGRES_USER",
--- a/nextcloud/template.json
+++ b/nextcloud/template.json
@@ -8,15 +8,13 @@
        {
            "title": "",
            "details": "",
-            "info": "Nextcloud domain info",
            "description": "Domain",
-            "key": "NEXTCLOUD_TRUSTED_DOMAINS",
+            "key": "DOMAIN",
            "value": "",
            "required": "true"
        },
        {
            "details": "",
-            "info": "Nextcloud user name info",
            "description": "Username",
            "key": "NEXTCLOUD_ADMIN_USER",
            "value": "",
--- a/pocketid/domain-pocketid.json
+++ b/pocketid/domain-pocketid.json
@@ -1,6 +1,6 @@
 {
    "main": {
-        "SERVICE_NAME": "vaultwarden",
+        "SERVICE_NAME": "pocketid",
        "DOMAIN": "#DOMAIN"
    },
    "containers": [
@@ -26,7 +26,7 @@
                    "TARGET": "pocketid-app"
                },
                {
-                    "PORT": "3000"
+                    "PORT": "1411"
                },
                {
                    "DOMAIN": "#DOMAIN"
--- a/pocketid/firewall-pocketid.json
+++ b/pocketid/firewall-pocketid.json
@@ -58,7 +58,7 @@
                    "TYPE": "tcp"
                },
                {
-                    "TARGET_PORT": "3000"
+                    "TARGET_PORT": "1411"
                },
                {
                    "COMMENT": "proxy for pocketid-app"
--- a/pocketid/pocketid-secret.json
+++ b/pocketid/pocketid-secret.json
@@ -11,6 +11,6 @@
        "PUID": "1000",
        "PGID": "1000",
        "DB_PROVIDER": "postgres",
-        "POSTGRES_CONNECTION_STRING": "postgresql://#POSTGRES_USER:#POSTGRES_PASSWORD@pocketidpostgres-db:5432/#POSTGRES_DB"
+        "DB_CONNECTION_STRING": "postgresql://#POSTGRES_USER:#POSTGRES_PASSWORD@pocketidpostgres-db:5432/#POSTGRES_DB"
    }
 }
--- a/pocketid/service-pocketid.json
+++ b/pocketid/service-pocketid.json
@@ -35,7 +35,7 @@
            "SELECTOR": "pocketidpostgres-db",
            "VOLUMES": [
                {
-                    "SOURCE": "/etc/user/data/pocketid/postgresql",
+                    "SOURCE": "/etc/user/data/pocketid/db",
                    "DEST": "/var/lib/postgresql/data",
                    "TYPE": "rw"
                }
@@ -63,7 +63,7 @@
            "POST_START": []
        },
        {
-            "IMAGE": "stonith404/pocket-id",
+            "IMAGE": "11notes/pocket-id:1",
            "UPDATE": "true",
            "NAME": "pocketidapp",
            "DNS": [
@@ -76,7 +76,7 @@
            "PORTS": [
                {
                    "SOURCE": "null",
-                    "DEST": "3000",
+                    "DEST": "1411",
                    "TYPE": "tcp"
                }
            ],
--- a/pocketid/template.json
+++ b/pocketid/template.json
@@ -1,9 +1,9 @@
 {
    "name": "Pocketid",
-    "title": "pocketid",
+    "title": "PocketID",
    "subtitle": "Identity management",
    "icon": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTAiIGhlaWdodD0iNTAiIHZpZXdCb3g9IjAgMCA1MCA1MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQzIDBIN0MzLjEzNDAxIDAgMCAzLjEzNDAxIDAgN1Y0M0MwIDQ2Ljg2NiAzLjEzNDAxIDUwIDcgNTBINDNDNDYuODY2IDUwIDUwIDQ2Ljg2NiA1MCA0M1Y3QzUwIDMuMTM0MDEgNDYuODY2IDAgNDMgMFoiIGZpbGw9IndoaXRlIi8+CjxwYXRoIGQ9Ik0yNC40ODc4IDdDMzEuOTM4NCA3IDM4IDEzLjEzNjMgMzggMjAuNjc4N0MzOCAyMy42NDI2IDM3LjA3OSAyNi40NjMyIDM1LjMzNjIgMjguODM0MkMzMy42Mjc4IDMxLjE1OTUgMzEuMjkwMSAzMi44NDg2IDI4LjU3NTEgMzMuNzE5OEwyNy44MjQ3IDMzLjk2MUwyNi4wMzY0IDI1LjAzMTVMMjYuNTMxMSAyNC43ODkyQzI4LjE0NTkgMjMuOTk5IDI5LjE4OTYgMjIuMzE1NiAyOS4xODk2IDIwLjUwMTJDMjkuMTg5NiAxNy44NzY0IDI3LjA4MDUgMTUuNzQwOSAyNC40ODgxIDE1Ljc0MDlDMjEuODk1OCAxNS43NDA5IDE5Ljc4NiAxNy44NzY0IDE5Ljc4NiAyMC41MDEyQzE5Ljc4NiAyMi4zMTU2IDIwLjgzIDIzLjk5OSAyMi40NDQ4IDI0Ljc4OTJMMjIuOTMwMiAyNS4wMjcyTDIwLjA0OTUgNDNIMTJWN0gyNC40ODgxSDI0LjQ4NzhaIiBmaWxsPSJibGFjayIvPgo8L3N2Zz4K",
-    "description": "PocketID is an open-source password manager and secure vault solution that allows users to store, manage, and share sensitive information such as passwords, credit card details, and personal notes. It is designed to provide a high level of security and privacy, with features like end-to-end encryption, two-factor authentication, and self-hosting options.",
+    "description": "PocketID is an open-source identity and access management solution that provides secure and efficient user authentication and authorization for web applications and services.",
    "fields": [
        {
            "description": "Domain",
Author	SHA1	Message	Date
Gyorgy Berenyi	bab3104519	Merge pull request 'pocketid template fix' (#64 ) from dev into main Reviewed-on: #64	2025-10-04 19:12:23 +00:00
thafu	2e5d817169	pocketid template fix	2025-10-04 21:07:58 +02:00
Gyorgy Berenyi	40efb47737	Merge pull request 'template fix for matrix, pocket id and nextcloud' (#63 ) from dev into main Reviewed-on: #63	2025-10-04 19:01:23 +00:00
thafu	1af65aa421	template fix for matrix, pocket id and nextcloud	2025-10-04 20:54:12 +02:00
Gyorgy Berenyi	82a2bab55e	Merge pull request 'Increase MEMORY allocation to 768M in service-immich.json' (#62 ) from dev into main Reviewed-on: #62	2025-09-07 20:58:50 +00:00
gyurix	a7d40ec41a	Increase MEMORY allocation to 768M in service-immich.json	2025-09-07 22:58:14 +02:00
Gyorgy Berenyi	680f6d5822	Merge pull request 'Add POSTGRES_INITDB_ARGS to service-immich.json for data checksums' (#61 ) from dev into main Reviewed-on: #61	2025-09-07 20:53:38 +00:00
gyurix	1af3c8ab1e	Add POSTGRES_INITDB_ARGS to service-immich.json for data checksums	2025-09-07 22:52:26 +02:00
Gyorgy Berenyi	37e7b83077	Merge pull request 'dev' (#60 ) from dev into main Reviewed-on: #60	2025-09-06 15:05:25 +00:00
gyurix	becd96416a	Refactor domain configuration to use a unified DOMAIN key across Nextcloud JSON files	2025-09-06 17:04:41 +02:00
gyurix	09371f8b4b	Update DOMAIN key in service-nextcloud.json to use NEXTCLOUD_TRUSTED_DOMAINS	2025-09-06 17:03:16 +02:00
Gyorgy Berenyi	d723b4daf5	Merge pull request 'Update description in template.json to reflect new identity management features' (#59 ) from dev into main Reviewed-on: #59	2025-09-06 14:28:58 +00:00
gyurix	56e6e4e789	Update description in template.json to reflect new identity management features	2025-09-06 16:27:40 +02:00
Gyorgy Berenyi	366fa1d6b8	Merge pull request 'Update volume destination paths in service-matrix.json and service-pocketid.json for PostgreSQL data' (#58 ) from dev into main Reviewed-on: #58	2025-09-02 12:16:51 +00:00
gyurix	f5130b0c57	Update volume destination paths in service-matrix.json and service-pocketid.json for PostgreSQL data	2025-09-02 14:16:22 +02:00
Gyorgy Berenyi	082ae8fcf8	Merge pull request 'Update EXTRA configuration in service-matrix.json for container cleanup' (#57 ) from dev into main Reviewed-on: #57	2025-09-02 09:50:06 +00:00
gyurix	1ef0fd1f5c	Update EXTRA configuration in service-matrix.json for container cleanup	2025-09-02 11:31:52 +02:00
Gyorgy Berenyi	984a61d036	Merge pull request 'Remove unnecessary EXTRA configuration from service-matrix.json' (#56 ) from dev into main Reviewed-on: #56	2025-09-02 09:17:42 +00:00
gyurix	ca41276ecf	Remove unnecessary EXTRA configuration from service-matrix.json	2025-09-02 11:14:15 +02:00
Gyorgy Berenyi	08c4e49d82	Merge pull request 'Update volume mapping in service-matrix.json for improved clarity' (#55 ) from dev into main Reviewed-on: #55	2025-09-02 09:09:09 +00:00
gyurix	7a2a4e90ed	Update volume mapping in service-matrix.json for improved clarity	2025-09-02 11:08:41 +02:00
Gyorgy Berenyi	b232e22427	Merge pull request 'Remove unused PORTS configuration from service-matrix.json' (#54 ) from dev into main Reviewed-on: #54	2025-09-02 08:56:46 +00:00
gyurix	4bb61da615	Remove unused PORTS configuration from service-matrix.json	2025-09-02 10:56:19 +02:00
Gyorgy Berenyi	2649856b30	Merge pull request 'Rename matrixserver-setup to matrixserver-dbinit and add new volume mapping for input data' (#53 ) from dev into main Reviewed-on: #53	2025-09-02 08:35:00 +00:00
gyurix	e3862bbeb7	Rename matrixserver-setup to matrixserver-dbinit and add new volume mapping for input data	2025-09-02 10:33:26 +02:00
Gyorgy Berenyi	bf944dee1b	Merge pull request 'Refactor configuration file structure for enhanced readability and organization' (#52 ) from dev into main Reviewed-on: #52	2025-09-01 14:23:30 +00:00
gyurix	fc0197dcf1	Refactor configuration file structure for enhanced readability and organization	2025-09-01 16:22:29 +02:00
Gyorgy Berenyi	bc26466fab	Merge pull request 'Update SUBPATH details in template.json for clearer usage instructions' (#51 ) from dev into main Reviewed-on: #51	2025-09-01 08:18:31 +00:00
gyurix	c30a5ceadb	Update SUBPATH details in template.json for clearer usage instructions	2025-09-01 10:17:54 +02:00
Gyorgy Berenyi	24b9f416b5	Merge pull request 'Rename LOCAL_PATH to LOCATION in domain-matrix-admin.json for clarity' (#50 ) from dev into main Reviewed-on: #50	2025-09-01 08:10:32 +00:00
gyurix	fcc452af8a	Rename LOCAL_PATH to LOCATION in domain-matrix-admin.json for clarity	2025-09-01 10:09:57 +02:00
Gyorgy Berenyi	5598cd2e4e	Merge pull request 'Update domain keys in configuration files for consistency and clarity' (#49 ) from dev into main Reviewed-on: #49	2025-09-01 08:06:01 +00:00
gyurix	daaa19d32a	Update domain keys in configuration files for consistency and clarity	2025-09-01 10:05:22 +02:00
Gyorgy Berenyi	a860503297	Merge pull request 'Refactor matrix configuration structure for improved clarity and maintainability' (#48 ) from dev into main Reviewed-on: #48	2025-08-31 17:58:06 +00:00
gyurix	2129a7e8f9	Refactor matrix configuration structure for improved clarity and maintainability	2025-08-31 19:57:40 +02:00
Gyorgy Berenyi	aecfab545d	Merge pull request 'Update domain and path keys in configuration files for consistency' (#47 ) from dev into main Reviewed-on: #47	2025-08-31 12:46:36 +00:00
gyurix	22e37d90af	Update domain and path keys in configuration files for consistency	2025-08-31 14:46:04 +02:00
Gyorgy Berenyi	cf27b29d98	Merge pull request 'Add DOMAIN_ADMIN and SUB_PATH fields to configuration files' (#46 ) from dev into main Reviewed-on: #46	2025-08-31 12:39:28 +00:00
gyurix	efd077e41a	Add DOMAIN_ADMIN and SUB_PATH fields to configuration files	2025-08-31 14:38:12 +02:00
Gyorgy Berenyi	234f2b8379	Merge pull request 'Rename matrix server components and add finalize setup configuration' (#45 ) from dev into main Reviewed-on: #45	2025-08-31 12:27:43 +00:00
gyurix	3fbdace533	Rename matrix server components and add finalize setup configuration	2025-08-31 14:27:09 +02:00
Gyorgy Berenyi	858ddb310a	Merge pull request 'Add required fields and types to matrix template configuration' (#44 ) from dev into main Reviewed-on: #44	2025-08-31 12:19:10 +00:00
gyurix	f065b4f6ce	Add required fields and types to matrix template configuration	2025-08-31 14:18:20 +02:00
Gyorgy Berenyi	c48ee36943	Merge pull request 'Add matrix service configuration and update related settings' (#43 ) from dev into main Reviewed-on: #43	2025-08-31 12:15:42 +00:00
gyurix	05f0a6d10f	Add matrix service configuration and update related settings	2025-08-31 14:14:34 +02:00
Gyorgy Berenyi	b6bf808328	Merge pull request 'Refactor database connection string to enhance clarity and consistency' (#42 ) from dev into main Reviewed-on: #42	2025-08-31 10:22:32 +00:00
gyurix	01ca5a196c	Refactor database connection string to enhance clarity and consistency	2025-08-31 12:21:26 +02:00
Gyorgy Berenyi	73419aeff8	Merge pull request 'Add initial configuration files for matrix service and firewalls' (#41 ) from dev into main Reviewed-on: #41	2025-08-31 10:18:09 +00:00
gyurix	b5c693bc8b	Add initial configuration files for matrix service and firewalls	2025-08-31 12:15:16 +02:00
Gyorgy Berenyi	6bf99e7a1a	Merge pull request 'Update port configuration from 3000 to 1411 in domain, firewall, and service JSON files' (#40 ) from dev into main Reviewed-on: #40	2025-08-30 07:49:49 +00:00
gyurix	37e93e661d	Update port configuration from 3000 to 1411 in domain, firewall, and service JSON files	2025-08-30 09:48:49 +02:00
Gyorgy Berenyi	d46cc3e801	Merge pull request 'Rename POSTGRES_CONNECTION_STRING to DB_CONNECTION_STRING in pocketid-secret.json' (#39 ) from dev into main Reviewed-on: #39	2025-08-30 07:39:42 +00:00
gyurix	9c0932bdd4	Rename POSTGRES_CONNECTION_STRING to DB_CONNECTION_STRING in pocketid-secret.json	2025-08-30 09:38:35 +02:00
Gyorgy Berenyi	885d896777	Merge pull request 'Update PocketID image reference in service-pocketid.json to use versioned tag' (#38 ) from dev into main Reviewed-on: #38	2025-08-30 07:36:45 +00:00
gyurix	a8f4533991	Update PocketID image reference in service-pocketid.json to use versioned tag	2025-08-30 09:36:14 +02:00
Gyorgy Berenyi	49491e3116	Merge pull request 'Update PostgreSQL volume paths in service-pocketid.json' (#37 ) from dev into main Reviewed-on: #37	2025-08-30 07:28:35 +00:00
gyurix	feace468dc	Update PostgreSQL volume paths in service-pocketid.json	2025-08-30 09:27:26 +02:00
Gyorgy Berenyi	00d3f23702	Merge pull request 'dev' (#36 ) from dev into main Reviewed-on: #36	2025-08-30 07:23:03 +00:00
gyurix	4e19534cae	Update SERVICE_NAME in domain-pocketid.json from 'vaultwarden' to 'pocketid'	2025-08-30 09:22:15 +02:00
Gyorgy Berenyi	7019222a22	Merge pull request 'Refactor Vaultwarden configuration to replace MariaDB with PostgreSQL, update related keys and paths, and remove unnecessary log directory.' (#35 ) from dev into main Reviewed-on: #35	2025-08-29 15:21:12 +00:00
Gyorgy Berenyi	927d7e669e	Merge pull request 'Update Gitea service configuration to change SERVICE_NAME and DOMAIN settings' (#34 ) from dev into main Reviewed-on: #34	2025-08-29 13:39:36 +00:00
Gyorgy Berenyi	892e05fb60	Merge pull request 'Update Gitea secret configuration to change database host to 'giteapostgres-db'' (#33 ) from dev into main Reviewed-on: #33	2025-08-29 12:48:52 +00:00
Gyorgy Berenyi	ea7ee3aec9	Merge pull request 'Update Gitea configuration to replace 'gitea' with 'gitea-app' in service and firewall settings' (#32 ) from dev into main Reviewed-on: #32	2025-08-29 12:40:11 +00:00
Gyorgy Berenyi	23501f7760	Merge pull request 'Update Gitea service configuration to use latest image tag for Gitea' (#31 ) from dev into main Reviewed-on: #31	2025-08-29 12:31:30 +00:00
Gyorgy Berenyi	ecc21d1639	Merge pull request 'dev' (#30 ) from dev into main Reviewed-on: #30	2025-08-29 12:28:20 +00:00
Gyorgy Berenyi	d64872f85e	Merge pull request 'dev' (#29 ) from dev into main Reviewed-on: #29	2025-08-29 12:25:21 +00:00
Gyorgy Berenyi	e928cca06a	Merge pull request 'Refactor service configurations to improve compatibility and streamline setup process' (#28 ) from dev into main Reviewed-on: #28	2025-08-29 12:19:41 +00:00
Gyorgy Berenyi	a0cced089b	Merge pull request 'Update Nextcloud PostgreSQL image to version 15 and add Gitea configuration files for PostgreSQL and firewall services' (#27 ) from dev into main Reviewed-on: #27	2025-08-29 12:17:32 +00:00
Gyorgy Berenyi	e43b20a94c	Merge pull request 'Update Nextcloud configuration to use PostgreSQL instead of MariaDB and adjust related settings' (#26 ) from dev into main Reviewed-on: #26	2025-08-29 08:21:01 +00:00
Gyorgy Berenyi	ac7c52def1	Merge pull request 'Add .gitignore, update Redis URL and domain placeholders, and expand outline secret configuration' (#25 ) from dev into main Reviewed-on: #25	2025-08-29 06:15:38 +00:00
Gyorgy Berenyi	f26a4d60d9	Merge pull request 'Update Jellyfin service configuration to use version placeholder and add version metadata to template' (#24 ) from dev into main Reviewed-on: #24	2025-08-25 08:45:05 +00:00
Gyorgy Berenyi	2f343b4b67	Merge pull request 'Add matrix server configuration and update filebrowser command to set ownership' (#23 ) from dev into main Reviewed-on: #23	2025-08-24 06:51:34 +00:00
hael	fe5b98391b	Merge pull request 'leantime smtp transm vaultw template update' (#22 ) from dev into main Reviewed-on: #22	2025-08-14 18:14:08 +00:00
hael	9827a6bd85	Merge pull request 'Update outline/domain-outline.json' (#21 ) from dev into main Reviewed-on: #21	2025-08-14 16:24:02 +00:00
Gyorgy Berenyi	9fe2be7b26	Merge pull request 'Update Leantime configuration to change port from 80 to 8080' (#20 ) from dev into main Reviewed-on: #20	2025-08-14 15:51:43 +00:00
Gyorgy Berenyi	48a20f2681	Merge pull request 'dev' (#19 ) from dev into main Reviewed-on: #19	2025-08-14 15:32:20 +00:00
Gyorgy Berenyi	db6a375c5e	Merge pull request 'Increase memory allocation for immich services in service-immich.json' (#18 ) from dev into main Reviewed-on: #18	2025-08-12 10:34:21 +00:00
hael	7eda10b29d	Merge pull request 'Update outline/template.json' (#17 ) from dev into main Reviewed-on: #17	2025-08-07 13:24:00 +00:00