certbot: fix haproxy hook (ssl cert directory detection)
It was matching additional parameters. Now it matches on the first argument after "crt"
This commit is contained in:
parent
43122a5ea9
commit
c89d699518
|
@ -29,6 +29,7 @@ The **patch** part changes incrementally at each release.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
* certbot: fix haproxy hook (ssl cert directory detection)
|
||||||
* certbot: install certbot dependencies non-interactively for jessie
|
* certbot: install certbot dependencies non-interactively for jessie
|
||||||
* elasticsearch: set tmpdir before datadir
|
* elasticsearch: set tmpdir before datadir
|
||||||
* elasticsearch: configure cluster with seed hosts and initial masters
|
* elasticsearch: configure cluster with seed hosts and initial masters
|
||||||
|
|
|
@ -36,7 +36,7 @@ cert_and_key_mismatch() {
|
||||||
}
|
}
|
||||||
detect_haproxy_cert_dir() {
|
detect_haproxy_cert_dir() {
|
||||||
# get last field or line wich defines the crt directory
|
# get last field or line wich defines the crt directory
|
||||||
config_cert_dir=$(grep -r -o -E -h '^\s*bind .* crt /etc/.+\b' "${haproxy_config_file}" | head -1 | awk '{ print $(NF)}')
|
config_cert_dir=$(grep -r -o -E -h '^\s*bind .* crt /etc/\S+' "${haproxy_config_file}" | head -1 | awk '{ print $(NF)}')
|
||||||
if [ -n "${config_cert_dir}" ]; then
|
if [ -n "${config_cert_dir}" ]; then
|
||||||
debug "Cert directory is configured with ${config_cert_dir}"
|
debug "Cert directory is configured with ${config_cert_dir}"
|
||||||
echo "${config_cert_dir}"
|
echo "${config_cert_dir}"
|
||||||
|
|
Loading…
Reference in a new issue