Merge pull request 'Refactor database connection string to enhance clarity and consistency' (#42) from dev into main

Reviewed-on: #42

immich/service-immich.json

@@ -29,7 +29,7 @@
             "IMAGE": "tensorchord/pgvecto-rs:pg14-v0.2.0",
             "UPDATE": "true",
             "NAME": "immichpostgres-db",
-            "MEMORY": "768M",
+            "MEMORY": "512M",
             "NETWORK": "immich-net",
             "SELECTOR": "immichpostgres",
             "VOLUMES": [
@@ -49,11 +49,6 @@
             "ENV_FILES": [
                 "/etc/user/secret/immich/immich.json"
             ],
-            "ENVS": [
-                {
-                    "POSTGRES_INITDB_ARGS": "--data-checksums"
-                }
-            ],
             "EXTRA": "--restart always",
             "DEPEND": "null",
             "START_ON_BOOT": "false",

matrix/domain-matrix-admin.json

@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "matrix",
-        "DOMAIN": "#ADMINDOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -29,14 +29,11 @@
                     "PORT": "80"
                 },
                 {
-                    "DOMAIN": "#ADMINDOMAIN"
+                    "DOMAIN": "#DOMAIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
                 },
-                {
-                    "LOCATION": "#SUBPATH"
-                },
                 {
                     "OPERATION": "CREATE"
                 }

matrix/domain-matrix.json

@@ -1,60 +0,0 @@
-{
-    "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"
-                }
-            ]
-        }
-    ]
-}

matrix/matrix-secret.json

@@ -15,15 +15,10 @@
         "SYNAPSE_SERVER_NAME": "#DOMAIN",
         "SYNAPSE_REPORT_STATS": "no",
         "ADMIN_USERNAME": "#ADMIN_USERNAME",
-        "ADMIN_PASSWORD": "#ADMIN_PASSWORD",
+        "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",
+        "BASE_PATH": "/synapse-admin"
-        "ADMINDOMAIN": "#ADMINDOMAIN",
-        "SUBPATH": "#SUBPATH"
     }
 }

matrix/service-matrix.json

@@ -38,7 +38,7 @@
             "SELECTOR": "matrixpostgres-db",
             "VOLUMES": [
                 {
-                    "SOURCE": "/etc/user/data/matrix/db",
+                    "SOURCE": "/etc/user/data/matrix/postgresql",
                     "DEST": "/var/lib/postgresql/data",
                     "TYPE": "rw"
                 }
@@ -85,15 +85,15 @@
             "EXTRA": "--rm",
             "DEPEND": "null",
             "START_ON_BOOT": "false",
-            "ENTRYPOINT": "bash -c",
+            "ENTRYPOINT": "sh -c",
-            "CMD": "if [ ! -f /data/homeserver.yaml ]; then /start.py generate ; else exit 1; fi",
+            "CMD": "if [ ! -f /data/homeserver.yaml ]; then generate ; fi",
             "PRE_START": [],
             "POST_START": []
         },
         {
             "IMAGE": "safebox/matrix-setup:latest",
             "UPDATE": "true",
-            "NAME": "matrixserver-dbinit",
+            "NAME": "matrix-setup",
             "NETWORK": "host",
             "MEMORY": "64M",
             "VOLUMES": [
@@ -116,7 +116,7 @@
         {
             "IMAGE": "matrixdotorg/synapse",
             "UPDATE": "true",
-            "NAME": "matrixserver-app",
+            "NAME": "matrixserver",
             "ROLES": "backend-www",
             "MEMORY": "512M",
             "NETWORK": "matrix-net",
@@ -128,6 +128,13 @@
                     "TYPE": "rw"
                 }
             ],
+            "PORTS": [
+                {
+                    "SOURCE": "null",
+                    "DEST": "8008",
+                    "TYPE": "tcp"
+                }
+            ],
             "ENV_FILES": [
                 "/etc/user/secret/matrix/matrix.json"
             ],
@@ -141,34 +148,6 @@
                 "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",
@@ -194,6 +173,29 @@
                 "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,60 +1,48 @@
-{
+ {
-    "main": {
+    "main": { 
-        "SERVICE_NAME": "nextcloud",
+      "SERVICE_NAME": "nextcloud",
-        "DOMAIN": "#DOMAIN"
+      "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS"
     },
     "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" },
-                    "PROXY": "smarthostloadbalancer"
+          { "TARGET": "nextcloudnginx" },
-                },
+          { "PORT": "80" },
-                {
+          { "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS" },
-                    "TARGET": "nextcloudnginx"
+          { "SMARTHOST_PROXY_PATH": "/smarthost-domains" },
-                },
+	        { "OPERATION": "CREATE" }
-                {
+        ],
-                    "PORT": "80"
+        "VOLUMES": [
-                },
+          {
-                {
+       	"SOURCE": "/etc/user/config/smarthost-domains",
-                    "DOMAIN": "#DOMAIN"
+        "DEST": "/smarthost-domains",
-                },
+        "TYPE": "rw"
-                {
+          },
-                    "SMARTHOST_PROXY_PATH": "/smarthost-domains"
+	        {
-                },
+	      "SOURCE": "/etc/system/data/dns/hosts.local",
-                {
+	      "DEST": "/etc/dns/hosts.local",
-                    "OPERATION": "CREATE"
+	      "TYPE": "ro"
-                }
+	        },
-            ],
+          { 
-            "VOLUMES": [
+	      "SOURCE": "/var/run/docker.sock", 
-                {
+	      "DEST": "/var/run/docker.sock", 
-                    "SOURCE": "/etc/user/config/smarthost-domains",
+	      "TYPE": "rw" 
-                    "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",
-        "DOMAIN": "#DOMAIN",
+        "NEXTCLOUD_TRUSTED_DOMAINS": "#NEXTCLOUD_TRUSTED_DOMAINS",
-        "OVERWRITEHOST": "#DOMAIN",
+        "OVERWRITEHOST": "#NEXTCLOUD_TRUSTED_DOMAINS",
         "NEXTCLOUD_DATA_DIR": "/var/data",
         "POSTGRES_DB": "#POSTGRES_DB",
         "POSTGRES_USER": "#POSTGRES_USER",

nextcloud/template.json

@@ -8,13 +8,15 @@
         {
             "title": "",
             "details": "",
+            "info": "Nextcloud domain info",
             "description": "Domain",
-            "key": "DOMAIN",
+            "key": "NEXTCLOUD_TRUSTED_DOMAINS",
             "value": "",
             "required": "true"
         },
         {
             "details": "",
+            "info": "Nextcloud user name info",
             "description": "Username",
             "key": "NEXTCLOUD_ADMIN_USER",
             "value": "",

pocketid/service-pocketid.json

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

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 identity and access management solution that provides secure and efficient user authentication and authorization for web applications and services.",
+    "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.",
     "fields": [
         {
             "description": "Domain",