diff --git a/check_process b/check_process index 09969c8..d799db7 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=CommitHash + #upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=1 change_url=1 diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index e69de29..986c989 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -0,0 +1,3 @@ +## Configuration + +How to configure this app: via the `/var/www/chuwiki/configuration.ini` file. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100644 index 0000000..5ef68e1 --- /dev/null +++ b/doc/DISCLAIMER_fr.md @@ -0,0 +1,3 @@ +## Configuration + +Comment configurer cette application : via le fichier `/var/www/chuwiki/configuration.ini`. diff --git a/manifest.json b/manifest.json index 9b19dfc..a9ebc54 100644 --- a/manifest.json +++ b/manifest.json @@ -11,8 +11,10 @@ "upstream": { "license": "AGPL-3.0-only", "website": "http://chuwiki.genezys.net/", + "demo": "http://chuwiki.genezys.net/wiki/Bac%20%C3%A0%20sable", "admindoc": "http://chuwiki.genezys.net/", - "userdoc": "https://yunohost.org/apps" + "userdoc": "https://yunohost.org/apps", + "code": "https://github.com/genezys/chuwiki" }, "license": "AGPL-3.0-only", "maintainer": { @@ -21,7 +23,7 @@ "url": "https://stylix58.netlify.app/" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.2.4" }, "multi_instance": true, "services": [ diff --git a/scripts/upgrade b/scripts/upgrade index edc2816..e489737 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -66,7 +66,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/configuration.ini" fi chmod 750 "$final_path" @@ -89,21 +89,12 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions on app files -chown -R root: $final_path - #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="Chuwiki service" --log="/var/log/$app/$app.log" +yunohost service add $app --description="ChuWiki service" --log="/var/log/$app/$app.log" #================================================= # RELOAD NGINX