From c37c3ecfaae16ffaf302361323a25b9c859099c0 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Fri, 25 Oct 2024 14:09:53 -0400 Subject: [PATCH 1/2] fix postinstall scriptlet syntax --- programs/ziti-edge-tunnel/package/deb/postinst.in | 10 +++++++++- programs/ziti-edge-tunnel/package/rpm/post.sh.in | 12 +++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/programs/ziti-edge-tunnel/package/deb/postinst.in b/programs/ziti-edge-tunnel/package/deb/postinst.in index 311c4b6ff..dd001c2e2 100644 --- a/programs/ziti-edge-tunnel/package/deb/postinst.in +++ b/programs/ziti-edge-tunnel/package/deb/postinst.in @@ -116,7 +116,15 @@ if [ "$1" = "configure" ]; then fi printf '\n' printf %"$ssize"s | tr " " "-" - echo "@SYSTEMD_SERVICE_NAME@ was installed..." + printf '\n' + if [ -n "$2" ]; then + echo "Completed configuration of @SYSTEMD_SERVICE_NAME@ (previous version: $2)." + else + echo "Completed clean install of @SYSTEMD_SERVICE_NAME@."\ + "Get started by adding an identity: Start @SYSTEMD_UNIT_FILE_NAME@ and run:" \ + | fold -w $ssize + echo ' ziti-edge-tunnel add --jwt "$(< ziti_id.jwt)" --identity "ziti_id"' + fi if [ "${service_user}" = "root" ]; then echo "@SYSTEMD_SERVICE_NAME@ will run as root, since policykit cannot be configured to authorize set-llmnr on this system". fi diff --git a/programs/ziti-edge-tunnel/package/rpm/post.sh.in b/programs/ziti-edge-tunnel/package/rpm/post.sh.in index e147017f9..6c9255097 100644 --- a/programs/ziti-edge-tunnel/package/rpm/post.sh.in +++ b/programs/ziti-edge-tunnel/package/rpm/post.sh.in @@ -42,9 +42,15 @@ if [ $1 -ne 0 ]; then fi printf '\n' printf %"$ssize"s | tr " " "-" - echo "$SYSTEMD_SERVICE_NAME was installed..." - echo "First install an OpenZiti identity or enroll token in: @ZITI_IDENTITY_DIR@" - echo "then start or restart this systemd service unit." + printf '\n' + if [ $1 -eq 2 ]; then + echo "Completed configuration of $SYSTEMD_SERVICE_NAME" + elif [ $1 -eq 1 ]; then + echo "Completed clean install of $SYSTEMD_SERVICE_NAME"\ + "Get started by adding an identity: Start $SYSTEMD_UNIT_FILE_NAME and run:" \ + | fold -w $ssize + echo ' ziti-edge-tunnel add --jwt "$(< ziti_id.jwt)" --identity "ziti_id"' + fi printf %"$ssize"s | tr " " "-" printf '\n' fi From b5dbfe0c269fabdd0b79719f14a0b1287eea9997 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Fri, 25 Oct 2024 14:14:41 -0400 Subject: [PATCH 2/2] catchup v1 postinst scriptlet --- programs/ziti-edge-tunnel/package/deb/postinst.in | 6 ++---- programs/ziti-edge-tunnel/package/rpm/post.sh.in | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/ziti-edge-tunnel/package/deb/postinst.in b/programs/ziti-edge-tunnel/package/deb/postinst.in index dd001c2e2..24e8fedb9 100644 --- a/programs/ziti-edge-tunnel/package/deb/postinst.in +++ b/programs/ziti-edge-tunnel/package/deb/postinst.in @@ -126,10 +126,8 @@ if [ "$1" = "configure" ]; then echo ' ziti-edge-tunnel add --jwt "$(< ziti_id.jwt)" --identity "ziti_id"' fi if [ "${service_user}" = "root" ]; then - echo "@SYSTEMD_SERVICE_NAME@ will run as root, since policykit cannot be configured to authorize set-llmnr on this system". + echo "@SYSTEMD_SERVICE_NAME@ will run as root, since policykit cannot be configured to authorize set-llmnr on this system". | fold -w $ssize fi - echo "First install an OpenZiti identity or enroll token in: @ZITI_IDENTITY_DIR@" - echo "then start or restart this systemd service unit." printf %"$ssize"s | tr " " "-" - printf '\n' + printf '\n\n' fi diff --git a/programs/ziti-edge-tunnel/package/rpm/post.sh.in b/programs/ziti-edge-tunnel/package/rpm/post.sh.in index 6c9255097..2ff1f64c6 100644 --- a/programs/ziti-edge-tunnel/package/rpm/post.sh.in +++ b/programs/ziti-edge-tunnel/package/rpm/post.sh.in @@ -52,5 +52,5 @@ if [ $1 -ne 0 ]; then echo ' ziti-edge-tunnel add --jwt "$(< ziti_id.jwt)" --identity "ziti_id"' fi printf %"$ssize"s | tr " " "-" - printf '\n' + printf '\n\n' fi