YunoHost-Apps/matomo_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/matomo_ynh.git synced 2024-09-03 19:45:56 +02:00
Code Issues Activity Actions

Testing (#59)

Browse source 
* Upgrade to 4.5.0
This commit is contained in:
Éric Gaspar 2021-10-07 16:50:27 +02:00 committed by GitHub
parent c9b73bc4ad
commit bff7ed52b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -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 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 **Demo:** https://demo.matomo.org
@ -36,7 +36,6 @@ Open source analytics platform for measuring Web statistics
## Documentation and resources ## Documentation and resources
* Official app website: https://matomo.org * Official app website: https://matomo.org
* Official user documentation: https://yunohost.org/en/app_matomo
* Official admin documentation: https://matomo.org/docs * Official admin documentation: https://matomo.org/docs
* Upstream app code repository: https://github.com/matomo-org/matomo * Upstream app code repository: https://github.com/matomo-org/matomo
* YunoHost documentation for this app: https://yunohost.org/app_matomo * YunoHost documentation for this app: https://yunohost.org/app_matomo

3
README_fr.md
View file

@ -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 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 **Démo :** https://demo.matomo.org
@ -32,7 +32,6 @@ Plateforme d'analyse open source de mesure de statistiques Web
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : https://matomo.org * 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 * Documentation officielle de l'admin : https://matomo.org/docs
* Dépôt de code officiel de l'app : https://github.com/matomo-org/matomo * 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 * Documentation YunoHost pour cette app : https://yunohost.org/app_matomo

4
check_process
View file

@ -11,8 +11,6 @@
setup_private=1 setup_private=1
setup_public=1 setup_public=1
upgrade=1 upgrade=1
#4.3.0 (#47)
upgrade=1 from_commit=1d967a751135c3801ef95cf989ab3fb9e45e6f70
#4.4.0 #4.4.0
upgrade=1 from_commit=9edf3d60ea391925f835ece1309bbcb54e6d33fe upgrade=1 from_commit=9edf3d60ea391925f835ece1309bbcb54e6d33fe
backup_restore=1 backup_restore=1
@ -22,8 +20,6 @@
Email=anmol@datamol.org Email=anmol@datamol.org
Notification=yes Notification=yes
;;; Upgrade options ;;; Upgrade options
; commit=1d967a751135c3801ef95cf989ab3fb9e45e6f70
name= 4.3.0
; commit=9edf3d60ea391925f835ece1309bbcb54e6d33fe ; commit=9edf3d60ea391925f835ece1309bbcb54e6d33fe
name= 4.4.0 name= 4.4.0
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&

5
conf/app.src
View file

@ -1,6 +1,5 @@
SOURCE_URL=https://builds.matomo.org/matomo-4.4.1.tar.gz SOURCE_URL=https://builds.matomo.org/matomo-4.5.0.tar.gz
SOURCE_SUM=94b9a90c61afabff55e08ea53ff8532355349336fae439e168dbfe9364931479 SOURCE_SUM=3b28ddcd8f84358c4e4d58c32e38f6ba725ba5a18e0c81f623901c9ade391c30
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=

9
manifest.json
View file

@ -6,14 +6,13 @@
"en": "Open source analytics platform for measuring Web statistics", "en": "Open source analytics platform for measuring Web statistics",
"fr": "Plateforme d'analyse open source de mesure de statistiques Web" "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", "url": "https://matomo.org",
"upstream": { "upstream": {
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"website": "https://matomo.org", "website": "https://matomo.org",
"demo": "https://demo.matomo.org", "demo": "https://demo.matomo.org",
"admindoc": "https://matomo.org/docs", "admindoc": "https://matomo.org/docs",
"userdoc": "https://yunohost.org/en/app_matomo",
"code": "https://github.com/matomo-org/matomo" "code": "https://github.com/matomo-org/matomo"
}, },
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
@ -34,8 +33,7 @@
"install" : [ "install" : [
{ {
"name": "domain", "name": "domain",
"type": "domain", "type": "domain"
"example": "example.com"
}, },
{ {
"name": "path", "name": "path",
@ -45,8 +43,7 @@
}, },
{ {
"name": "admin", "name": "admin",
"type": "user", "type": "user"
"example": "johndoe"
}, },
{ {
"name": "is_public", "name": "is_public",

4
scripts/restore
View file

@ -36,8 +36,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=1 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 \ test ! -d $final_path \
|| ynh_die --message="There is already a directory: $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_script_progression --message="Restoring the cron file..." --weight=1
ynh_restore_file --origin_path="/etc/cron.d/$app" ynh_restore_file --origin_path="/etc/cron.d/$app"
chown root: "/etc/cron.d/$app"
chmod 644 "/etc/cron.d/$app"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION

29
scripts/upgrade
View file

@ -27,10 +27,23 @@ email=$(ynh_user_get_info --username=$admin --key=mail)
#================================================= #=================================================
# CHECK VERSION # CHECK VERSION
#================================================= #=================================================
ynh_script_progression --message="Checking version..." --weight=1
upgrade_type=$(ynh_check_app_version_changed) 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 # ENSURE DOWNWARD COMPATIBILITY
#================================================= #=================================================
@ -68,20 +81,6 @@ ynh_script_progression --message="Making sure dedicated system user exists..." -
# Create a dedicated user (if not existing) # Create a dedicated user (if not existing)
ynh_system_user_create --username=$app --home_dir="$final_path" 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 # STANDARD UPGRADE STEPS
#================================================= #=================================================