fix: haproxy letsencrypt integration and upgrade EasyHAProxy to 6.5.1
The letsencrypt integration set EASYHAPROXY_LETSENCRYPT_EMAIL (with a stray quote) and a letsencrypt label, which EasyHAProxy has not read since before 4.6.0. With an email set, http redirected to https and nothing answered on 443. - Pass EASYHAPROXY_CERTBOT_EMAIL and EASYHAPROXY_CERTBOT_SERVER. - Label the app with certbot=true on its http definition: EasyHAProxy requests the certificate and serves https itself, so the separate 443 definition goes. https labels are only added when a letsencrypt email is set, as documented. - Keep the certificates in /var/lib/dokku/data/haproxy. - Turn the stats page off with HAPROXY_STATS_ENABLE=false. - Upgrade EasyHAProxy from 6.1.1 to 6.5.1.
This commit is contained in:
1 parent
898924e541
commit
4887cf458e
6 files changed
+19
-20
No files matched your search
@@ -39,7 +39,8 @@ fn-haproxy-template-compose-file() {
|
||||
HAPROXY_LOG_LEVEL="$(fn-haproxy-computed-log-level)"
|
||||
HAPROXY_LETSENCRYPT_EMAIL="$(fn-haproxy-computed-letsencrypt-email)"
|
||||
HAPROXY_LETSENCRYPT_SERVER="$(fn-haproxy-computed-letsencrypt-server)"
|
||||
HAPROXY_REFRESH_CONF="$(fn-haproxy-computed-refresh-conf)")
|
||||
HAPROXY_REFRESH_CONF="$(fn-haproxy-computed-refresh-conf)"
|
||||
HAPROXY_DATA_DIR="${DOKKU_LIB_ROOT}/data/haproxy")
|
||||
|
||||
sigil -f "$COMPOSE_TEMPLATE" "${SIGIL_PARAMS[@]}" | cat -s >"$OUTPUT_PATH"
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user