mirror of
https://github.com/YunoHost-Apps/keeweb_ynh.git
synced 2024-09-03 19:26:33 +02:00
Fix
This commit is contained in:
parent
232134e78a
commit
9c307c82b9
10 changed files with 23 additions and 21 deletions
|
@ -59,6 +59,7 @@ No users support.
|
|||
|
||||
* Report a bug: https://github.com/YunoHost-Apps/keeweb_ynh/issues
|
||||
* Keeweb website: https://keeweb.info/
|
||||
* Upstream app repository: https://github.com/keeweb/keeweb
|
||||
* YunoHost website: https://yunohost.org/
|
||||
|
||||
---
|
||||
|
|
|
@ -57,9 +57,10 @@ Pas de support utilisateurs
|
|||
|
||||
## Liens
|
||||
|
||||
* Reporter un bug: https://github.com/YunoHost-Apps/keeweb_ynh/issues
|
||||
* Site de Keeweb: https://keeweb.info/
|
||||
* Site de YunoHost: https://yunohost.org/
|
||||
* Reporter un bug : https://github.com/YunoHost-Apps/keeweb_ynh/issues
|
||||
* Site de Keeweb : https://keeweb.info/
|
||||
* Dépôt de l'application principale : https://github.com/keeweb/keeweb
|
||||
* Site de YunoHost : https://yunohost.org/
|
||||
|
||||
---
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ location __PATH__/ {
|
|||
rewrite ^ https://$server_name$request_uri? permanent;
|
||||
}
|
||||
index index.html ;
|
||||
# default_type text/html;
|
||||
# default_type text/html;
|
||||
|
||||
# Include SSOWAT user panel.
|
||||
include conf.d/yunohost_panel.conf.inc;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
"email": "pierre@kayou.io"
|
||||
},
|
||||
"requirements": {
|
||||
"yunohost": ">= 3.8.1"
|
||||
"yunohost": ">= 4.0.0"
|
||||
},
|
||||
"multi_instance": true,
|
||||
"services": [
|
||||
|
|
|
@ -23,8 +23,8 @@ ynh_print_info --message="Loading installation settings..."
|
|||
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
|
||||
final_path=$(ynh_app_setting_get $app final_path)
|
||||
domain=$(ynh_app_setting_get $app domain)
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||
|
||||
#=================================================
|
||||
# DECLARE DATA AND CONF FILES TO BACKUP
|
||||
|
|
|
@ -25,7 +25,7 @@ app=$YNH_APP_INSTANCE_NAME
|
|||
# LOAD SETTINGS
|
||||
#=================================================
|
||||
|
||||
final_path=$(ynh_app_setting_get $app final_path)
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
|
||||
#=================================================
|
||||
# CHECK THE SYNTAX OF THE PATHS
|
||||
|
|
|
@ -75,7 +75,7 @@ ynh_add_nginx_config
|
|||
# USE THE CONFIG FILE
|
||||
#=================================================
|
||||
|
||||
ynh_replace_string "(no-config)" "config.json" "$final_path/index.html"
|
||||
ynh_replace_string --match_string="(no-config)" --replace_string="config.json" --target_file="$final_path/index.html"
|
||||
|
||||
#=================================================
|
||||
# COPY THE CONFIG FILE
|
||||
|
|
|
@ -16,8 +16,8 @@ ynh_script_progression --message="Loading installation settings..."
|
|||
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
|
||||
domain=$(ynh_app_setting_get $app domain)
|
||||
final_path=$(ynh_app_setting_get $app final_path)
|
||||
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
|
||||
#=================================================
|
||||
# STANDARD REMOVE
|
||||
|
|
|
@ -22,9 +22,9 @@ ynh_abort_if_errors
|
|||
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
|
||||
domain=$(ynh_app_setting_get $app domain)
|
||||
path_url=$(ynh_app_setting_get $app path)
|
||||
final_path=$(ynh_app_setting_get $app final_path)
|
||||
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||
path_url=$(ynh_app_setting_get --app=$app --key=path)
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
|
||||
#=================================================
|
||||
# CHECK IF THE APP CAN BE RESTORED
|
||||
|
@ -67,7 +67,7 @@ chown -R root: $final_path
|
|||
#=================================================
|
||||
# RELOAD NGINX
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..."
|
||||
ynh_script_progression --message="Reloading NGINX web server..."
|
||||
|
||||
ynh_systemd_action --service_name=nginx --action=reload
|
||||
|
||||
|
|
|
@ -15,10 +15,10 @@ source /usr/share/yunohost/helpers
|
|||
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
|
||||
domain=$(ynh_app_setting_get $app domain)
|
||||
path_url=$(ynh_app_setting_get $app path)
|
||||
is_public=$(ynh_app_setting_get $app is_public)
|
||||
final_path=$(ynh_app_setting_get $app final_path)
|
||||
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)
|
||||
|
||||
#=================================================
|
||||
# CHECK VERSION
|
||||
|
@ -90,7 +90,7 @@ ynh_add_nginx_config
|
|||
# USE THE CONFIG FILE
|
||||
#=================================================
|
||||
|
||||
ynh_replace_string "(no-config)" "config.json" "$final_path/index.html"
|
||||
ynh_replace_string --match_string="(no-config)" --replace_string="config.json" --target_file="$final_path/index.html"
|
||||
|
||||
#=================================================
|
||||
# COPY THE CONFIG FILE
|
||||
|
@ -98,7 +98,7 @@ ynh_replace_string "(no-config)" "config.json" "$final_path/index.html"
|
|||
|
||||
# Copie ou modification d'un fichier de config
|
||||
ynh_backup_if_checksum_is_different "$final_path/config.json" # Créé un backup du fichier de config si il a été modifié.
|
||||
cp ../conf/config.json "$final_path/"
|
||||
cp ../conf/config.json "$final_path/config.json"
|
||||
ynh_store_file_checksum "$final_path/config.json" # Réenregistre la somme de contrôle du fichier de config
|
||||
|
||||
#=================================================
|
||||
|
|
Loading…
Add table
Reference in a new issue