From 3e0ef4e309581890e823a8f09ddee77145db3019 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Dec 2020 22:24:05 +0100 Subject: [PATCH] Upgrade to 4.0.5 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 7 ++++--- scripts/upgrade | 18 +++--------------- 5 files changed, 11 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 76cf0ec..513028b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Matomo is the only analytics platform that gives you full control over your data - Easy to use - No data limits -**Shipped version:** 4.0.4 +**Shipped version:** 4.0.5 ## Screenshots diff --git a/conf/app.src b/conf/app.src index c457864..2f64345 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/matomo-org/matomo/archive/4.0.4.tar.gz -SOURCE_SUM=a32112400c3fbd6341bfa86e34666d7b348b0528f411e895cd0852810bad8620 +SOURCE_URL=https://github.com/matomo-org/matomo/archive/4.0.5.tar.gz +SOURCE_SUM=b201dbcf0ce87433a6509cb83c7e565fed2da9a88f192ab222367e74ee28d55a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 8fe9efc..35712cc 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source analytics platform for measuring Web statistics", "fr": "Plateforme d'analyse open source de mesure de statistiques Web" }, - "version": "4.0.4~ynh1", + "version": "4.0.5~ynh1", "url": "https://matomo.org", "license": "GPL-3.0-or-later", "maintainer": { diff --git a/scripts/install b/scripts/install index 9b6a67b..6f18a0c 100755 --- a/scripts/install +++ b/scripts/install @@ -149,11 +149,12 @@ chown -R $app: $final_path #================================================= ynh_script_progression --message="Configuring SSOwat..." -# Make app public if necessary +# Make app public if necessary or protect it if [ $is_public -eq 1 ] then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" + # Everyone can access the app. + # The "main" permission is automatically created before the install script. + ynh_permission_update --permission "main" --add "visitors" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index f929638..6f892f9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -124,9 +124,9 @@ ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" ynh_script_progression --message="Setuping a cron..." ynh_replace_string --match_string="YNH_WWW_PATH" --replace_string="$final_path" --target_file="../conf/cron" -ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="../conf/cron" -ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/cron" -ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="../conf/cron" +ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="../conf/cron" +ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/cron" +ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="../conf/cron" cp -f ../conf/cron /etc/cron.d/$app #================================================= @@ -139,18 +139,6 @@ ynh_script_progression --message="Securing files and directories..." # Set permissions on app files chown -R $app: $final_path -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # unprotected_uris allows SSO credentials to be passed anyway - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" -fi - #================================================= # RELOAD NGINX #=================================================