matze/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse source 
Updated repository configuration for grafana dashboard type

See merge request ungleich-public/cdist!787
This commit is contained in:
poljakowski 2019-07-25 08:05:05 +02:00
commit 9773fcf719
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cdist/conf/type/__grafana_dashboard/manifest
View file

@ -8,10 +8,12 @@ case $os in
debian|devuan) debian|devuan)
case $os_version in case $os_version in
8*|jessie) 8*|jessie)
apt_source_distribution=jessie # Differntation not needed anymore
apt_source_distribution=stable
;; ;;
9*|ascii/ceres|ascii) 9*|ascii/ceres|ascii)
apt_source_distribution=stretch # Differntation not needed anymore
apt_source_distribution=stable
;; ;;
*) *)
echo "Don't know how to install Grafana on $os $os_version. Send us a pull request!" >&2 echo "Don't know how to install Grafana on $os $os_version. Send us a pull request!" >&2
@ -21,10 +23,10 @@ case $os in
__apt_key_uri grafana \ __apt_key_uri grafana \
--name 'Grafana Release Signing Key' \ --name 'Grafana Release Signing Key' \
--uri https://packagecloud.io/gpg.key --uri https://packages.grafana.com/gpg.key
require="$require __apt_key_uri/grafana" __apt_source grafana \ require="$require __apt_key_uri/grafana" __apt_source grafana \
--uri https://packagecloud.io/grafana/stable/debian/ \ --uri https://packages.grafana.com/oss/deb \
--distribution $apt_source_distribution \ --distribution $apt_source_distribution \
--component main --component main