From f164aacc92065e8605fa0d15752bee8ca8fcce30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 May 2023 22:01:08 +0200 Subject: [PATCH 1/3] Update _common.sh --- scripts/_common.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 47effbb..b7b1771 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,7 +12,7 @@ pkg_dependencies="acl build-essential libcairo2 libjpeg62-turbo-dev libpng-dev l #================================================= function setup_sources { - guacamole_verson="1.5.1" + guacamole_version="1.5.2" ynh_setup_source --source_id="server" --dest_dir="$final_path/.guacd-src" @@ -24,15 +24,15 @@ function setup_sources { ynh_setup_source --source_id="client" --dest_dir="$final_path/var/lib/tomcat9/webapps/$tomcat_guac_dir" ynh_setup_source --source_id="auth-ldap" --dest_dir="$final_path/etc/guacamole/extensions/ldap" - mv "$final_path/etc/guacamole/extensions/ldap/guacamole-auth-ldap-$guacamole_verson.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-ldap.jar" + mv "$final_path/etc/guacamole/extensions/ldap/guacamole-auth-ldap-$guacamole_version.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-ldap.jar" ynh_secure_remove --file="$final_path/etc/guacamole/extensions/ldap" ynh_setup_source --source_id="auth-header" --dest_dir="$final_path/etc/guacamole/extensions/header" - mv "$final_path/etc/guacamole/extensions/header/guacamole-auth-header-$guacamole_verson.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-header.jar" + mv "$final_path/etc/guacamole/extensions/header/guacamole-auth-header-$guacamole_version.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-header.jar" ynh_secure_remove --file="$final_path/etc/guacamole/extensions/header" ynh_setup_source --source_id="auth-jdbc" --dest_dir="$final_path/etc/guacamole/extensions/jdbc" - mv "$final_path/etc/guacamole/extensions/jdbc/mysql/guacamole-auth-jdbc-mysql-$guacamole_verson.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-jdbc-mysql.jar" + mv "$final_path/etc/guacamole/extensions/jdbc/mysql/guacamole-auth-jdbc-mysql-$guacamole_version.jar" "$final_path/etc/guacamole/extensions/guacamole-auth-jdbc-mysql.jar" mv "$final_path/etc/guacamole/extensions/jdbc/mysql/schema" "$final_path/etc/guacamole/extensions/mysql-schema" ynh_secure_remove --file="$final_path/etc/guacamole/extensions/jdbc" From 3f1e2155cc1a6961b64d0e13b1a750fae9fedf74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:19:09 +0200 Subject: [PATCH 2/3] Update guacamole.properties --- conf/guacamole.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/guacamole.properties b/conf/guacamole.properties index be424fa..e427f66 100644 --- a/conf/guacamole.properties +++ b/conf/guacamole.properties @@ -9,4 +9,5 @@ mysql-port: 3306 mysql-database: __DB_NAME__ mysql-username: __DB_USER__ mysql-password: __DB_PWD__ -mysql-auto-create-accounts: true \ No newline at end of file +mysql-auto-create-accounts: true +mysql-ssl-mode: disabled \ No newline at end of file From 36061eaf80f8da138076e264d86d79183ad72f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:22:35 +0200 Subject: [PATCH 3/3] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 7c2958c..16477d0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH", "fr": "Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH" }, - "version": "1.5.2~ynh1", + "version": "1.5.2~ynh2", "url": "https://guacamole.apache.org/", "upstream": { "license": "Apache-2.0",