mirror of
https://github.com/YunoHost-Apps/guacamole_ynh.git
synced 2024-09-03 19:16:03 +02:00
Merge bc1a59a4cb
into 4253a7c2a1
This commit is contained in:
commit
f180665de4
2 changed files with 17 additions and 7 deletions
|
@ -77,6 +77,13 @@ ram.runtime = "50M"
|
||||||
extract = false
|
extract = false
|
||||||
rename = "mariadb-java-client.jar"
|
rename = "mariadb-java-client.jar"
|
||||||
|
|
||||||
|
[resources.sources.tomcat9_deb]
|
||||||
|
url = "https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u10_all.deb"
|
||||||
|
sha256 = "0dd30fee78ecd3980e9ee3ba018071755ddf84e2288b860900709f1013e368ed"
|
||||||
|
format = "whatever"
|
||||||
|
extract = false
|
||||||
|
rename = "tomcat9.deb"
|
||||||
|
|
||||||
[resources.ports]
|
[resources.ports]
|
||||||
main.default = 8080
|
main.default = 8080
|
||||||
guacd.default = 4822
|
guacd.default = 4822
|
||||||
|
@ -112,8 +119,15 @@ ram.runtime = "50M"
|
||||||
"libssl-dev",
|
"libssl-dev",
|
||||||
"libvorbis-dev",
|
"libvorbis-dev",
|
||||||
"libwebp-dev",
|
"libwebp-dev",
|
||||||
"tomcat9\\|tomcat10",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
packages_from_raw_bash = """
|
||||||
|
if [[ $YNH_DEBIAN_VERSION = "bullseye" ]]; then
|
||||||
|
echo "tomcat9";
|
||||||
|
elif [[ $YNH_DEBIAN_VERSION = "bookworm" ]]; then
|
||||||
|
echo "tomcat10";
|
||||||
|
fi
|
||||||
|
"""
|
||||||
|
|
||||||
[resources.database]
|
[resources.database]
|
||||||
type = "mysql"
|
type = "mysql"
|
||||||
|
|
|
@ -4,11 +4,7 @@
|
||||||
# COMMON VARIABLES
|
# COMMON VARIABLES
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
if [ "$YNH_DEBIAN_VERSION" == "bullseye" ] ; then
|
guacamole_version="1.5.5"
|
||||||
tomcat_version="tomcat9"
|
|
||||||
elif [ "$YNH_DEBIAN_VERSION" == "bookworm" ] ; then
|
|
||||||
tomcat_version="tomcat10"
|
|
||||||
fi
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# PERSONAL HELPERS
|
# PERSONAL HELPERS
|
||||||
|
|
Loading…
Add table
Reference in a new issue