diff --git a/ct/apache-guacamole.sh b/ct/apache-guacamole.sh index 7778f1bed..9cf963830 100644 --- a/ct/apache-guacamole.sh +++ b/ct/apache-guacamole.sh @@ -11,7 +11,7 @@ var_disk="${var_disk:-4}" var_cpu="${var_cpu:-1}" var_ram="${var_ram:-2048}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -38,4 +38,4 @@ description msg_ok "Completed Successfully!\n" echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" echo -e "${INFO}${YW} Access it using the following URL:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:8080/guacamole${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:8080/guacamole${CL}" diff --git a/frontend/public/json/apache-guacamole.json b/frontend/public/json/apache-guacamole.json index 0cace84cf..e44d6e6e4 100644 --- a/frontend/public/json/apache-guacamole.json +++ b/frontend/public/json/apache-guacamole.json @@ -23,7 +23,7 @@ "ram": 2048, "hdd": 4, "os": "debian", - "version": "12" + "version": "13" } } ], diff --git a/install/apache-guacamole-install.sh b/install/apache-guacamole-install.sh index 5680b7505..a7736a007 100644 --- a/install/apache-guacamole-install.sh +++ b/install/apache-guacamole-install.sh @@ -13,7 +13,7 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ build-essential \ jq \ libcairo2-dev \ @@ -22,7 +22,7 @@ $STD apt-get install -y \ libtool-bin \ libossp-uuid-dev \ libvncserver-dev \ - freerdp2-dev \ + freerdp3-dev \ libssh2-1-dev \ libtelnet-dev \ libwebsockets-dev \ @@ -56,8 +56,9 @@ mkdir -p /etc/guacamole/{extensions,lib} RELEASE_SERVER=$(curl -fsSL https://api.github.com/repos/apache/guacamole-server/tags | jq -r '.[].name' | grep -v -- '-RC' | head -n 1) curl -fsSL "https://api.github.com/repos/apache/guacamole-server/tarball/refs/tags/${RELEASE_SERVER}" | tar -xz --strip-components=1 -C /opt/apache-guacamole/server cd /opt/apache-guacamole/server +export CPPFLAGS="-Wno-error=deprecated-declarations" $STD autoreconf -fi -$STD ./configure --with-init-dir=/etc/init.d --enable-allow-freerdp-snapshots +$STD ./configure --with-init-dir=/etc/init.d --enable-allow-freerdp-snapshots --disable-guaclog $STD make $STD make install $STD ldconfig @@ -149,6 +150,6 @@ customize msg_info "Cleaning up" rm -rf ~/mysql-connector-j-9.3.0{,.tar.gz} rm -rf ~/guacamole-auth-jdbc-$RELEASE_SERVER{,.tar.gz} -$STD apt-get -y autoremove -$STD apt-get -y autoclean +$STD apt -y autoremove +$STD apt -y autoclean msg_ok "Cleaned"