From 7ae24cf67785d98c8877e363cf53ad411f2d601b Mon Sep 17 00:00:00 2001
From: Kamila Souckova <kamila@ksp.sk>
Date: Sun, 11 Mar 2018 10:52:25 +0100
Subject: [PATCH] __grafana_dashboard: cleanup

---
 cdist/conf/type/__grafana_dashboard/manifest | 54 ++++++++------------
 1 file changed, 22 insertions(+), 32 deletions(-)

diff --git a/cdist/conf/type/__grafana_dashboard/manifest b/cdist/conf/type/__grafana_dashboard/manifest
index 8f089367..e62bd15f 100755
--- a/cdist/conf/type/__grafana_dashboard/manifest
+++ b/cdist/conf/type/__grafana_dashboard/manifest
@@ -7,44 +7,34 @@ case $os in
     debian|devuan)
         case $os_version in
             8*|jessie)
-                __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 jessie \
-                   --component main
-
-                __package apt-transport-https
-
-                require="__apt_source/grafana __package/apt-transport-https" __package grafana
-                require="__package/grafana" __start_on_boot grafana-server
+                apt_source_distribution=jessie
                 ;;
             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
+                apt_source_distribution=stretch
                 ;;
-
             *)
-                echo "Don't know how to install Grafana on $os $os_version. Send us a pull request!"
+                echo "Don't know how to install Grafana on $os $os_version. Send us a pull request!" >&2
                 exit 1
-            ;;
+                ;;
         esac
-    ;;
+
+        __apt_key_uri grafana \
+            --name 'Grafana Release Signing Key' \
+            --uri https://packagecloud.io/gpg.key
+
+        require="$require __apt_key_uri/grafana" __apt_source grafana \
+                    --uri https://packagecloud.io/grafana/stable/debian/ \
+                    --distribution $apt_source_distribution \
+                    --component main
+
+        __package apt-transport-https
+
+        require="$require __apt_source/grafana __package/apt-transport-https" __package grafana
+        require="$require __package/grafana" __start_on_boot grafana-server
+        require="$require __start_on_boot/grafana-server" __process grafana-server --start "service grafana-server start"
+        ;;
     *)
-        echo "Don't know how to install Grafana on $os. Send us a pull request!"
+        echo "Don't know how to install Grafana on $os. Send us a pull request!" >&2
         exit 1
-    ;;
+        ;;
 esac