diff --git a/README.md b/README.md index 21b8093..9cf1b77 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Open source analytics platform for measuring Web statistics -**Shipped version:** 4.4.1~ynh3 +**Shipped version:** 4.5.0~ynh1 **Demo:** https://demo.matomo.org @@ -36,7 +36,6 @@ Open source analytics platform for measuring Web statistics ## Documentation and resources * Official app website: https://matomo.org -* Official user documentation: https://yunohost.org/en/app_matomo * Official admin documentation: https://matomo.org/docs * Upstream app code repository: https://github.com/matomo-org/matomo * YunoHost documentation for this app: https://yunohost.org/app_matomo diff --git a/README_fr.md b/README_fr.md index 78ce9f7..42a8fd4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Plateforme d'analyse open source de mesure de statistiques Web -**Version incluse :** 4.4.1~ynh3 +**Version incluse :** 4.5.0~ynh1 **Démo :** https://demo.matomo.org @@ -32,7 +32,6 @@ Plateforme d'analyse open source de mesure de statistiques Web ## Documentations et ressources * Site officiel de l'app : https://matomo.org -* Documentation officielle utilisateur : https://yunohost.org/en/app_matomo * Documentation officielle de l'admin : https://matomo.org/docs * Dépôt de code officiel de l'app : https://github.com/matomo-org/matomo * Documentation YunoHost pour cette app : https://yunohost.org/app_matomo diff --git a/check_process b/check_process index f1d52d9..a4dae0a 100644 --- a/check_process +++ b/check_process @@ -11,8 +11,6 @@ setup_private=1 setup_public=1 upgrade=1 - #4.3.0 (#47) - upgrade=1 from_commit=1d967a751135c3801ef95cf989ab3fb9e45e6f70 #4.4.0 upgrade=1 from_commit=9edf3d60ea391925f835ece1309bbcb54e6d33fe backup_restore=1 @@ -22,8 +20,6 @@ Email=anmol@datamol.org Notification=yes ;;; Upgrade options - ; commit=1d967a751135c3801ef95cf989ab3fb9e45e6f70 - name= 4.3.0 ; commit=9edf3d60ea391925f835ece1309bbcb54e6d33fe name= 4.4.0 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& \ No newline at end of file diff --git a/conf/app.src b/conf/app.src index fb3a5ee..e7dba63 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://builds.matomo.org/matomo-4.4.1.tar.gz -SOURCE_SUM=94b9a90c61afabff55e08ea53ff8532355349336fae439e168dbfe9364931479 +SOURCE_URL=https://builds.matomo.org/matomo-4.5.0.tar.gz +SOURCE_SUM=3b28ddcd8f84358c4e4d58c32e38f6ba725ba5a18e0c81f623901c9ade391c30 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/manifest.json b/manifest.json index 8557b28..958cd12 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,13 @@ "en": "Open source analytics platform for measuring Web statistics", "fr": "Plateforme d'analyse open source de mesure de statistiques Web" }, - "version": "4.4.1~ynh3", + "version": "4.5.0~ynh1", "url": "https://matomo.org", "upstream": { "license": "GPL-3.0-or-later", "website": "https://matomo.org", "demo": "https://demo.matomo.org", "admindoc": "https://matomo.org/docs", - "userdoc": "https://yunohost.org/en/app_matomo", "code": "https://github.com/matomo-org/matomo" }, "license": "GPL-3.0-or-later", @@ -34,8 +33,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", @@ -45,8 +43,7 @@ }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "is_public", diff --git a/scripts/restore b/scripts/restore index c054658..4c4c94a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -36,8 +36,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -95,6 +93,8 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ ynh_script_progression --message="Restoring the cron file..." --weight=1 ynh_restore_file --origin_path="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 3b0bee7..76f50e9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,10 +27,23 @@ email=$(ynh_user_get_info --username=$admin --key=mail) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." --weight=1 upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up Matomo before upgrading (may take a while)..." --weight=3 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -68,20 +81,6 @@ ynh_script_progression --message="Making sure dedicated system user exists..." - # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up Matomo before upgrading (may take a while)..." --weight=3 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - #================================================= # STANDARD UPGRADE STEPS #=================================================