safebox/default-applications-tree
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gyurix
2025-09-06 17:04:41 +02:00
parent 09371f8b4b
commit becd96416a
4 changed files with 62 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
nextcloud/domain-nextcloud.json
View File

@@ -1,48 +1,60 @@
{ {
"main": { "main": {
"SERVICE_NAME": "nextcloud", "SERVICE_NAME": "nextcloud",
"DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS" "DOMAIN": "#DOMAIN"
}, },
"containers": [ "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"
}
]
}
]
}

4
nextcloud/nextcloud-secret.json
View File

@@ -8,8 +8,8 @@
"nextcloudphp": { "nextcloudphp": {
"NEXTCLOUD_ADMIN_USER": "#NEXTCLOUD_ADMIN_USER", "NEXTCLOUD_ADMIN_USER": "#NEXTCLOUD_ADMIN_USER",
"NEXTCLOUD_ADMIN_PASSWORD": "#NEXTCLOUD_ADMIN_PASSWORD", "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", "NEXTCLOUD_DATA_DIR": "/var/data",
"POSTGRES_DB": "#POSTGRES_DB", "POSTGRES_DB": "#POSTGRES_DB",
"POSTGRES_USER": "#POSTGRES_USER", "POSTGRES_USER": "#POSTGRES_USER",

2
nextcloud/service-nextcloud.json
View File

@@ -1,7 +1,7 @@
{ {
"main": { "main": {
"SERVICE_NAME": "nextcloud", "SERVICE_NAME": "nextcloud",
"DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS" "DOMAIN": "#DOMAIN"
}, },
"containers": [ "containers": [
{ {

2
nextcloud/template.json
View File

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