Refactor domain configuration to use a unified DOMAIN key across Nextcloud JSON files

matrix/service-matrix.json

@@ -39,7 +39,7 @@
             "VOLUMES": [
                 {
                     "SOURCE": "/etc/user/data/matrix/db",
-                    "DEST": "/var/lib/postgresql",
+                    "DEST": "/var/lib/postgresql/data",
                     "TYPE": "rw"
                 }
             ],
@@ -162,7 +162,7 @@
             "ENV_FILES": [
                 "/etc/user/secret/matrix/matrix.json"
             ],
-            "EXTRA": "",
+            "EXTRA": "--rm",
             "DEPEND": "null",
             "START_ON_BOOT": "false",
             "CMD": "null",

nextcloud/domain-nextcloud.json

@@ -1,48 +1,60 @@
- {
+{
     "main": {
-      "SERVICE_NAME": "nextcloud",
+        "SERVICE_NAME": "nextcloud",
-      "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
-      { 
+        {
-  "IMAGE": "safebox/domain-check",
+            "IMAGE": "safebox/domain-check",
-	"UPDATE": "true",
+            "UPDATE": "true",
-  "MEMORY": "64M",
+            "MEMORY": "64M",
-	"NAME": "domain_checker", 
+            "NAME": "domain_checker",
-	"ROLES": "domain_checker", 
+            "ROLES": "domain_checker",
-	"NETWORK": "host", 
+            "NETWORK": "host",
-	"SELECTOR": "",
+            "SELECTOR": "",
-	"SCALE": "0", 
+            "SCALE": "0",
-	"EXTRA": "--rm --privileged",
+            "EXTRA": "--rm --privileged",
-	"PRE_START": [], 
+            "PRE_START": [],
-	"DEPEND": [], 
+            "DEPEND": [],
-	"POST_START": [], 
+            "POST_START": [],
-	"CMD": "",
+            "CMD": "",
-        "ENVS": [
+            "ENVS": [
-          { "PROXY": "smarthostloadbalancer" },
+                {
-          { "TARGET": "nextcloudnginx" },
+                    "PROXY": "smarthostloadbalancer"
-          { "PORT": "80" },
+                },
-          { "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS" },
+                {
-          { "SMARTHOST_PROXY_PATH": "/smarthost-domains" },
+                    "TARGET": "nextcloudnginx"
-	        { "OPERATION": "CREATE" }
+                },
-        ],
+                {
-        "VOLUMES": [
+                    "PORT": "80"
-          {
+                },
-       	"SOURCE": "/etc/user/config/smarthost-domains",
+                {
-        "DEST": "/smarthost-domains",
+                    "DOMAIN": "#DOMAIN"
-        "TYPE": "rw"
+                },
-          },
+                {
-	        {
+                    "SMARTHOST_PROXY_PATH": "/smarthost-domains"
-	      "SOURCE": "/etc/system/data/dns/hosts.local",
+                },
-	      "DEST": "/etc/dns/hosts.local",
+                {
-	      "TYPE": "ro"
+                    "OPERATION": "CREATE"
-	        },
+                }
-          { 
+            ],
-	      "SOURCE": "/var/run/docker.sock", 
+            "VOLUMES": [
-	      "DEST": "/var/run/docker.sock", 
+                {
-	      "TYPE": "rw" 
+                    "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"
+                }
+            ]
+        }
+    ]
 }

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",
+        "DOMAIN": "#DOMAIN",
-        "OVERWRITEHOST": "#NEXTCLOUD_TRUSTED_DOMAINS",
+        "OVERWRITEHOST": "#DOMAIN",
         "NEXTCLOUD_DATA_DIR": "/var/data",
         "POSTGRES_DB": "#POSTGRES_DB",
         "POSTGRES_USER": "#POSTGRES_USER",

nextcloud/template.json

@@ -10,7 +10,7 @@
             "details": "",
             "info": "Nextcloud domain info",
             "description": "Domain",
-            "key": "NEXTCLOUD_TRUSTED_DOMAINS",
+            "key": "DOMAIN",
             "value": "",
             "required": "true"
         },

pocketid/service-pocketid.json

@@ -36,7 +36,7 @@
             "VOLUMES": [
                 {
                     "SOURCE": "/etc/user/data/pocketid/db",
-                    "DEST": "/var/lib/postgresql",
+                    "DEST": "/var/lib/postgresql/data",
                     "TYPE": "rw"
                 }
             ],

pocketid/template.json

@@ -3,7 +3,7 @@
     "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",