Skip to content

Commit 834e66e

Browse files
committed
another go at making sure the combined.pem gets proper ownership after LetsEncrypt renew. Explicitly strip carriage return from exec output.
git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6063 b75ad72c-e7d7-11dd-a971-7dbc132099af
1 parent 0cf7a7a commit 834e66e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

mig/install/migcheckssl-template.sh.cronjob

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,13 @@ if [[ ${org_mtime} -ne ${new_mtime} && "${org_chksum}" != "${new_chksum}" ]]; th
192192
cat ${server_pem} ${server_crt_ca_pem} > ${combined_pem}
193193
chmod 400 ${server_pem} ${combined_pem}
194194
# IMPORTANT: daemons will fail unless combined_pem is UID/GID-owned
195+
# NOTE: strip trailing carriage return from podman exec output at least
195196
if [ -z "${container_manager}" ]; then
196197
MIGUID=$(id -u ${mig_user})
197198
MIGGID=$(id -g ${mig_group})
198199
else
199-
MIGUID=$(${container_manager} exec -it migrid id -u ${mig_user})
200-
MIGGID=$(${container_manager} exec -it migrid id -g ${mig_group})
200+
MIGUID=$(${container_manager} exec -it migrid id -u ${mig_user} | tr -d '\r')
201+
MIGGID=$(${container_manager} exec -it migrid id -g ${mig_group} | tr -d '\r')
201202
fi
202203
chown "${MIGUID}:${MIGGID}" ${combined_pem}
203204
if [[ ${verbose} -eq 1 ]]; then

0 commit comments

Comments
 (0)