YunoHost-Apps/guacamole_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/guacamole_ynh.git synced 2024-09-03 19:16:03 +02:00
Code Issues Activity Actions

Update to version 1.4.0

Browse source
This commit is contained in:
Jules Bertholet 2022-01-06 15:04:45 -05:00 • committed by Jules Bertholet
parent bcfc65bea3
commit c760c66856
13 changed files with 67 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH. Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH.
**Shipped version:** 1.3.0~ynh6 **Shipped version:** 1.4.0~ynh1

2
README_fr.md
View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH. Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH.
**Version incluse :** 1.3.0~ynh6 **Version incluse :** 1.4.0~ynh1

6
conf/auth-header.src
View file

@ -1,7 +1,7 @@
SOURCE_URL=https://downloads.apache.org/guacamole/1.3.0/binary/guacamole-auth-header-1.2.0.tar.gz SOURCE_URL=https://downloads.apache.org/guacamole/1.4.0/binary/guacamole-auth-header-1.4.0.tar.gz
SOURCE_SUM=0b8a5e9aae2a24ee48953a12093a0dd6c0b5185d9bfb0851087ca0bb46306b38 SOURCE_SUM=3f5491737b3295056949d235120dca60ee9518c951b09271780dddf15166a9de
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=guacamole-auth-header-1.2.0.tar.gz SOURCE_FILENAME=guacamole-auth-header.tar.gz
SOURCE_EXTRACT=true SOURCE_EXTRACT=true

6
conf/auth-jdbc.src
View file

@ -1,7 +1,7 @@
SOURCE_URL=https://downloads.apache.org/guacamole/1.3.0/binary/guacamole-auth-jdbc-1.3.0.tar.gz SOURCE_URL=https://downloads.apache.org/guacamole/1.4.0/binary/guacamole-auth-jdbc-1.4.0.tar.gz
SOURCE_SUM=81665a04fdfa9b07b088440da90546b5ff409018de492d061cb6b6a2f82cc675 SOURCE_SUM=47f4f121cad74ab64d5baf3d14e8f709677a26b3058005a977277a07716d4d9c
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=guacamole-auth-jdbc-1.3.0.tar.gz SOURCE_FILENAME=guacamole-auth-jdbc.tar.gz
SOURCE_EXTRACT=true SOURCE_EXTRACT=true

6
conf/auth-ldap.src
View file

@ -1,7 +1,7 @@
SOURCE_URL=https://downloads.apache.org/guacamole/1.3.0/binary/guacamole-auth-ldap-1.3.0.tar.gz SOURCE_URL=https://downloads.apache.org/guacamole/1.4.0/binary/guacamole-auth-ldap-1.4.0.tar.gz
SOURCE_SUM=3c8cdffc9a7f0088b2da5d187aa7c4044c7d7089d97926eb4fcc6be6ea356b39 SOURCE_SUM=f28488717b26168a5396e125ec7fbff1b7268a658c6100f6ad1bbfbd18a17779
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=guacamole-auth-ldap-1.3.0.tar.gz SOURCE_FILENAME=guacamole-auth-ldap.tar.gz
SOURCE_EXTRACT=true SOURCE_EXTRACT=true

6
conf/client.src
View file

@ -1,7 +1,7 @@
SOURCE_URL=https://downloads.apache.org/guacamole/1.3.0/binary/guacamole-1.3.0.war SOURCE_URL=https://downloads.apache.org/guacamole/1.4.0/binary/guacamole-1.4.0.war
SOURCE_SUM=3e393e7ee19adb23a36c62607d952a51de0aac0af047400715120a5d6a93ab93 SOURCE_SUM=92fb06e3ce8fe4f932ddfdffd75a352c06ab58d3bd0a946faa5beda73e8592f0
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=false SOURCE_IN_SUBDIR=false
SOURCE_FILENAME=guacamole-1.3.0.war SOURCE_FILENAME=guacamole.war
SOURCE_EXTRACT=true SOURCE_EXTRACT=true

6
conf/mariadb-java-client.src
View file

@ -1,7 +1,7 @@
SOURCE_URL=https://downloads.mariadb.com/Connectors/java/connector-java-2.7.2/mariadb-java-client-2.7.2.jar SOURCE_URL=https://downloads.mariadb.com/Connectors/java/connector-java-2.7.4/mariadb-java-client-2.7.4.jar
SOURCE_SUM=a3f6776df0842cf65e7f158515012d5307da949f66042282e1ee4474dd19f448 SOURCE_SUM=f06577b19e89b33028b96cd4f031248e761de7ebc712f4ef535e268df76edb2a
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=mariadb-java-client-2.7.2.jar SOURCE_FILENAME=mariadb-java-client.jar
SOURCE_EXTRACT=false SOURCE_EXTRACT=false

6
conf/server.src
View file

@ -1,7 +1,7 @@
SOURCE_URL=https://downloads.apache.org/guacamole/1.3.0/source/guacamole-server-1.3.0.tar.gz SOURCE_URL=https://downloads.apache.org/guacamole/1.4.0/source/guacamole-server-1.4.0.tar.gz
SOURCE_SUM=bc5511c7170841f90d437b5a07b7ec2f5bfd061f2a5bfc4e4d0fc4d7b303fb4c SOURCE_SUM=2789075c8b25e5aa42dec505491d3425b7b2fe2051772b0006860c26e8a57b90
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=guacamole-server-1.3.0.tar.gz SOURCE_FILENAME=guacamole-server.tar.gz
SOURCE_EXTRACT=true SOURCE_EXTRACT=true

4
conf/tomcat9_deb.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.31-1~deb10u6_all.deb SOURCE_URL=https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.55-1_all.deb
SOURCE_SUM=9fc770b3cb32bacd22e6e48ea4539985173e523545f799dc207ea4316a8402e9 SOURCE_SUM=6a26866987278e31ade7174b5ba9d687beb69234db95155263c1e66e582fecce
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=ar SOURCE_FORMAT=ar
SOURCE_IN_SUBDIR=false SOURCE_IN_SUBDIR=false

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH.", "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." "fr": "Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH."
}, },
"version": "1.3.0~ynh6", "version": "1.4.0~ynh1",
"url": "https://guacamole.apache.org/", "url": "https://guacamole.apache.org/",
"upstream": { "upstream": {
"license": "Apache-2.0", "license": "Apache-2.0",

42
scripts/_common.sh
View file

@ -11,6 +11,48 @@ pkg_dependencies="acl build-essential libcairo2 libjpeg62-turbo-dev libpng-dev l
# PERSONAL HELPERS # PERSONAL HELPERS
#================================================= #=================================================
function setup_sources {
guacamole_verson="1.4.0"
ynh_setup_source --source_id="server" --dest_dir="$final_path/.guacd-src"
tomcat_guac_dir="$path_url"
if [ "$path_url" == "/" -o -z "$path_url" ]; then
tomcat_guac_dir="ROOT"
fi
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"
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"
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/schema" "$final_path/etc/guacamole/extensions/mysql-schema"
ynh_secure_remove --file="$final_path/etc/guacamole/extensions/jdbc"
ynh_setup_source --source_id="mariadb-java-client" --dest_dir="$final_path/etc/guacamole/lib/"
ynh_setup_source --source_id="tomcat9_deb" --dest_dir="$final_path/"
pushd "$final_path" || ynh_die
ar x "$final_path/tomcat9.deb" "data.tar.xz"
popd || ynh_die
ynh_secure_remove --file="$final_path/tomcat9.deb"
mkdir -p "$final_path/tomcat9-data"
tar -C "$final_path/tomcat9-data" -xJf "$final_path/data.tar.xz"
cp -r "$final_path/tomcat9-data/usr/share/tomcat9/etc" -T "$final_path/etc/tomcat9/"
cp -r "$final_path/tomcat9-data/etc/tomcat9/" -T "$final_path/etc/tomcat9/"
ynh_secure_remove --file="$final_path/data.tar.xz"
ynh_secure_remove --file="$final_path/tomcat9-data"
}
#================================================= #=================================================
# EXPERIMENTAL HELPERS # EXPERIMENTAL HELPERS
#================================================= #=================================================

37
scripts/install
View file

@ -118,42 +118,7 @@ ynh_script_progression --message="Setting up source files..." --weight=3
ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_app_setting_set --app=$app --key=final_path --value=$final_path
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --source_id="server" --dest_dir="$final_path/.guacd-src" setup_sources
tomcat_guac_dir="$path_url"
if [ "$path_url" == "/" -o -z "$path_url" ]; then
tomcat_guac_dir="ROOT"
fi
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-1.3.0.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-1.2.0.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-1.3.0.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"
ynh_setup_source --source_id="mariadb-java-client" --dest_dir="$final_path/etc/guacamole/lib/"
mv "$final_path/etc/guacamole/lib/mariadb-java-client-2.7.2.jar" "$final_path/etc/guacamole/lib/mariadb-java-client.jar"
ynh_setup_source --source_id="tomcat9_deb" --dest_dir="$final_path/"
pushd "$final_path" || ynh_die
ar x "$final_path/tomcat9.deb" "data.tar.xz"
popd || ynh_die
ynh_secure_remove --file="$final_path/tomcat9.deb"
mkdir -p "$final_path/tomcat9-data"
tar -C "$final_path/tomcat9-data" -xJf "$final_path/data.tar.xz"
cp -r "$final_path/tomcat9-data/usr/share/tomcat9/etc" -T "$final_path/etc/tomcat9/"
cp -r "$final_path/tomcat9-data/etc/tomcat9/" -T "$final_path/etc/tomcat9/"
ynh_secure_remove --file="$final_path/data.tar.xz"
ynh_secure_remove --file="$final_path/tomcat9-data"
#================================================= #=================================================
# FINISH SETTING UP DATABASE # FINISH SETTING UP DATABASE

37
scripts/upgrade
View file

@ -75,42 +75,7 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=1 ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --source_id="server" --dest_dir="$final_path/.guacd-src" setup_sources
tomcat_guac_dir="$path_url"
if [ "$path_url" == "/" -o -z "$path_url" ]; then
tomcat_guac_dir="ROOT"
fi
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-1.3.0.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-1.2.0.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-1.3.0.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"
ynh_setup_source --source_id="mariadb-java-client" --dest_dir="$final_path/etc/guacamole/lib/"
mv "$final_path/etc/guacamole/lib/mariadb-java-client-2.7.2.jar" "$final_path/etc/guacamole/lib/mariadb-java-client.jar"
ynh_setup_source --source_id="tomcat9_deb" --dest_dir="$final_path/"
pushd "$final_path" || ynh_die
ar x "$final_path/tomcat9.deb" "data.tar.xz"
popd || ynh_die
ynh_secure_remove --file="$final_path/tomcat9.deb"
mkdir -p "$final_path/tomcat9-data"
tar -C "$final_path/tomcat9-data" -xJf "$final_path/data.tar.xz"
cp -r "$final_path/tomcat9-data/usr/share/tomcat9/etc" -T "$final_path/etc/tomcat9/"
cp -r "$final_path/tomcat9-data/etc/tomcat9/" -T "$final_path/etc/tomcat9/"
ynh_secure_remove --file="$final_path/data.tar.xz"
ynh_secure_remove --file="$final_path/tomcat9-data"
fi fi
#================================================= #=================================================