grfana from package
diff --git a/server.sls b/server.sls
index 6b64e33..5cd29f9 100755
--- a/server.sls
+++ b/server.sls
@@ -10,7 +10,6 @@
- mode: 755
- makedirs: true
-
{% if pillar.grafana.server.source.type == 'git' %}
grafana_repository:
@@ -50,6 +49,43 @@
- git: grafana_repository
- file: /srv/grafana/site/src/config.js
+{% elif pillar.grafana.server.source.type == 'pkg' %}
+
+{% set version = pillar.grafana.server.source.rev %}
+
+/srv/grafana/site/dist:
+ file:
+ - directory
+ - mode: 755
+ - makedirs: true
+
+/srv/grafana/site/dist/config.js:
+ file:
+ - managed
+ - source: salt://grafana/conf/config.js
+ - template: jinja
+ - require:
+ - file: /srv/grafana/site/dist
+
+download_grafana:
+ cmd.run:
+ - names:
+ - wget https://github.com/torkelo/grafana/releases/download/v{{ version }}/grafana-{{ version }}.tar.gz
+ - user: root
+ - cwd: /root
+ - unless: test -e /root/grafana-{{ version }}.tar.gz
+
+untar_grafana:
+ cmd.run:
+ - names:
+ - tar zxvf /root/grafana-{{ version }}.tar.gz -C /srv/grafana/site/dist
+ - user: root
+ - cwd: /root
+ - unless: test -e /srv/grafana/dist/app
+ - require:
+ - file: /srv/grafana/site/dist/config.js
+ - file: /srv/grafana/site/dist
+
{% endif %}
{%- endif %}