Don't auto-remove the LetsEncrypt container; tweak restart policy.

This commit is contained in:
Buster "Silver Eagle" Neece 2021-09-30 18:53:22 -05:00
parent b3d53232a2
commit 288627f108
No known key found for this signature in database
GPG Key ID: 6D9E12FF03411F4E
2 changed files with 6 additions and 23 deletions

View File

@ -30,7 +30,7 @@ services :
- frontend
depends_on :
- web
restart : always
restart : unless-stopped
nginx_proxy_letsencrypt :
container_name : nginx_proxy_letsencrypt
@ -44,7 +44,7 @@ services :
DEFAULT_EMAIL : ${LETSENCRYPT_EMAIL}
networks :
- frontend
restart : always
restart : unless-stopped
web :
container_name : azuracast_web
@ -82,7 +82,7 @@ services :
networks :
- frontend
- backend
restart : always
restart : unless-stopped
ulimits : &default-ulimits
nofile :
soft : 65536
@ -100,7 +100,7 @@ services :
env_file : azuracast.env
networks :
- backend
restart : always
restart : unless-stopped
logging : *default-logging
redis :
@ -112,7 +112,7 @@ services :
- redis_data:/data
networks :
- backend
restart : always
restart : unless-stopped
logging : *default-logging
stations :
@ -282,7 +282,7 @@ services :
- frontend
- backend
init : true
restart : always
restart : unless-stopped
ulimits : *default-ulimits
logging : *default-logging

View File

@ -314,23 +314,6 @@ class InstallCommand
unset($yaml['services']['redis']);
}
// Remove LetsEncrypt if it's not enabled.
$letsEncryptHost = $env['LETSENCRYPT_HOST'] ?? null;
$letsEncryptEmail = $env['LETSENCRYPT_EMAIL'] ?? null;
if (empty($letsEncryptHost)) {
unset(
$yaml['services']['nginx_proxy_letsencrypt'],
$yaml['services']['web']['environment']['LETSENCRYPT_HOST'],
$yaml['services']['web']['environment']['LETSENCRYPT_EMAIL']
);
} elseif (empty($letsEncryptEmail)) {
unset(
$yaml['services']['web']['environment']['LETSENCRYPT_EMAIL'],
$yaml['services']['nginx_proxy_letsencrypt']['environment']['DEFAULT_EMAIL']
);
}
// Remove privileged-mode settings if not enabled.
$enablePrivileged = $env->getAsBool('AZURACAST_COMPOSE_PRIVILEGED', true);
if (!$enablePrivileged) {