From 8f273b76c73775be7a0968509bf26df2ee77b0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 19 Dec 2023 08:25:13 +0100 Subject: [PATCH] cleaning --- manifest.toml | 7 +++++-- scripts/change_url | 2 +- scripts/install | 1 + scripts/restore | 2 +- scripts/upgrade | 1 + 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index c6acd98..f604fde 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,8 +20,11 @@ code = "https://github.com/matomo-org/matomo" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "200M" ram.runtime = "50M" @@ -48,8 +51,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/matomo-org/matomo/releases/download/5.0.0-rc6/matomo-5.0.0-rc6.tar.gz" - sha256 = "ab983c93783b2ece4a104cc6a15aab05c29a8325a913bbb6a70c5aee92fb8722" + url = "https://github.com/matomo-org/matomo/releases/download/5.0.0/matomo-5.0.0.tar.gz" + sha256 = "d72b74dced0a9a93295043646ba1fc4577aa4a7d282b46baf7898933f8bbff65" autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/change_url b/scripts/change_url index 5d55828..fb8fd35 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -26,7 +26,7 @@ ynh_script_progression --message="Setuping a cron..." --weight=1 path=$new_path domain=$new_domain -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/install b/scripts/install index a5212e0..00d154b 100755 --- a/scripts/install +++ b/scripts/install @@ -27,6 +27,7 @@ ynh_script_progression --message="Setting up source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" +chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= diff --git a/scripts/restore b/scripts/restore index adac2db..d8ff46c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,6 +17,7 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" +chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= @@ -31,7 +32,6 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=2 -# Restore the file first, so it can have a backup if different ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index b8f1c72..8c32643 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -60,6 +60,7 @@ then fi fi +chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #=================================================