diff --git a/1-setup.sh b/1-setup.sh index 22f4e0c..adc162c 100644 --- a/1-setup.sh +++ b/1-setup.sh @@ -124,7 +124,7 @@ INSTALL_QCONNECT="" # Add Guacamole console quick connect feature (t INSTALL_HISTREC="" # Add Guacamole history recording storage feature (true/false) HISTREC_PATH="" # If blank sets Apache default /var/lib/guacamole/recordings GUAC_URL_REDIR="" # Add auto redirect from http://xxx:8080 root to http://xxx:8080/guacamole) -INSTALL_NGINX="" # Install and configure Nginx and reverse proxy Guacamole (http port 80 only, true/false) +INSTALL_NGINX="" # Install and configure Nginx and reverse proxy Guacamole (via http port 80 only, true/false) PROXY_SITE="" # Local DNS name for reverse proxy site and/or self signed TLS certificates SELF_SIGN="" # Add self signed TLS support to Nginx (Let's Encrypt not available with this option, true/false) RSA_KEYLENGTH="2048" # Self signed RSA TLS key length. At least 2048, must not be blank. @@ -144,7 +144,7 @@ RDP_SHARE_LABEL="RDP Share" # Customise RDP shared drive name shown in Windo RDP_PRINTER_LABEL="RDP Printer" # Customise RDP printer name shown in Windows ####################################################################################################################### -# Download GitHub setup scripts. BEFORE RUNNING SETUP, COMMENT DOWNLOAD LINES OF SCRIPTS YOU HAVE EDITED ! ############ +# Download GitHub setup scripts. BEFORE RUNNING SETUP, COMMENT OUT DOWNLOAD LINES OF ANY SCRIPTS YOU HAVE EDITED ! #### ####################################################################################################################### # Script branding header @@ -179,10 +179,10 @@ wget -q --show-progress ${GITHUB}/branding.jar -O branding.jar chmod +x *.sh # Pause here to optionally customise downloaded scripts before any actual install actions have began -echo -e "${LYELLOW}Ctrl+Z now to exit now if you wish to customise 1-setup.sh options or to setup an unattended install." +echo -e "${LYELLOW}Ctrl+Z now to exit now if you wish to customise 1-setup.sh options or create an unattended install." echo -# Use this first sudo command as a trigger to pause for setup script customisation above, or continue as sudo where needed. +# Use this first sudo command as a trigger to pause for setup script customisation, or continue as sudo where needed. sudo apt-get update -qq &> /dev/null ####################################################################################################################### diff --git a/2-install-guacamole.sh b/2-install-guacamole.sh index 5e25e88..8270887 100644 --- a/2-install-guacamole.sh +++ b/2-install-guacamole.sh @@ -19,7 +19,7 @@ NC='\033[0m' #No Colour # Update everything but don't do the annoying prompts during apt installs echo -e "${GREY}Updating base Linux OS..." export DEBIAN_FRONTEND=noninteractive -apt-get update -qq >/dev/null +apt-get update -qq &> /dev/null apt-get upgrade -qq -y &>>${INSTALL_LOG} if [[ $? -ne 0 ]]; then echo -e "${LRED}Failed. See ${INSTALL_LOG}${GREY}" 1>&2 @@ -62,7 +62,7 @@ fi # Install Guacamole build dependencies (pwgen needed for duo config only, expect is auto removed after install) echo -e "${GREY}Installing dependencies required for building Guacamole, this might take a few minutes..." -apt-get update -qq >/dev/null +apt-get update -qq &> /dev/null apt-get -qq -y install ${MYSQLPKG} ${TOMCAT_VERSION} ${JPEGTURBO} ${LIBPNG} ufw pwgen expect \ build-essential libcairo2-dev libtool-bin uuid-dev libavcodec-dev libavformat-dev libavutil-dev \ libswscale-dev freerdp2-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libwebsockets-dev \ diff --git a/3-install-nginx.sh b/3-install-nginx.sh index 8c599e5..9762cf0 100644 --- a/3-install-nginx.sh +++ b/3-install-nginx.sh @@ -37,7 +37,7 @@ INSTALL_LOG= GUAC_URL= # Install Nginx -apt-get update -qq >/dev/null +apt-get update -qq &> /dev/null apt-get install nginx -qq -y &>>${INSTALL_LOG} echo -e "${GREY}Configuring Nginx as a reverse proxy for Guacamole's Apache Tomcat front end...${DGREY}" diff --git a/4b-install-tls-letsencrypt-nginx.sh b/4b-install-tls-letsencrypt-nginx.sh index 98d0727..db4ac7c 100644 --- a/4b-install-tls-letsencrypt-nginx.sh +++ b/4b-install-tls-letsencrypt-nginx.sh @@ -34,7 +34,7 @@ echo -e "${LGREEN}Installing Let's Encrypt TLS configuration for Nginx...${GREY} echo # Install nginx -apt-get update -qq >/dev/null +apt-get update -qq &> /dev/null apt-get install nginx certbot python3-certbot-nginx -qq -y &>>${INSTALL_LOG} # Backup the current Nginx config diff --git a/guac-optional-features/add-fail2ban.sh b/guac-optional-features/add-fail2ban.sh index 3c7e69f..e43419f 100644 --- a/guac-optional-features/add-fail2ban.sh +++ b/guac-optional-features/add-fail2ban.sh @@ -94,8 +94,8 @@ fi if [[ "${FAIL2BAN_BASE}" = true ]]; then #Update and install fail2ban (and john for management of config file updates, and not overwrite any existing settings) - apt-get update -qq >/dev/null 2>&1 - apt-get install fail2ban john -qq -y >/dev/null 2>&1 + apt-get update -qq + apt-get install fail2ban john -qq -y # Create the basic jail.local template and local subnet whitelist cat >/tmp/fail2ban.conf </dev/null 2>&1 +apt-get update -qq DEBIAN_FRONTEND="noninteractive" apt-get install postfix mailutils -qq -y >/dev/null 2>&1 if [[ $? -ne 0 ]]; then echo -e "${LRED}Postfix install failed. ${GREY}" 1>&2