From bfe8b8fa57f4cad886417b3a253e47c24a3d1f83 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 6 Mar 2018 20:52:55 +0100 Subject: [PATCH] Support stretch + ascii in __grafana_dashboard --- cdist/conf/type/__grafana_dashboard/manifest | 18 +++++++++++++++++- docs/changelog | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/cdist/conf/type/__grafana_dashboard/manifest b/cdist/conf/type/__grafana_dashboard/manifest index 898770dd..8f089367 100755 --- a/cdist/conf/type/__grafana_dashboard/manifest +++ b/cdist/conf/type/__grafana_dashboard/manifest @@ -20,7 +20,23 @@ case $os in require="__apt_source/grafana __package/apt-transport-https" __package grafana require="__package/grafana" __start_on_boot grafana-server - ;; + ;; + 9*|ascii/ceres) + __apt_key_uri grafana \ + --name 'Grafana Release Signing Key' \ + --uri https://packagecloud.io/gpg.key + + require="__apt_key_uri/grafana" __apt_source grafana \ + --uri https://packagecloud.io/grafana/stable/debian/ \ + --distribution stretch \ + --component main + + __package apt-transport-https + + require="__apt_source/grafana __package/apt-transport-https" __package grafana + require="__package/grafana" __start_on_boot grafana-server + ;; + *) echo "Don't know how to install Grafana on $os $os_version. Send us a pull request!" exit 1 diff --git a/docs/changelog b/docs/changelog index 9536fd0a..0b5c5f17 100644 --- a/docs/changelog +++ b/docs/changelog @@ -15,6 +15,7 @@ next: * Core: Support in-distribution config file (Darko Poljak) * New type: __apt_default_release (Matthijs Kooijman) * Type __file: Add pre-exists state (Matthijs Kooijman) + * Type __grafana_dashboard: Add support for stretch + ascii (Nico Schottelius) 4.8.0: 2018-02-14 * Core: Skip empty lines in parameter files (Darko Poljak)