diff --git a/homeassistant/domain-homeassistant.json b/homeassistant/domain-homeassistant.json index 0d7973e..ce0f164 100644 --- a/homeassistant/domain-homeassistant.json +++ b/homeassistant/domain-homeassistant.json @@ -1,7 +1,7 @@ { "main": { "SERVICE_NAME": "homeassistant", - "DOMAIN": "#HOMEASSISTANT_DOMAIN" + "DOMAIN": "#DOMAIN" }, "containers": [ { @@ -29,7 +29,7 @@ "PORT": "8123" }, { - "DOMAIN": "#HOMEASSISTANT_DOMAIN" + "DOMAIN": "#DOMAIN" }, { "SMARTHOST_PROXY_PATH": "/smarthost-domains" diff --git a/homeassistant/service-homeassistant.json b/homeassistant/service-homeassistant.json index 1d73b46..927cfcf 100644 --- a/homeassistant/service-homeassistant.json +++ b/homeassistant/service-homeassistant.json @@ -1,7 +1,7 @@ { "main": { "SERVICE_NAME": "homeassistant", - "DOMAIN": "#HOMEASSISTANT_DOMAIN" + "DOMAIN": "#DOMAIN" }, "containers": [ { @@ -24,7 +24,7 @@ ], "ENVS": [ { - "DOMAIN": "#HOMEASSISTANT_DOMAIN" + "DOMAIN": "#DOMAIN" }, { "HOMEASSISTANT": "homeassistant" @@ -58,7 +58,7 @@ ], "ENVS": [ { - "TZ": "#HOMEASSISTANT_TZ" + "TZ": "#TZ" } ], "EXTRA": "--restart unless-stopped", diff --git a/homeassistant/template.json b/homeassistant/template.json index f673829..0cec854 100644 --- a/homeassistant/template.json +++ b/homeassistant/template.json @@ -3,13 +3,13 @@ "fields": [ { "description": "Please add your homeassistant domain: (required)", - "key": "HOMEASSISTANT_DOMAIN", + "key": "DOMAIN", "value": "", "required": "true" }, { "description": "Please add your homeassistant timezone: (required)", - "key": "HOMEASSISTANT_TZ", + "key": "TZ", "value": "Europe/Budapest", "required": "true" } diff --git a/nextcloud/domain-nextcloud.json b/nextcloud/domain-nextcloud.json index 35e8040..615bfbb 100644 --- a/nextcloud/domain-nextcloud.json +++ b/nextcloud/domain-nextcloud.json @@ -1,7 +1,7 @@ { "main": { "SERVICE_NAME": "nextcloud", - "DOMAIN": "#NEXTCLOUD_DOMAIN" + "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS" }, "containers": [ { @@ -23,7 +23,7 @@ { "TARGET": "nextcloudnginx" }, { "PORT": "80" }, { "LOCATION": "#NEXTCLOUD_LOCATION_PATH" }, - { "DOMAIN": "#NEXTCLOUD_DOMAIN" }, + { "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS" }, { "SMARTHOST_PROXY_PATH": "/smarthost-domains" }, { "OPERATION": "CREATE" } ], diff --git a/nextcloud/nextcloud-secret.json b/nextcloud/nextcloud-secret.json index eeceb99..62659ed 100644 --- a/nextcloud/nextcloud-secret.json +++ b/nextcloud/nextcloud-secret.json @@ -1,19 +1,20 @@ { "nextcloudmysql": { - "MARIADB_DATABASE": "#DB_MYSQL", - "MARIADB_USER": "#DB_USER", - "MARIADB_PASSWORD": "#DB_PASSWORD", - "MARIADB_ROOT_PASSWORD": "#DB_ROOT_PASSWORD" + "MARIADB_DATABASE": "#MARIADB_DATABASE", + "MARIADB_USER": "#MARIADB_USER", + "MARIADB_PASSWORD": "#MARIADB_PASSWORD", + "MARIADB_ROOT_PASSWORD": "#MARIADB_ROOT_PASSWORD" }, "nextcloudphp": { - "NEXTCLOUD_ADMIN_USER": "#NEXTCLOUD_USERNAME", - "NEXTCLOUD_ADMIN_PASSWORD": "#NEXTCLOUD_PASSWORD", - "NEXTCLOUD_TRUSTED_DOMAINS": "#NEXTCLOUD_DOMAIN", - "OVERWRITEHOST": "#NEXTCLOUD_DOMAIN#NEXTCLOUD_LOCATION_PATH", + "NEXTCLOUD_ADMIN_USER": "#NEXTCLOUD_ADMIN_USER", + "NEXTCLOUD_ADMIN_PASSWORD": "#NEXTCLOUD_ADMIN_PASSWORD", + "NEXTCLOUD_TRUSTED_DOMAINS": "#NEXTCLOUD_TRUSTED_DOMAINS", + "NEXTCLOUD_LOCATION_PATH": "#NEXTCLOUD_LOCATION_PATH", + "OVERWRITEHOST": "#NEXTCLOUD_TRUSTED_DOMAINS#NEXTCLOUD_LOCATION_PATH", "NEXTCLOUD_DATA_DIR": "/var/data", - "MYSQL_DATABASE": "#DB_MYSQL", - "MYSQL_USER": "#DB_USER", - "MYSQL_PASSWORD": "#DB_PASSWORD", + "MYSQL_DATABASE": "#MARIADB_DATABASE", + "MYSQL_USER": "#MARIADB_USER", + "MYSQL_PASSWORD": "#MARIADB_PASSWORD", "MYSQL_HOST": "nextcloudmysql-db", "REDIS_HOST": "nextcloud-redis" } diff --git a/nextcloud/template.json b/nextcloud/template.json index 095c508..9ed811f 100644 --- a/nextcloud/template.json +++ b/nextcloud/template.json @@ -3,10 +3,16 @@ "fields": [ { "description": "Please add Nextcloud domain:", - "key": "NEXTCLOUD_DOMAIN", + "key": "NEXTCLOUD_TRUSTED_DOMAINS", "value": "", "required": "true" }, + { + "description": "Domain for letsencrypt log", + "key": "DOMAIN", + "value": "", + "type": "hidden" + }, { "description": "Do you use any additional location path? (optional)\n(do not miss '/' character!)", "key": "NEXTCLOUD_LOCATION_PATH", @@ -14,41 +20,41 @@ }, { "description": "Please add Nextcloud username:", - "key": "NEXTCLOUD_USERNAME", + "key": "NEXTCLOUD_ADMIN_USER", "value": "", "required": "true" }, { "description": "Please add Nextcloud password:", - "key": "NEXTCLOUD_PASSWORD", + "key": "NEXTCLOUD_ADMIN_PASSWORD", "value": "", "required": "true", "type": "password" }, { "description": "MYSQL database name", - "key": "DB_MYSQL", + "key": "MARIADB_DATABASE", "value": "", "required": "true", "generated": "" }, { "description": "MYSQL username", - "key": "DB_USER", + "key": "MARIADB_USER", "value": "", "required": "true", "generated": "time|md5|8" }, { "description": "MYSQL password for user", - "key": "DB_PASSWORD", + "key": "MARIADB_PASSWORD", "value": "", "required": "true", "generated": "random|md5|12" }, { "description": "MYSQL root user password", - "key": "DB_ROOT_PASSWORD", + "key": "MARIADB_ROOT_PASSWORD", "value": "", "required": "true", "generated": "random|sha256|20" diff --git a/smtp/service-smtp.json b/smtp/service-smtp.json index e48e0e2..441b58e 100644 --- a/smtp/service-smtp.json +++ b/smtp/service-smtp.json @@ -31,31 +31,31 @@ ], "ENVS": [ { - "TZ": "#SMTP_TIMEZONE" + "TZ": "#TZ" }, { - "RELAY_HOST": "#SMTP_RELAY_HOST" + "RELAY_HOST": "#RELAY_HOST" }, { - "RELAY_PORT": "#SMTP_RELAY_PORT" + "RELAY_PORT": "#RELAY_PORT" }, { - "RELAY_USER": "#SMTP_RELAY_USER" + "RELAY_USER": "#RELAY_USER" }, { - "TEST_EMAIL": "#SMTP_TEST_EMAIL" + "TEST_EMAIL": "#TEST_EMAIL" }, { - "FROMADDRESS": "#SMTP_FROMADDRESS" + "FROMADDRESS": "#FROMADDRESS" }, { - "MYNETWORKS": "#SMTP_MYNETWORKS" + "MYNETWORKS": "#MYNETWORKS" }, { - "MSG_SIZE": "#SMTP_MSG_SIZE" + "MSG_SIZE": "#MSG_SIZE" }, { - "LOG_DISABLE": "#SMTP_LOG_DISABLE" + "LOG_DISABLE": "#LOG_DISABLE" } ], "ENV_FILES": [ diff --git a/smtp/smtp-secret.json b/smtp/smtp-secret.json index 65a9ee1..c8b1699 100644 --- a/smtp/smtp-secret.json +++ b/smtp/smtp-secret.json @@ -1,5 +1,5 @@ { "mail": { - "RELAY_PASS": "#SMTP_RELAY_PASS" + "RELAY_PASS": "#RELAY_PASS" } } \ No newline at end of file diff --git a/smtp/template.json b/smtp/template.json index 2f972f4..dbced15 100644 --- a/smtp/template.json +++ b/smtp/template.json @@ -3,64 +3,64 @@ "fields": [ { "description": "Set timezone for smtp server", - "key": "SMTP_TIMEZONE", + "key": "TZ", "value": "Europe/Budapest", "required": "true" }, { "description": "Set relay hostname for smtp server", - "key": "SMTP_RELAY_HOST", + "key": "RELAY_HOST", "value": "", "required": "true" }, { "description": "Set relay port for smtp server", - "key": "SMTP_RELAY_PORT", + "key": "RELAY_PORT", "value": "587", "required": "true" }, { "description": "Set username for smtp server", - "key": "SMTP_RELAY_USER", + "key": "RELAY_USER", "value": "", "required": "true" }, { "description": "Set password for smtp server", - "key": "SMTP_RELAY_PASS", + "key": "RELAY_PASS", "value": "", "required": "true" }, { "description": "Set test email address smtp server", - "key": "SMTP_TEST_EMAIL", + "key": "TEST_EMAIL", "value": "" }, { "description": "Set subnet using smtp server (you can set multiple networks with comma separated values)", - "key": "SMTP_MYNETWORKS", + "key": "MYNETWORKS", "value": "0.0.0.0/0", "required": "true" }, { "description": "Set default domain name using smtp server", - "key": "SMTP_MYORIGIN", + "key": "MYORIGIN", "value": "" }, { "description": "Set from email address for smtp server", - "key": "SMTP_FROMADDRESS", + "key": "FROMADDRESS", "value": "", "required": "true" }, { "description": "Set maximum size in bytes of sending message", - "key": "SMTP_MSG_SIZE", + "key": "MSG_SIZE", "value": "30720000" }, { "description": "Set log enable or not for smtp server", - "key": "SMTP_LOG_DISABLE", + "key": "LOG_DISABLE", "value": "false" } ] diff --git a/vaultwarden/service-vaultwarden.json b/vaultwarden/service-vaultwarden.json index 6d5d03a..9dc1e2c 100644 --- a/vaultwarden/service-vaultwarden.json +++ b/vaultwarden/service-vaultwarden.json @@ -97,7 +97,7 @@ "RUST_BACKTRACE": "1" }, { - "SIGNUPS_DOMAINS_WHITELIST": "#VAULTWARDEN_WHITELIST" + "SIGNUPS_DOMAINS_WHITELIST": "#SIGNUPS_DOMAINS_WHITELIST" }, { "SIGNUPS_VERIFY": "true" diff --git a/vaultwarden/template.json b/vaultwarden/template.json index 4307a37..2e53f88 100644 --- a/vaultwarden/template.json +++ b/vaultwarden/template.json @@ -3,34 +3,34 @@ "fields": [ { "description": "Please add your very secret VaultWarden admin key (please use any token generator or add minimum 12 character long random string): (required)", - "key": "VAULTWARDEN_ADMIN_TOKEN", + "key": "ADMIN_TOKEN", "value": "", "required": "true" }, { "description": "MYSQL database name", - "key": "DB_MYSQL", + "key": "MARIADB_DATABASE", "value": "", "required": "true", "generated": "" }, { "description": "MYSQL username", - "key": "DB_USER", + "key": "MARIADB_USER", "value": "", "required": "true", "generated": "time|md5|8" }, { "description": "MYSQL password for user", - "key": "DB_PASSWORD", + "key": "MARIADB_PASSWORD", "value": "", "required": "true", "generated": "random|md5|12" }, { "description": "MYSQL root user password", - "key": "DB_ROOT_PASSWORD", + "key": "MARIADB_ROOT_PASSWORD", "value": "", "required": "true", "generated": "random|sha256|20" @@ -83,7 +83,7 @@ }, { "description": "Please add Domains Whitelist (list of domains separated with spaces):", - "key": "VAULTWARDEN_WHITELIST", + "key": "SIGNUPS_DOMAINS_WHITELIST", "value": "", "required": "true" } diff --git a/vaultwarden/vaultwarden-secret.json b/vaultwarden/vaultwarden-secret.json index 17089c3..413358b 100644 --- a/vaultwarden/vaultwarden-secret.json +++ b/vaultwarden/vaultwarden-secret.json @@ -1,13 +1,14 @@ { "vaultwardenmysql": { - "MARIADB_DATABASE": "#DB_MYSQL", - "MARIADB_USER": "#DB_USER", - "MARIADB_PASSWORD": "#DB_PASSWORD", - "MARIADB_ROOT_PASSWORD": "#DB_ROOT_PASSWORD" + "MARIADB_DATABASE": "#MARIADB_DATABASE", + "MARIADB_USER": "#MARIADB_USER", + "MARIADB_PASSWORD": "#MARIADB_PASSWORD", + "MARIADB_ROOT_PASSWORD": "#MARIADB_ROOT_PASSWORD" }, "vaultwardenapp": { - "DATABASE_URL": "'mysql://#DB_USER:#DB_PASSWORD@vaultwardenmysql-db:3306/#DB_MYSQL'", - "ADMIN_TOKEN": "#VAULTWARDEN_ADMIN_TOKEN", + "DATABASE_URL": "'mysql://#MARIADB_USER:#MARIADB_PASSWORD@vaultwardenmysql-db:3306/#MARIADB_DATABASE'", + "ADMIN_TOKEN": "#ADMIN_TOKEN", + "VAULTWARDEN_DOMAIN": "#VAULTWARDEN_DOMAIN", "VAULTWARDEN_SMTP_PASSWORD": "#VAULTWARDEN_SMTP_PASSWORD" } } \ No newline at end of file