1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/keeweb_ynh.git synced 2024-09-03 19:26:33 +02:00

Merge branch 'testing' into 1.16.7

This commit is contained in:
Éric Gaspar 2021-03-14 21:48:23 +01:00 committed by GitHub
commit fb45db02f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 19 deletions

View file

@ -11,15 +11,14 @@
setup_private=1
setup_public=1
upgrade=1
upgrade=1 from_commit=9e5c65c461a22d9b85be732e072ff938911106ad
upgrade=1 from_commit=6ec03114172c5de3291059756a38d57c63ffb4f2
backup_restore=1
multi_instance=1
port_already_use=0
change_url=1
;;; Options
Email=maniackc_dev@crudelis.fr
Email=
Notification=down
;;; Upgrade options
; commit=9e5c65c461a22d9b85be732e072ff938911106ad
name=6 Dec 2016 9e5c65c461a22d9b85be732e072ff938911106ad
; commit=6ec03114172c5de3291059756a38d57c63ffb4f2
name=Merge pull request #17 from YunoHost-Apps/testing
manifest_arg=domain=DOMAIN&path=PATH&is_public=1

View file

@ -14,7 +14,7 @@
"email": "pierre@kayou.io"
},
"requirements": {
"yunohost": ">= 4.0.0"
"yunohost": ">= 4.1.7"
},
"multi_instance": true,
"services": [

View file

@ -48,7 +48,6 @@ ynh_script_progression --message="Storing installation settings..."
ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url
ynh_app_setting_set --app=$app --key=is_public --value=$is_public
ynh_app_setting_set --app=$app --key=final_path --value=$final_path
#=================================================

View file

@ -15,10 +15,9 @@ source /usr/share/yunohost/helpers
app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain)
path_url=$(ynh_app_setting_get --app=$app --key=path)
is_public=$(ynh_app_setting_get --app=$app --key=is_public)
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
domain=$(ynh_app_setting_get $app domain)
path_url=$(ynh_app_setting_get $app path)
final_path=$(ynh_app_setting_get $app final_path)
#=================================================
# CHECK VERSION
@ -30,14 +29,6 @@ upgrade_type=$(ynh_check_app_version_changed)
# ENSURE DOWNWARD COMPATIBILITY
#=================================================
if [ "$is_public" = "Yes" ]; then
ynh_app_setting_set $app is_public 1 # Fixe is_public en booléen
is_public=1
elif [ "$is_public" = "No" ]; then
ynh_app_setting_set $app is_public 0
is_public=0
fi
if [ -z "$final_path" ]; then
final_path=/var/www/$app
ynh_app_setting_set $app final_path $final_path