From 377374240ca7111296aebcec9f448a6ba43b66cf Mon Sep 17 00:00:00 2001 From: Itiligent <94789708+itiligent@users.noreply.github.com> Date: Fri, 10 Nov 2023 10:50:44 +1100 Subject: [PATCH] clarify default of UTC if blank TZ given --- 1-setup.sh | 2 +- 2-install-guacamole.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/1-setup.sh b/1-setup.sh index 964a14f..d5476a7 100644 --- a/1-setup.sh +++ b/1-setup.sh @@ -116,7 +116,7 @@ GUAC_DB="" # If blank default is guacamole_db GUAC_USER="" # If blank default is guacamole_user MYSQL_ROOT_PWD="" # Requires an entry here or at script prompt. GUAC_PWD="" # Requires an entry here or at script prompt. -DB_TZ=$(cat /etc/timezone) # MySQL timezone default=(cat /etc/timezone) or change to "UTC" if required. +DB_TZ=$(cat /etc/timezone) # Leave blank for UTC, for local tz $(cat /etc/timezone) INSTALL_TOTP="" # Add TOTP MFA extension (true/false) INSTALL_DUO="" # Add DUO MFA extension (can't be installed simultaneously with TOTP, true/false) INSTALL_LDAP="" # Add Active Directory extension (true/false) diff --git a/2-install-guacamole.sh b/2-install-guacamole.sh index 632cd41..06c8d43 100644 --- a/2-install-guacamole.sh +++ b/2-install-guacamole.sh @@ -568,7 +568,7 @@ ALTER USER 'root'@'localhost' IDENTIFIED BY '$MYSQL_ROOT_PWD';" else timezone=${DB_TZ} if [[ -z "${DB_TZ}" ]]; then - echo -e "Couldn't find system timezone, using UTC$" + echo -e "No timezone specified, using UTC" timezone="UTC" fi echo -e "Setting MySQL database timezone as ${timezone}${GREY}"