diff options
| author | Zuul <zuul@review.opendev.org> | 2025-01-10 15:27:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-01-10 15:27:03 +0000 |
| commit | 744ba3b98e685d6bec1cd590adc5e8727d8a9663 (patch) | |
| tree | d8f0b37ac91d5ee705870e24297eddd5b9ca2e64 /docker | |
| parent | c781c66d2b4fe43d169794bb6e34d6a4d147579c (diff) | |
| parent | 36ef420f827dd1d8150720f2ab84ddd34c54ca36 (diff) | |
| download | kolla-744ba3b98e685d6bec1cd590adc5e8727d8a9663.tar.gz kolla-744ba3b98e685d6bec1cd590adc5e8727d8a9663.zip | |
Merge "[letsencrypt] Rename script for updating certificates"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/haproxy/haproxy-ssh/Dockerfile.j2 | 2 | ||||
| -rwxr-xr-x | docker/haproxy/haproxy-ssh/update-loadbalancer-cert.sh (renamed from docker/haproxy/haproxy-ssh/update-haproxy-cert.sh) | 0 | ||||
| -rw-r--r-- | docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/haproxy/haproxy-ssh/Dockerfile.j2 b/docker/haproxy/haproxy-ssh/Dockerfile.j2 index b875875f8..c5b8391a4 100644 --- a/docker/haproxy/haproxy-ssh/Dockerfile.j2 +++ b/docker/haproxy/haproxy-ssh/Dockerfile.j2 @@ -34,7 +34,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 644 /usr/local/bin/kolla_extend_start \ && sed -ri 's/session(\s+)required(\s+)pam_loginuid.so/session\1optional\2pam_loginuid.so/' /etc/pam.d/sshd -COPY update-haproxy-cert.sh /usr/bin/update-haproxy-cert +COPY update-loadbalancer-cert.sh /usr/bin/update-loadbalancer-cert {{ macros.kolla_patch_sources() }} diff --git a/docker/haproxy/haproxy-ssh/update-haproxy-cert.sh b/docker/haproxy/haproxy-ssh/update-loadbalancer-cert.sh index 7e4122c65..7e4122c65 100755 --- a/docker/haproxy/haproxy-ssh/update-haproxy-cert.sh +++ b/docker/haproxy/haproxy-ssh/update-loadbalancer-cert.sh diff --git a/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh b/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh index e3b61797e..e1e421c46 100644 --- a/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh +++ b/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh @@ -81,12 +81,12 @@ if [ "${INTERNAL_SET}" = "true" ] || [ "${EXTERNAL_SET}" = "true" ]; then internal_cert_path=$(find /etc/letsencrypt/lego/internal/ -name '*.pem') sed -i '/^$/d' ${internal_cert_path} rsync -av -e "ssh -p ${port} -o StrictHostKeyChecking=no -o IdentityFile=/var/lib/letsencrypt/.ssh/id_rsa" ${internal_cert_path} haproxy@${server}:/var/lib/haproxy/haproxy-internal.pem --delete >/dev/null 2>&1 - ssh -p ${port} -i /var/lib/letsencrypt/.ssh/id_rsa -o StrictHostKeyChecking=no haproxy@${server} "/usr/bin/update-haproxy-cert --internal" + ssh -p ${port} -i /var/lib/letsencrypt/.ssh/id_rsa -o StrictHostKeyChecking=no haproxy@${server} "/usr/bin/update-loadbalancer-cert --internal" else external_cert_path=$(find /etc/letsencrypt/lego/external/ -name '*.pem') sed -i '/^$/d' ${external_cert_path} rsync -av -e "ssh -p ${port} -o StrictHostKeyChecking=no -o IdentityFile=/var/lib/letsencrypt/.ssh/id_rsa" ${external_cert_path} haproxy@${server}:/var/lib/haproxy/haproxy.pem --delete >/dev/null 2>&1 - ssh -p ${port} -i /var/lib/letsencrypt/.ssh/id_rsa -o StrictHostKeyChecking=no haproxy@${server} "/usr/bin/update-haproxy-cert --external" + ssh -p ${port} -i /var/lib/letsencrypt/.ssh/id_rsa -o StrictHostKeyChecking=no haproxy@${server} "/usr/bin/update-loadbalancer-cert --external" fi done |