Skip to content

Commit

Permalink
[v14] Reload teleport service config on upgrade (#41548)
Browse files Browse the repository at this point in the history
* Reload teleport service config on upgrade

* Ignore daemon-reload error
  • Loading branch information
bernardjkim committed May 15, 2024
1 parent f107f71 commit bdda5de
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
7 changes: 6 additions & 1 deletion build.assets/build-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ if [[ "${PACKAGE_TYPE}" == "pkg" ]]; then
PKG_FILENAME="teleport-${TELEPORT_VERSION}${ARCH_TAG}.${PACKAGE_TYPE}"
fi
else
FILE_LIST="${TAR_PATH}/tsh ${TAR_PATH}/tctl ${TAR_PATH}/teleport ${TAR_PATH}/tbot ${TAR_PATH}/examples/systemd/teleport.service"
FILE_LIST="${TAR_PATH}/tsh ${TAR_PATH}/tctl ${TAR_PATH}/teleport ${TAR_PATH}/tbot ${TAR_PATH}/examples/systemd/teleport.service ${TAR_PATH}/examples/systemd/post-upgrade"
LINUX_BINARY_FILE_LIST="${TAR_PATH}/tsh ${TAR_PATH}/tctl ${TAR_PATH}/tbot ${TAR_PATH}/teleport"
LINUX_SYSTEMD_FILE_LIST="${TAR_PATH}/examples/systemd/teleport.service"
EXTRA_DOCKER_OPTIONS=""
Expand Down Expand Up @@ -290,6 +290,10 @@ if [[ "${PACKAGE_TYPE}" != "pkg" ]]; then
mv -v ${LINUX_CONFIG_FILE} ${PACKAGE_TEMPDIR}/buildroot${LINUX_CONFIG_DIR}
CONFIG_FILE_STANZA="--config-files /src/buildroot${LINUX_CONFIG_DIR}/${LINUX_CONFIG_FILE} "
fi

# include post-upgrade script
mv -v ${TAR_PATH}/examples/systemd/post-upgrade ${PACKAGE_TEMPDIR}

# /var/lib/teleport
# shellcheck disable=SC2174
mkdir -p -m0700 ${PACKAGE_TEMPDIR}/buildroot${LINUX_DATA_DIR}
Expand Down Expand Up @@ -365,6 +369,7 @@ else
--provides teleport \
--prefix / \
--verbose \
--after-upgrade /src/post-upgrade \
${CONFIG_FILE_STANZA} \
${FILE_PERMISSIONS_STANZA} \
${RPM_SIGN_STANZA} .
Expand Down
11 changes: 11 additions & 0 deletions examples/systemd/post-upgrade
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

# this post upgrade script is run each time the teleport package is upgraded

set -eu

# skip reload and restart when systemd is disabled. This is only relevant when
# testing in a container.
if [ -d /run/systemd/system ]; then
systemctl --system daemon-reload >/dev/null || true
fi

0 comments on commit bdda5de

Please sign in to comment.