Merge pull request #999 from openziti/995-enhance-linux-package-posti…

…nstall-hint add an identity hint to postinstall output
openziti · Oct 4, 2024 · 2030561 · 2030561
2 parents 2d9461e + 80c0305
commit 2030561
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/programs/ziti-edge-tunnel/package/deb/postinst.in b/programs/ziti-edge-tunnel/package/deb/postinst.in
@@ -116,12 +116,18 @@ 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".
+      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
@@ -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 %"$ssize"s | tr " " "-"
     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\n'
 fi