forked from evolix/ansible-roles
cerbot: parse HAProxy config file only if HAProxy is found
This commit is contained in:
parent
84bd3372d5
commit
98f798b9fb
|
@ -29,6 +29,8 @@ The **patch** part changes incrementally at each release.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
* cerbot: parse HAProxy config file only if HAProxy is found
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
|
|
||||||
### Security
|
### Security
|
||||||
|
|
|
@ -56,6 +56,9 @@ main() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if daemon_found_and_running; then
|
if daemon_found_and_running; then
|
||||||
|
readonly haproxy_config_file="/etc/haproxy/haproxy.cfg"
|
||||||
|
readonly haproxy_cert_dir=$(detect_haproxy_cert_dir)
|
||||||
|
|
||||||
if found_renewed_lineage; then
|
if found_renewed_lineage; then
|
||||||
haproxy_cert_file="${haproxy_cert_dir}/$(basename "${RENEWED_LINEAGE}").pem"
|
haproxy_cert_file="${haproxy_cert_dir}/$(basename "${RENEWED_LINEAGE}").pem"
|
||||||
failed_cert_file="/root/$(basename "${RENEWED_LINEAGE}").failed.pem"
|
failed_cert_file="/root/$(basename "${RENEWED_LINEAGE}").failed.pem"
|
||||||
|
@ -86,7 +89,5 @@ readonly VERBOSE=${VERBOSE:-"0"}
|
||||||
readonly QUIET=${QUIET:-"0"}
|
readonly QUIET=${QUIET:-"0"}
|
||||||
|
|
||||||
readonly haproxy_bin=$(command -v haproxy)
|
readonly haproxy_bin=$(command -v haproxy)
|
||||||
readonly haproxy_config_file="/etc/haproxy/haproxy.cfg"
|
|
||||||
readonly haproxy_cert_dir=$(detect_haproxy_cert_dir)
|
|
||||||
|
|
||||||
main
|
main
|
||||||
|
|
Loading…
Reference in a new issue