diff --git a/README.md b/README.md index cacf7f2..24e4da1 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Metric & analytic dashboards for monitoring -**Shipped version:** 9.5.3~ynh1 +**Shipped version:** 10.0.2~ynh1 **Demo:** https://play.grafana.org diff --git a/README_fr.md b/README_fr.md index 627af4f..1419a59 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Tableaux de bord de supervision -**Version incluse :** 9.5.3~ynh1 +**Version incluse :** 10.0.2~ynh1 **Démo :** https://play.grafana.org diff --git a/conf/nginx.conf b/conf/nginx.conf index 1bc6f42..e5fc35d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,3 @@ -#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { proxy_redirect off; diff --git a/manifest.json b/manifest.json index 937effd..2b6a754 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Metric & analytic dashboards for monitoring", "fr": "Tableaux de bord de supervision" }, - "version": "9.5.3~ynh1", + "version": "10.0.2~ynh1", "url": "https://grafana.com/oss/grafana/", "upstream": { "license": "AGPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 4936c17..c6a68e4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # Debian package version for Grafana -GRAFANA_VERSION="9.5.3" +GRAFANA_VERSION="10.0.2" # dependencies used by the app pkg_dependencies="influxdb" diff --git a/scripts/install b/scripts/install index a6f32eb..7931ef2 100644 --- a/scripts/install +++ b/scripts/install @@ -137,12 +137,6 @@ sed -i "/^\[server\]$/,/^\[/ s@;http_port = .*@http_port = $port@" $grafana_conf sed -i "/^\[server\]$/,/^\[/ s@;domain = .*@domain = $domain@" $grafana_conf # Set final URL sed -i "/^\[server\]$/,/^\[/ s@;root_url = .*@root_url = https://$domain$path_url@" $grafana_conf -# Specify if using sub_path -if [ "$path_url" != "/" ]; then - sed -i "/^\[server\]$/,/^\[/ s@;serve_from_sub_path = .*@serve_from_sub_path = true@" $grafana_conf -else - sed -i "/^\[server\]$/,/^\[/ s@;serve_from_sub_path = .*@serve_from_sub_path = false@" $grafana_conf -fi # Disable check for updates sed -i '/^\[analytics\]$/,/^\[/ s/;check_for_updates = .*/check_for_updates = false/' $grafana_conf # Disable analytics reporting