From 354258a138f869d1c80b2c47976b3e1594ee31d0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 22 Jan 2022 00:41:07 +0100 Subject: [PATCH] Upgrade to 5.0~ynh1 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/_common.sh | 1 + scripts/install | 1 - scripts/upgrade | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 38ba0af..ebe59eb 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 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services. -**Shipped version:** 4.4~ynh3 +**Shipped version:** 5.0~ynh1 diff --git a/README_fr.md b/README_fr.md index ca062df..84d8b6f 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 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services. -**Version incluse :** 4.4~ynh3 +**Version incluse :** 5.0~ynh1 diff --git a/manifest.json b/manifest.json index 7292eda..9726f32 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Monitoring tool for diverse IT components, including networks, servers, VMs and cloud services", "fr": "Outil pour monitorer des réseaux, des serveurs, des VMs et autres services en ligne" }, - "version": "4.4~ynh3", + "version": "5.0~ynh1", "url": "https://www.zabbix.com", "upstream": { "license": "GPL-2.0-or-later", diff --git a/scripts/_common.sh b/scripts/_common.sh index e623d03..dc942db 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -111,6 +111,7 @@ import_template () { cp "$confUserPpath" /etc/zabbix/zabbix_agentd.d/userP_yunohost.conf cp "$bashUserPpath" /etc/zabbix/zabbix_agentd.d/yunohost.sh + chown -R $app:$app "/etc/zabbix/zabbix_agentd.d/" chmod a+x /etc/zabbix/zabbix_agentd.d/yunohost.sh systemctl restart zabbix-agent diff --git a/scripts/install b/scripts/install index 9f7ca25..cf6c218 100644 --- a/scripts/install +++ b/scripts/install @@ -63,7 +63,6 @@ ynh_script_progression --message="Installing dependencies..." install_zabbix_repo ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -dpkg -i --force-confmiss /var/cache/apt/archives/zabbix-server-mysql* ynh_replace_string --match_string="# $language.UTF-8 UTF-8" --replace_string="$language.UTF-8 UTF-8" --target_file=/etc/locale.gen locale-gen diff --git a/scripts/upgrade b/scripts/upgrade index 0e96805..7d14841 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,7 +24,7 @@ db_user=$(ynh_app_setting_get --app=$app --key=db_user) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) language=$(ynh_app_setting_get --app=$app --key=language) -trustedversion="4.4-1+stretch" +trustedversion="5.0-1+stretch" is_public=$(ynh_permission_has_user --permission=main --user=visitors && echo 1 || echo 0) #=================================================