diff --git a/manifest.json b/manifest.json index 8216215..6d9ceab 100644 --- a/manifest.json +++ b/manifest.json @@ -7,10 +7,10 @@ "fr": "Tableaux de bords de supervision" }, "version": "8.0.6~ynh1", - "license": "Apache-2.0", + "license": "AGPL-3.0-only", "url": "https://grafana.com/oss/grafana/", "upstream": { - "license": "Apache-2.0", + "license": "AGPL-3.0-only", "website": "https://grafana.com/", "demo": "https://play.grafana.org", "admindoc": "https://yunohost.org/packaging_apps", diff --git a/scripts/install b/scripts/install index 57d9552..c7dc5fb 100644 --- a/scripts/install +++ b/scripts/install @@ -89,8 +89,6 @@ ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= ynh_script_progression --message="Configuring NGINX web server..." --weight=1 -### `ynh_add_nginx_config` will use the file conf/nginx.conf - # Create a dedicated nginx config ynh_add_nginx_config @@ -98,6 +96,7 @@ ynh_add_nginx_config # SPECIFIC SETUP #================================================= ynh_script_progression --message="Configuring Grafana and InfluxDB..." --weight=30 + # If NetData is installed, configure it to feed InfluxDB netdata_conf="/opt/netdata/etc/netdata/exporting.conf" if [ -f "$netdata_conf" ] ; then