Skip to content

Commit 36ef420

Browse files
committed
[letsencrypt] Rename script for updating certificates
This patch renames the update-haproxy-cert script to update-loadbalancer-cert to make the name more generic. The change is necessary because support for ProxySQL will be introduced in the next patch, requiring a name that reflects broader applicability. To keep the diff in the following patch clean and easier to review, this patch focuses exclusively on the rename. Change-Id: I15f9b5cf3976f4298cdc7da4530f2d7d09614e88
1 parent b1be326 commit 36ef420

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

docker/haproxy/haproxy-ssh/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
3434
RUN chmod 644 /usr/local/bin/kolla_extend_start \
3535
&& sed -ri 's/session(\s+)required(\s+)pam_loginuid.so/session\1optional\2pam_loginuid.so/' /etc/pam.d/sshd
3636

37-
COPY update-haproxy-cert.sh /usr/bin/update-haproxy-cert
37+
COPY update-loadbalancer-cert.sh /usr/bin/update-loadbalancer-cert
3838

3939
{{ macros.kolla_patch_sources() }}
4040

File renamed without changes.

docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ if [ "${INTERNAL_SET}" = "true" ] || [ "${EXTERNAL_SET}" = "true" ]; then
8181
internal_cert_path=$(find /etc/letsencrypt/lego/internal/ -name '*.pem')
8282
sed -i '/^$/d' ${internal_cert_path}
8383
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
84-
ssh -p ${port} -i /var/lib/letsencrypt/.ssh/id_rsa -o StrictHostKeyChecking=no haproxy@${server} "/usr/bin/update-haproxy-cert --internal"
84+
ssh -p ${port} -i /var/lib/letsencrypt/.ssh/id_rsa -o StrictHostKeyChecking=no haproxy@${server} "/usr/bin/update-loadbalancer-cert --internal"
8585
else
8686
external_cert_path=$(find /etc/letsencrypt/lego/external/ -name '*.pem')
8787
sed -i '/^$/d' ${external_cert_path}
8888
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
89-
ssh -p ${port} -i /var/lib/letsencrypt/.ssh/id_rsa -o StrictHostKeyChecking=no haproxy@${server} "/usr/bin/update-haproxy-cert --external"
89+
ssh -p ${port} -i /var/lib/letsencrypt/.ssh/id_rsa -o StrictHostKeyChecking=no haproxy@${server} "/usr/bin/update-loadbalancer-cert --external"
9090
fi
9191

9292
done

0 commit comments

Comments
 (0)