diff --git a/1-setup.sh b/1-setup.sh index a0754ac..612649a 100644 --- a/1-setup.sh +++ b/1-setup.sh @@ -106,7 +106,7 @@ INSTALL_LOG="${DOWNLOAD_DIR}/guacamole_install.log" ####################################################################################################################### # Silent setup options - true/false or specific values below prevents prompt at install. EDIT TO SUIT ################# ####################################################################################################################### -SERVER_NAME="" # Server hostname +SERVER_NAME="" # Server hostname. (Blank = use the current hostname.) LOCAL_DOMAIN="" # Local DNS namespace/domain suffix INSTALL_MYSQL="" # Install MySQL locally (true/false) SECURE_MYSQL="" # Apply mysql secure configuration tool (true/false) @@ -139,8 +139,8 @@ LE_DNS_NAME="" # Public DNS name for Lets Encrypt certificates LE_EMAIL="" # Webmaster/admin email for Lets Encrypt notifications BACKUP_EMAIL="" # Email address for backup notifications BACKUP_RETENTION="30" # How many days to keep SQL backups locally for -RDP_SHARE_LABEL="RDP Share" # Customise RDP shared drive name shown in Windows Explorer (e.g. RDP_SHARE_LABEL on RDP_SHARE_HOST) -RDP_SHARE_HOST="" # Customise RDP share name shown in Windows Explorer. (e.g. RDP_SHARE_LABEL on RDP_SHARE_HOST) +RDP_SHARE_LABEL="RDP Share" # Customise RDP shared drive name in Windows Explorer (e.g. RDP_SHARE_LABEL on RDP_SHARE_HOST) +RDP_SHARE_HOST="" # Customise RDP share name in Windows Explorer. Blank = $SERVER_NAME. (e.g. RDP_SHARE_LABEL on RDP_SHARE_HOST) RDP_PRINTER_LABEL="RDP Printer" # Customise RDP printer name shown in Windows ####################################################################################################################### @@ -207,8 +207,8 @@ else TOMCAT_VERSION="tomcat9" fi -# Workaround for current Debian 12 & Tomcat 10 incompatibilities -if [[ ${OS_NAME,,} = "debian" ]] && [[ ${OS_CODENAME,,} = *"bookworm"* ]]; then #(checks for upper and lower case) +# Workaround for current Tomcat incompatibilities with Debian 12 (stable and testing repos) +if [[ ${OS_NAME,,} = "debian" && ${OS_CODENAME,,} = *"bookworm"* ]] || [[ ${OS_NAME,,} = "debian" && ${OS_CODENAME,,} = *"trixie"* ]]; then #(checks for upper and lower case) # Add the oldstable repo and downgrade tomcat version install echo "deb http://deb.debian.org/debian/ bullseye main" | sudo tee /etc/apt/sources.list.d/bullseye.list &> /dev/null sudo apt-get update -qq &> /dev/null @@ -223,7 +223,7 @@ fi # Uncomment here to force a specific Tomcat version. # TOMCAT_VERSION="tomcat9" -# Standardise on a lexicon for the different MySQL package optiions +# Standardise on a lexicon for the different MySQL package options if [[ -z "${MYSQL_VERSION}" ]]; then # Use Linux distro default version. MYSQLSRV="default-mysql-server default-mysql-client mysql-common" # Server @@ -239,7 +239,7 @@ fi # Current package names for various distros are referenced at https://guacamole.apache.org/doc/gug/installing-guacamole.html JPEGTURBO="" LIBPNG="" -if [[ $OS_NAME == "ubuntu" ]] || [[ $OS_NAME == *"ubuntu"* ]]; then # potentially expand out distro choices here +if [[ $OS_NAME == "ubuntu" ]] || [[ $OS_NAME == *"ubuntu"* ]]; then # expand out distro choices here JPEGTURBO="libjpeg-turbo8-dev" LIBPNG="libpng-dev" # Just in case this repo is not present in the distro diff --git a/guac-management/useful-config-info.txt b/guac-management/useful-config-info.txt index 0fcd285..af83b6e 100644 --- a/guac-management/useful-config-info.txt +++ b/guac-management/useful-config-info.txt @@ -90,3 +90,8 @@ Nginx load / DoS testing https://ourcodeworld.com/articles/read/949/how-to-perform-a-dos-attack-slow-http-with-slowhttptest-test-your-server-slowloris-protection-in-kali-linux slowhttptest -c 10000 -H -g -o ./output_file -i 3 -r 500 -t GET -u http://jumpbox.domain.com -x 24 -p 2 + +##################################################### +Allow local browser microphone redirect without TLS +##################################################### +chrome://flags/#unsafely-treat-insecure-origin-as-secure \ No newline at end of file diff --git a/paypal-donate-button.png b/paypal-donate-button.png deleted file mode 100644 index 7cd94d1..0000000 Binary files a/paypal-donate-button.png and /dev/null differ