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

matrix/domain-matrix-admin.json

@@ -35,7 +35,7 @@
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
                 },
                 {
-                    "LOCAL_PATH": "#SUBPATH"
+                    "LOCATION": "#SUBPATH"
                 },
                 {
                     "OPERATION": "CREATE"

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"
                 }
             ],
@@ -93,7 +93,7 @@
         {
             "IMAGE": "safebox/matrix-setup:latest",
             "UPDATE": "true",
-            "NAME": "matrixserver-setup",
+            "NAME": "matrixserver-dbinit",
             "NETWORK": "host",
             "MEMORY": "64M",
             "VOLUMES": [
@@ -128,13 +128,6 @@
                     "TYPE": "rw"
                 }
             ],
-            "PORTS": [
-                {
-                    "SOURCE": "null",
-                    "DEST": "8008",
-                    "TYPE": "tcp"
-                }
-            ],
             "ENV_FILES": [
                 "/etc/user/secret/matrix/matrix.json"
             ],
@@ -159,6 +152,11 @@
                     "SOURCE": "/etc/user/data/matrix/synapse",
                     "DEST": "/data",
                     "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "SHARED",
+                    "DEST": "/var/tmp/shared",
+                    "TYPE": "rw"
                 }
             ],
             "ENV_FILES": [
@@ -196,29 +194,6 @@
                 "firewall-matrix-admin",
                 "domain-matrix-admin"
             ]
-        },
-        {
-            "IMAGE": "safebox/matrix-setup:latest",
-            "UPDATE": "true",
-            "NAME": "matrix-setup",
-            "NETWORK": "host",
-            "MEMORY": "64M",
-            "VOLUMES": [
-                {
-                    "SOURCE": "/etc/user/data/matrix/synapse",
-                    "DEST": "/data",
-                    "TYPE": "ro"
-                }
-            ],
-            "ENV_FILES": [
-                "/etc/user/secret/matrix/matrix.json"
-            ],
-            "EXTRA": "--rm",
-            "DEPEND": "null",
-            "START_ON_BOOT": "false",
-            "CMD": "null",
-            "PRE_START": "null",
-            "POST_START": "null"
         }
     ]
 }

nextcloud/domain-nextcloud.json

@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "nextcloud",
-      "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -19,12 +19,24 @@
             "POST_START": [],
             "CMD": "",
             "ENVS": [
-          { "PROXY": "smarthostloadbalancer" },
-          { "TARGET": "nextcloudnginx" },
-          { "PORT": "80" },
-          { "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS" },
-          { "SMARTHOST_PROXY_PATH": "/smarthost-domains" },
-	        { "OPERATION": "CREATE" }
+                {
+                    "PROXY": "smarthostloadbalancer"
+                },
+                {
+                    "TARGET": "nextcloudnginx"
+                },
+                {
+                    "PORT": "80"
+                },
+                {
+                    "DOMAIN": "#DOMAIN"
+                },
+                {
+                    "SMARTHOST_PROXY_PATH": "/smarthost-domains"
+                },
+                {
+                    "OPERATION": "CREATE"
+                }
             ],
             "VOLUMES": [
                 {

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",

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",