From 120e4aed1734a6b7405e758a49979ac0974b64a4 Mon Sep 17 00:00:00 2001
From: Boris Gallet <boris.gallet@gmail.com>
Date: Tue, 2 Sep 2025 16:18:38 +0200
Subject: [PATCH] fix: [zato] restart load-balancer after updating the .pem
 cert

---
 zato/actions/.renew_crt.swp                     | Bin 0 -> 12288 bytes
 zato/actions/renew_crt                          |  12 ++++++++++++
 zato/hooks/.init.swp                            | Bin 0 -> 12288 bytes
 zato/hooks/init                                 |   4 ++++
 zato/lib/common                                 |   2 +-
 .../resources/opt/zato/restart-load-balancer.sh |  14 ++++++++++++++
 6 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 zato/actions/.renew_crt.swp
 create mode 100644 zato/hooks/.init.swp
 create mode 100755 zato/resources/opt/zato/restart-load-balancer.sh

diff --git a/zato/actions/.renew_crt.swp b/zato/actions/.renew_crt.swp
new file mode 100644
index 0000000000000000000000000000000000000000..580885a3e764051d6072ae6552ae8ec352be6b8c
GIT binary patch
literal 12288
zcmeI&&ubGw6bJCBg17n;?=PE}D3aYaQqV|+SOd)=snpt&u*~kxW`}NOmYE4{rRY)r
z4ZV8z?8*N^{DFUhH!r^3CPa&%*XmpNve`{$=FNxXu;fK6yMrOz@mClg7a9BT{cU!3
z=Nx<X?j|!@yYlv*4q*!4y0LGCR8A_9=fe82o}3&P=)wiOC~UB@*N!u8CN>Z`kF*i<
z%ctDwfX7a1WdkFW*big#S4Es$jIK$51Qr5Qm$q*&vs<0j>Ze}!YH;Q9<Hh^*iUdf2
z1W14cNPq-LfCNb3pBHe&5_^ujJTu$r)!BLJ#Cdi}ClVk55+DH*AOR8}0TLhq5+DH*
zAc0dTz!S#aFEiFTkHzEv|MTbnZx<N*g!zbhjd_K6iFtw9!i+FOjEAXVE@751UvZu<
zn9rCunERMDOgVqG#wj$Sl1YFBNPq-LfCNZ@1W14cNZ|hzNF@V2jBrz<V70m^40e8}
z;Ps8srVA;Txk$ii5C<ZjIsq*stmDSDbIp@>#B;7<VOk&+#9BFyUE>B?*KEswqCD^#
z8(X8D-eA<<4oAIV--CP24wEU=stH4G!?IC4lqy_|_8Qea>^q-um00gCxJ)Q~LS;U7
zlK*CP-)7KcaROCedN~-HP4>$q>mFkhVaB5DLJxD{tWdEzEF6~jU~7mKdT?}vMM(#%
zfZvDXo9m711{>SUF81zNlplW7-`*W;^pAJb-4{{2F#6yS5<S7a-(bv##>QrEdl)|K
z?Q90QjDm6_8tbpuVOW-sz|ZTWo|CDJIpU_;K<OIJT}#$#KR6nFCxy163re>$t@kXe
N*Mdl@AmTP-KLC=U&;S4c

literal 0
HcmV?d00001

diff --git a/zato/actions/renew_crt b/zato/actions/renew_crt
index 6b7c6c2..2fbe42f 100755
--- a/zato/actions/renew_crt
+++ b/zato/actions/renew_crt
@@ -9,3 +9,15 @@ DOMAIN=$(relation:get "$SERVICE_NAME":web-proxy domain)
 
 
 merge_crt_letsencrypt "$DOMAIN" || exit 1 
+
+zato_commands="
+cd /opt/zato &&
+./restart-load-balancer.sh
+"
+
+if ! exec_as_zato_in_container "$zato_commands"; then
+    printf "Error: failed to execute 'restart-load-balancer' in container '%s'.\n" "$CONTAINER_NAME" >&2
+    return 1
+fi
+
+echo "load balancer restarted"
diff --git a/zato/hooks/.init.swp b/zato/hooks/.init.swp
new file mode 100644
index 0000000000000000000000000000000000000000..4bb09352adcd28c707121086560fd444046fae88
GIT binary patch
literal 12288
zcmeI2&yU+g6vw9=5N%mn!5K80EWZSfx4;1+?ZLb8wt?)XN<u4Dm8^+9iAU>r%*;5e
zMMxkng*)82bLW7#^5e!I00)lT>46)3?TwS{kF<L&jJ4m4J(+oa^LcNc6zvQ*@3i;m
zdyP$k>pCG1{{Alhr~fo*)!!gWN>g+{?&2zIXftkTE>a^>o+Mm1LOD4-&y|^RS(a&c
z^S}vXrY73u2^&hqtH+O-k!~#Ifp$eIF7)=(Z?VsofF*E-KyF6PyKCg_w{DbMy<S_V
zFFgO@nPIlW60ig;0ZYIVummgtOTZGa1pd1OOm>NUisd~uTVna+0QZ+>&s95nw2dWT
z30MM_fF)oFSOS)SC143y0+xU!U<o{d1Xx7K56=+t)nz!3|NmFN{~ul><S*!V=o=`5
zB-De}p<kaP<P+#s=oRQ?=q2by=sI)_dbmc&FVN4>Pta#j1N!q>oHKylhuY8@^y5`R
zzJ$Jj9zZ!Xg6=}^K$oFEt`PDq^f`10twC3zE6{K7|9j|bs8~z6o+mIK)@4h;60ig;
z0ZYIV_@5G}(=e8YDXnefBC4Tjc>}LM==S{Jo;T<Qt#+?Q>U44t2}PZ3<p9jy+ITIJ
z;Q?2{n416{7~J=JciKCCu<z~puwI<Gti4W1jZj<;b+wwh<?&2M8=TEN_l&0ETIMR`
zdZXv}2VQRwbh=(^+v|AyJAN<NZFl_U>aXyosZ8<-*Uj>!_uxX%Zu!A&ruCszQIp=U
zZHR~m*{tLKv3KRb7Sr)iG8LU19?iSYo7C^$IyqeH_%YU7e3*{|KV`#&mmUpN&X*nO
z$l~j1(Bg)PL>ErahwyYNluRc)HBE8?d6N`JTb)p*BQbVZgpeT5mlunmjd{uyGdz&T
zk<&a>+#q-*C9mJV+wHYV%n04tl|RZt%j@6T?s}Mh`;?t!B#*LCvOG1HtjvS0^4xEE
zvKLunm@-ZxS>y~^!qSkdhK@<SPCMwMRUg%%5}BbQrKv2Ng%OZ-Khn+(I^-eCHK!&P
znvP@=aYb<lPyiQEHZtf)Se}M4IfHF$u@C0EtL7HRmNTijTcwbTxH#1VS%L1Nw&rnK
zSUiLBqP7sLg%twNPFIK}L&ZklSX7ScZmU*8jiqrSo+a`KdDx(d7`mV^ktrb>Dd%ux
zC*tGKs&4Fb_jlVj%X(B)jPmNpkQpIUioaNDL*)o@;dFUy*@XaUuBIa7CymY*P+3H~
z%IIS3xh7lPoexlhw!OX|wD-K5K1^*hB#M}@F{dLXC-g8DVSJo9Gk54jjAMhOqQhJy
z$hi?^>Cs6i3y_t6`)tCCRff4z*yPKr@<J3wEl@V-lqpfv4^5fk%@U-**jVNXvYpS;
z6WJ=$<Om-jpXF`gMARr=zbh3s!6C&wz*Bij`IM_8Y6Ki87*~5m&#k?QHJD;<8<nP-
RHH!><Sa*jab%&^z<X@~?QY8QY

literal 0
HcmV?d00001

diff --git a/zato/hooks/init b/zato/hooks/init
index 1123a45..2060b0b 100755
--- a/zato/hooks/init
+++ b/zato/hooks/init
@@ -22,6 +22,8 @@ DATASTORE_ZATO_DIR="$SERVICE_NAME$ZATO_DIR"
 SSH_PASSWORD_FILE="$SERVICE_DATASTORE"/.compose/password/ssh-password
 DASHBOARD_PASSWORD_FILE="$SERVICE_DATASTORE"/.compose/password/dashboard-password
 IDE_PASSWORD_FILE="$SERVICE_DATASTORE"/.compose/password/ide-password
+## Load balancer script in not in /opt/zato/env/qs-1 because this folder is created after launch
+RESTART_LOADBALANCER_FILE=/opt/zato/restart-load-balancer.sh
 
 ssh_password=$(generate_or_get_secret "$SSH_PASSWORD_FILE")
 dashboard_password=$(generate_or_get_secret "$DASHBOARD_PASSWORD_FILE")
@@ -36,6 +38,8 @@ $SERVICE_NAME:
     Zato_SSH_Password: \"$ssh_password\"
     Zato_Dashboard_Password: \"$dashboard_password\"
     Zato_IDE_Password: \"$ide_password\"
+  volumes:
+    - /srv/charm-store/elabore-charms/zato/resources$RESTART_LOADBALANCER_FILE:$RESTART_LOADBALANCER_FILE
 "
 
 # uid=$(docker_get_uid "$SERVICE_NAME" "zato")
diff --git a/zato/lib/common b/zato/lib/common
index 0e5d8f6..5a5a4ca 100644
--- a/zato/lib/common
+++ b/zato/lib/common
@@ -32,7 +32,7 @@ get_container_name(){
 exec_as_zato_in_container() {
     CONTAINER_NAME=$(get_container_name)
     local cmd="$1"
-    if ! docker exec -it "$CONTAINER_NAME" bash -c "su - zato -c '$cmd'"; then
+    if ! docker exec -i "$CONTAINER_NAME" bash -c "su - zato -c '$cmd'"; then
         printf "Error: Failed to execute command '%s' as zato user in container '%s'\n" "$cmd" "$CONTAINER_NAME" >&2
         return 1
     fi
diff --git a/zato/resources/opt/zato/restart-load-balancer.sh b/zato/resources/opt/zato/restart-load-balancer.sh
new file mode 100755
index 0000000..2b83b64
--- /dev/null
+++ b/zato/resources/opt/zato/restart-load-balancer.sh
@@ -0,0 +1,14 @@
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:~/current/bin
+export PYTHONPATH=:/opt/zato/current/extlib
+export ZATO_PYTHON_REQS=/opt/hot-deploy/python-reqs/requirements.txt
+export ZATO_HOT_DEPLOY_DIR=/opt/hot-deploy/services:
+export ZATO_USER_CONF_DIR=/opt/hot-deploy/user-conf:/tmp/zato-user-conf
+export ZATO_HOT_DEPLOY_PREFER_SNAPSHOTS=True
+export Zato_Is_Quickstart=
+export Zato_Log_Env_Details=True
+export Zato_TLS_Verify=
+export Zato_Is_Docker=True
+
+~/current/bin/zato stop /opt/zato/env/qs-1/load-balancer 
+kill $(ps -aux | grep zato.agent.load_balancer.main | grep -v grep | grep -v /bin/sh | awk '{ print $2 }') 
+~/current/bin/zato start /opt/zato/env/qs-1/load-balancer --env-file /opt/hot-deploy/enmasse/env.ini