diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE diff --git a/check_process b/check_process index ffd4471..f66ecc0 100644 --- a/check_process +++ b/check_process @@ -17,7 +17,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=20c58daa4be910e554058914633f9a94500bc7e1 + upgrade=1 from_commit=2e870313227801603a41fd3bfcaafa912dce6d0a backup_restore=1 multi_instance=1 port_already_use=0 @@ -26,6 +26,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=20c58daa4be910e554058914633f9a94500bc7e1 - name="Merge pull request #1 from YunoHost-Apps/helper-in-service" + ; commit=2e870313227801603a41fd3bfcaafa912dce6d0a + name="fix restore.." manifest_arg=domain=domain.td&path=/&is_public=1&port=666& diff --git a/manifest.json b/manifest.json index 55d5d24..7389ee1 100644 --- a/manifest.json +++ b/manifest.json @@ -41,7 +41,11 @@ { "name": "is_public", "type": "boolean", - "default": true + "default": true, + "help": { + "en": "This app has a status page meant to be public and a login-protected admin interface. It should be safe to expose publicly.", + "fr": "Cette app a une page destinée à être publique et une interface d'admin protégée par mot de passe. Elle peut être exposée publiquement sans problème." + } } ] } diff --git a/scripts/remove b/scripts/remove index a4d9909..559c73b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service integration..." --time --weight=1 + ynh_script_progression --message="Removing $app service integration..." --weight=1 yunohost service remove $app fi diff --git a/scripts/restore b/scripts/restore index cca7cc0..da126a3 100755 --- a/scripts/restore +++ b/scripts/restore @@ -170,8 +170,6 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -mkdir /var/log/$app/ - yunohost service add $app --description="Uptime Kuma, a fancy monitoring tool" --log="/var/log/$app/$app.log" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 26f34cc..84c1e22 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -96,7 +96,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --time --weight=1 + 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" --keep=data/