gsadmin/rustguac
1
0
Fork 0
mirror of https://github.com/sol1/rustguac.git synced 2026-10-27 14:07:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(install): give the one prompt a flag, and say where the answers live

Browse Source 
The encrypted drive for RDP file transfer is the only question this installer
asks, and the only way to answer it ahead of time was an environment variable
that --help did not mention. So the one thing a scripted install needs to know
was the one thing the usage text left out, next to --no-deps and --no-tls,
which are flags precisely because skipping a step is a normal thing to want.

--no-drive is an alias for RUSTGUAC_DRIVE_SETUP=no rather than a second switch
reaching the same place, so there is one variable to read when the answer comes
out wrong. Setting it during argument parsing also lets it win over an
inherited RUSTGUAC_DRIVE_SETUP=yes, which is the precedence an explicit flag
should have.

--help now lists all five drive variables and, more usefully, the three ways
the prompt already answers itself: an existing container, a missing cryptsetup,
or stdin that is not a terminal. Someone seeing the prompt on one machine and
not another is looking at one of those rather than at a bug, and someone not
seeing it where they expected it is looking at the first.

It also points at PREFIX/guacd.env, since the neighbouring trap is setting
something directly in a unit file the next install rewrites.

(cherry picked from commit 8d2f2c000a62d5125e71f2e5395c9edef08ea81a)
This commit is contained in:
pletch
2026-09-19 10:54:30 -04:00
committed by Dave Kempe
parent e6b61915dc
commit ea6e4e95cf
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.sh
+27 -1
View File
@@ -37,14 +37,40 @@ for arg in "$@"; do
--deps-only) DEPS_ONLY=1 ;;
--no-tls) NO_TLS=1 ;;
--hostname=*) TLS_HOSTNAME="${arg#--hostname=}" ;;
# An alias for the environment variable rather than a second switch
# reaching the same place, so there is one thing to read when the
# answer looks wrong. Set here, it also wins over an inherited
# RUSTGUAC_DRIVE_SETUP=yes, which is the precedence an explicit flag
# should have.
--no-drive) RUSTGUAC_DRIVE_SETUP=no ;;
-h|--help)
echo "Usage: sudo $0 [--deps-only|--no-deps] [--no-tls] [--hostname=FQDN]"
echo "Usage: sudo $0 [--deps-only|--no-deps] [--no-tls] [--no-drive]"
echo " [--hostname=FQDN]"
echo ""
echo "Options:"
echo " --deps-only Only install system packages, then exit"
echo " --no-deps Skip apt install (assume packages already present)"
echo " --no-tls Skip TLS certificate generation (plain HTTP only)"
echo " --no-drive Skip the encrypted drive prompt (same as"
echo " RUSTGUAC_DRIVE_SETUP=no)"
echo " --hostname=FQDN Hostname for TLS certificate (default: system hostname)"
echo ""
echo "Environment:"
echo " The encrypted drive for RDP file transfer is the only part of this"
echo " installer that asks a question. It is skipped on its own when the"
echo " container already exists, when cryptsetup is missing, or when stdin"
echo " is not a terminal; these answer it otherwise."
echo ""
echo " RUSTGUAC_DRIVE_SETUP yes|no — answer the prompt without a terminal"
echo " RUSTGUAC_DRIVE_SIZE LUKS container size (default: 4G)"
echo " RUSTGUAC_DRIVE_MOUNT Mount point (default: /mnt/rustguac-drives)"
echo " RUSTGUAC_LUKS_DEVICE Container path (default: PREFIX/drives.luks)"
echo " RUSTGUAC_LUKS_NAME dm-crypt mapper name (default: rustguac-drives)"
echo ""
echo " Settings for guacd itself belong in PREFIX/guacd.env, which is"
echo " created once and never overwritten; the unit files are rewritten on"
echo " every run, so anything set in them directly is lost at the next"
echo " install."
exit 0
;;
esac