mirror of
https://github.com/YunoHost-Apps/grafana_ynh.git
synced 2024-09-03 20:36:29 +02:00
Merge pull request #107 from YunoHost-Apps/testing
This commit is contained in:
commit
7342a75b9e
6 changed files with 4 additions and 11 deletions
|
@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
||||||
|
|
||||||
Metric & analytic dashboards for monitoring
|
Metric & analytic dashboards for monitoring
|
||||||
|
|
||||||
**Shipped version:** 9.5.3~ynh1
|
**Shipped version:** 10.0.2~ynh1
|
||||||
|
|
||||||
**Demo:** https://play.grafana.org
|
**Demo:** https://play.grafana.org
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
|
||||||
|
|
||||||
Tableaux de bord de supervision
|
Tableaux de bord de supervision
|
||||||
|
|
||||||
**Version incluse :** 9.5.3~ynh1
|
**Version incluse :** 10.0.2~ynh1
|
||||||
|
|
||||||
**Démo :** https://play.grafana.org
|
**Démo :** https://play.grafana.org
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
|
|
||||||
location __PATH__/ {
|
location __PATH__/ {
|
||||||
|
|
||||||
proxy_redirect off;
|
proxy_redirect off;
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"en": "Metric & analytic dashboards for monitoring",
|
"en": "Metric & analytic dashboards for monitoring",
|
||||||
"fr": "Tableaux de bord de supervision"
|
"fr": "Tableaux de bord de supervision"
|
||||||
},
|
},
|
||||||
"version": "9.5.3~ynh1",
|
"version": "10.0.2~ynh1",
|
||||||
"url": "https://grafana.com/oss/grafana/",
|
"url": "https://grafana.com/oss/grafana/",
|
||||||
"upstream": {
|
"upstream": {
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
# Debian package version for Grafana
|
# Debian package version for Grafana
|
||||||
GRAFANA_VERSION="9.5.3"
|
GRAFANA_VERSION="10.0.2"
|
||||||
|
|
||||||
# dependencies used by the app
|
# dependencies used by the app
|
||||||
pkg_dependencies="influxdb"
|
pkg_dependencies="influxdb"
|
||||||
|
|
|
@ -137,12 +137,6 @@ sed -i "/^\[server\]$/,/^\[/ s@;http_port = .*@http_port = $port@" $grafana_conf
|
||||||
sed -i "/^\[server\]$/,/^\[/ s@;domain = .*@domain = $domain@" $grafana_conf
|
sed -i "/^\[server\]$/,/^\[/ s@;domain = .*@domain = $domain@" $grafana_conf
|
||||||
# Set final URL
|
# Set final URL
|
||||||
sed -i "/^\[server\]$/,/^\[/ s@;root_url = .*@root_url = https://$domain$path_url@" $grafana_conf
|
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
|
# Disable check for updates
|
||||||
sed -i '/^\[analytics\]$/,/^\[/ s/;check_for_updates = .*/check_for_updates = false/' $grafana_conf
|
sed -i '/^\[analytics\]$/,/^\[/ s/;check_for_updates = .*/check_for_updates = false/' $grafana_conf
|
||||||
# Disable analytics reporting
|
# Disable analytics reporting
|
||||||
|
|
Loading…
Reference in a new issue