diff --git a/dependent/compose.yml b/dependent/compose.yml index c31e672..de6bc4d 100644 --- a/dependent/compose.yml +++ b/dependent/compose.yml @@ -250,25 +250,25 @@ services: environment: REDIS_HOST: cache0 REDIS_HOST_PASSWORD_FILE: /run/secrets/redis.pass - MYSQL_HOST: "${MYSQL_DB_HOST:?Enter the container name, hostname or public FQDN of your DBMS}:3306" + MYSQL_HOST: "${MYSQL_DB_HOST}:3306" MYSQL_DATABASE: ${NEXTCLOUD_DB_NAME:-nextcloud} MYSQL_USER: ${MYSQL_DB_USER:-admin} MYSQL_PASSWORD_FILE: /run/secrets/user-mysql.pass - SMTP_HOST: ${EMAIL_SMTP_HOST:?Enter an SMTP host for sending adminstrative emails} + SMTP_HOST: ${EMAIL_SMTP_HOST} SMTP_PORT: ${EMAIL_SMTP_PORT:-465} SMTP_SECURE: ${EMAIL_SMTP_SECURE:-ssl} SMTP_AUTHTYPE: ${EMAIL_SMTP_AUTHTYPE:-LOGIN} - SMTP_NAME: ${EMAIL_SMTP_USERNAME:?Enter the email handle for loggng in to email server} + SMTP_NAME: ${EMAIL_SMTP_USERNAME} SMTP_PASSWORD_FILE: /run/secrets/email.pass MAIL_FROM_ADDRESS: ${EMAIL_SMTP_USER_ALIAS:-admin} - MAIL_DOMAIN: ${EMAIL_SMTP_EMAIL_ALIAS:?Enter the hostname or public FQDN of your email handle} + MAIL_DOMAIN: ${EMAIL_SMTP_EMAIL_ALIAS} # @NOTE https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html APACHE_DISABLE_REWRITE_IP: ${NEXTCLOUD_APACHE_DISABLE_REWRITE_IP:-1} - TRUSTED_PROXIES: ${NEXTCLOUD_TRUSTED_PROXIES:?Enter space-separated list of trusted proxy addresses} + TRUSTED_PROXIES: ${NEXTCLOUD_TRUSTED_PROXIES} NEXTCLOUD_TRUSTED_DOMAINS: ${NEXTCLOUD_SUBDOMAIN}.${SERVER_FQDN} # OVERWRITEHOST: ${NEXTCLOUD_HOST_REWRITE:?Enter the hostname or public FQDN for this server} - OVERWRITECLIURL: ${NEXTCLOUD_URL_REWRITE:?Enter the hostname or public FQDN with correspondent prefixd URL scheme for this server} - OVERWRITEPROTOCOL: ${NEXTCLOUD_PROTOCOL_REWRITE:?Enter the URL scheme protocol preferred} + OVERWRITECLIURL: ${NEXTCLOUD_URL_REWRITE} + OVERWRITEPROTOCOL: ${NEXTCLOUD_PROTOCOL_REWRITE} secrets: - "user-mysql.pass" - email.pass @@ -308,7 +308,7 @@ services: - ${HOME}/.gitea.env environment: GITEA_DEFAULT_RUN_USER: ${GITEA_MODE:-dev} - GITEA_DEFAULT_APP_NAME: ${GITEA_NAME:?Enter a name or title for Gitea website} + GITEA_DEFAULT_APP_NAME: ${GITEA_NAME} GITEA_server_PROTOCOL: http GITEA_server_DOMAIN: ${GITEA_SUBDOMAIN}.${SERVER_FQDN} # @NOTE https://gist.github.com/erik-toth/087262f19941da9bf4c2ce449fe98a47 @@ -317,7 +317,7 @@ services: GITEA_server_START_SSH_SERVER: "false" GITEA_server_LANDING_PAGE: ${GITEA_LANDING:-explore} GITEA_admin_DEFAULT_EMAIL_NOTIFICATIONS: onmention - GITEA_security_REVERSE_PROXY_TRUSTED_PROXIES: ${GITEA_TRUSTED_PROXIES:?Enter comma-separated list of trusted proxy addresses} + GITEA_security_REVERSE_PROXY_TRUSTED_PROXIES: ${GITEA_TRUSTED_PROXIES} GITEA_security_PASSWORD_COMPLEXITY: lower,upper,digit,spec GITEA_security_PASSWORD_CHECK_PWN: "true" GITEA_service_REGISTER_EMAIL_CONFIRM: "true" @@ -330,13 +330,13 @@ services: GITEA_log_ENABLE_SSH_LOG: "true" GITEA_mailer_ENABLED: "true" GITEA_mailer_PROTOCOL: ${EMAIL_SEND_PROTOCOL:-smtp}s - GITEA_mailer_SMTP_ADDR: ${EMAIL_SMTP_HOST:?Enter an SMTP host for sending adminstrative emails} + GITEA_mailer_SMTP_ADDR: ${EMAIL_SMTP_HOST} GITEA_mailer_SMTP_PORT: ${EMAIL_SMTP_PORT:-465} - GITEA_mailer_USER: ${EMAIL_SMTP_USERNAME:?Enter the email handle for loggng in to email server} + GITEA_mailer_USER: ${EMAIL_SMTP_USERNAME} GITEA_mailer_PASSWD_FILE: /run/secrets/email.pass - GITEA_mailer_FROM: ${EMAIL_SMTP_USER_ALIAS:-admin}@${EMAIL_SMTP_EMAIL_ALIAS:?Enter the hostname or public FQDN of your email handle} + GITEA_mailer_FROM: ${EMAIL_SMTP_USER_ALIAS:-admin}@${EMAIL_SMTP_EMAIL_ALIAS} GITEA_database_DB_TYPE: ${GITEA_DB_TYPE:-mysql} - GITEA_database_HOST: "${MYSQL_DB_HOST:?Enter the container name, hostname or public FQDN of your DBMS}:3306" + GITEA_database_HOST: "${MYSQL_DB_HOST}:3306" GITEA_database_NAME: ${GITEA_DB_NAME:-gitea} GITEA_database_USER: ${MYSQL_DB_USER:-admin} GITEA_database_PASSWD_FILE: /run/secrets/user-mysql.pass @@ -382,7 +382,7 @@ services: OG_GIT_DEFAULT_BRANCH: main OG_HTTP_GIT_ENABLED: "true" OG_EXTERNAL_URL: "${SERVER_FQDN_SCHEME}://${OG_SUBDOMAIN}.${SERVER_FQDN}" - OG_CUSTOM_NAME: ${OG_NAME:?Enter name for OpenGist website} + OG_CUSTOM_NAME: ${OG_NAME} OG_CUSTOM_LOGO: ${OG_LOGO:-logo.svg} OG_CUSTOM_FAVICON: ${OG_FAVICON:-logo.ico} secrets: