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

Merge pull request #21 from YunoHost-Apps/testing Use no_sso

Browse source 
Use no_sso instead of the variable hack fix #19
This commit is contained in:
Jean-Baptiste 2018-09-21 15:36:25 +02:00 • committed by GitHub
commit c59d954c30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
manifest.json
View file

@ -13,9 +13,9 @@
"email": "jean-baptiste@holcroft.fr" "email": "jean-baptiste@holcroft.fr"
}, },
"requirements": { "requirements": {
"yunohost": ">= 2.7.10" "yunohost": ">= 3.1.0"
}, },
"version": "1.2.8-3", "version": "1.2.8~ynh4",
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
], ],

3
scripts/install
View file

@ -44,7 +44,8 @@ test ! -e "$final_path" || ynh_die "This path already contains a folder"
#================================================= #=================================================
# Save app settings # Save app settings
ynh_app_setting_set "$app" domain_mumble "$domain" ynh_app_setting_set "$app" domain "$domain"
ynh_app_setting_set "$app" no_sso "true"
ynh_app_setting_set "$app" server_password "$server_password" ynh_app_setting_set "$app" server_password "$server_password"
ynh_app_setting_set "$app" su_passwd "$su_passwd" ynh_app_setting_set "$app" su_passwd "$su_passwd"
ynh_app_setting_set "$app" welcometext "$welcometext" ynh_app_setting_set "$app" welcometext "$welcometext"

2
scripts/remove
View file

@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get "$app" domain_mumble) domain=$(ynh_app_setting_get "$app" domain)
port=$(ynh_app_setting_get "$app" port) port=$(ynh_app_setting_get "$app" port)
final_path=$(ynh_app_setting_get "$app" final_path) final_path=$(ynh_app_setting_get "$app" final_path)

17
scripts/upgrade
View file

@ -14,7 +14,8 @@ source /usr/share/yunohost/helpers
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get "$app" domain_mumble) domain=$(ynh_app_setting_get "$app" domain)
no_sso=$(ynh_app_setting_get "$app" no_sso)
server_password=$(ynh_app_setting_get "$app" server_password) server_password=$(ynh_app_setting_get "$app" server_password)
su_passwd=$(ynh_app_setting_get "$app" su_passwd) su_passwd=$(ynh_app_setting_get "$app" su_passwd)
welcometext=$(ynh_app_setting_get "$app" welcometext) welcometext=$(ynh_app_setting_get "$app" welcometext)
@ -61,7 +62,7 @@ if [ -z "$server_password" ]; then
ynh_app_setting_set "$app" welcometext "$welcometext" ynh_app_setting_set "$app" welcometext "$welcometext"
ynh_app_setting_set "$app" registerName "$registerName" ynh_app_setting_set "$app" registerName "$registerName"
ynh_app_setting_set "$app" su_passwd "$su_passwd" ynh_app_setting_set "$app" su_passwd "$su_passwd"
ynh_app_setting_set "$app" domain_mumble "$domain" ynh_app_setting_set "$app" domain "$domain"
systemctl stop mumble-server systemctl stop mumble-server
dpkg-reconfigure mumble-server --frontend=Noninteractive dpkg-reconfigure mumble-server --frontend=Noninteractive
@ -72,9 +73,15 @@ fi
# Fix SSO issue # Fix SSO issue
# https://github.com/YunoHost-Apps/mumbleserver_ynh/issues/19 # https://github.com/YunoHost-Apps/mumbleserver_ynh/issues/19
if [ -z "$domain" ]; then if [ -z "$domain" ]; then
domain=$(ynh_app_setting_get "$app" domain) domain=$(ynh_app_setting_get "$app" domain_mumble)
ynh_app_setting_set "$app" domain_mumble "$domain" ynh_app_setting_set "$app" domain "$domain"
ynh_app_setting_delete "$app" domain ynh_app_setting_delete "$app" domain_mumble
fi
# Fix SSO issue
# https://github.com/YunoHost-Apps/mumbleserver_ynh/issues/19
if [ -z "$no_sso" ]; then
ynh_app_setting_set "$app" no_sso "true"
fi fi
# Fix multi installation # Fix multi installation