diff --git a/README.md b/README.md index 2763ec0..09005ef 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ NetData for YunoHost --------------------- +[![Integration level](https://dash.yunohost.org/integration/netdata.svg)](https://ci-apps.yunohost.org/jenkins/job/netdata%20%28Community%29/lastBuild/consoleFull) ![](https://ci-apps.yunohost.org/ci/badges/netdata.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/netdata.maintain.svg) [![Install NetData with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=netdata) -[![Integration level](https://dash.yunohost.org/integration/netdata.svg)](https://ci-apps.yunohost.org/jenkins/job/netdata%20%28Community%29/lastBuild/consoleFull) - [NetData](http://my-netdata.io/) is a system for **distributed real-time performance and health monitoring**. It provides **unparalleled insights, in real-time**, of everything happening on the diff --git a/manifest.json b/manifest.json index 9267d04..b1e9fd3 100644 --- a/manifest.json +++ b/manifest.json @@ -15,7 +15,7 @@ "url": "" }, "requirements": { - "yunohost": ">= 2.7.2" + "yunohost": ">= 3.8.0" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 4ce15f4..6fc2136 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -37,8 +37,8 @@ touch /opt/netdata/etc/netdata/.opt-out-from-anonymous-statistics # Need dovecot 2.2.16+ if [ -f /var/run/dovecot/stats ] ; then # Until Debian Strech - setfacl -m u:netdata:rw /var/run/dovecot/stats - fi + setfacl -m u:netdata:rw /var/run/dovecot/stats + fi if [ -f /var/run/dovecot/old-stats ] ; then # From Debian Buster setfacl -m u:netdata:rw /var/run/dovecot/old-stats @@ -95,15 +95,3 @@ EOF fi chgrp netdata $postgres_file } - -# ============= FUTURE YUNOHOST HELPER ============= -# Delete a file checksum from the app settings -# -# $app should be defined when calling this helper -# -# usage: ynh_remove_file_checksum file -# | arg: file - The file for which the checksum will be deleted -ynh_delete_file_checksum () { - local checksum_setting_name=checksum_${1//[\/ ]/_} # Replace all '/' and ' ' by '_' - ynh_app_setting_delete $app $checksum_setting_name -} diff --git a/scripts/backup b/scripts/backup index 503a5b3..4674860 100644 --- a/scripts/backup +++ b/scripts/backup @@ -6,12 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -if [ ! -e _common.sh ]; then - # Get the _common.sh file if it's not in the current directory - cp ../settings/scripts/_common.sh ./_common.sh - chmod a+rx _common.sh -fi -source _common.sh +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/remove b/scripts/remove index 833a995..48648e9 100644 --- a/scripts/remove +++ b/scripts/remove @@ -6,11 +6,6 @@ # IMPORT GENERIC HELPERS #================================================= -if [ ! -e _common.sh ]; then - # Get file fonction if not been to the current directory - cp ../settings/scripts/_common.sh ./_common.sh - chmod a+rx _common.sh -fi # Source app helpers source _common.sh source /usr/share/yunohost/helpers diff --git a/scripts/restore b/scripts/restore index 2424b61..4b6ec37 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,12 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -if [ ! -e _common.sh ]; then - # Get the _common.sh file if it's not in the current directory - cp ../settings/scripts/_common.sh ./_common.sh - chmod a+rx _common.sh -fi -source _common.sh +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #=================================================