From 4eecac22d4cda1e2e1135061267a6079d38f7b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Kut=C3=BD?= <6du1ro.n@gmail.com>
Date: Mon, 3 Mar 2014 20:21:06 +0100
Subject: [PATCH] fixes

---
 server.sls | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/server.sls b/server.sls
index 50dfa40..6b64e33 100755
--- a/server.sls
+++ b/server.sls
@@ -10,6 +10,7 @@ include:
   - mode: 755
   - makedirs: true
 
+
 {% if pillar.grafana.server.source.type == 'git' %}
 
 grafana_repository:
@@ -21,6 +22,14 @@ grafana_repository:
     - file: /srv/grafana
     - pkg: git_packages
 
+/srv/grafana/site/src/config.js:
+  file:
+  - managed
+  - source: salt://grafana/conf/config.js
+  - template: jinja
+  - require:
+    - git: grafana_repository
+
 grafana_install:
   cmd.run:
   - names: 
@@ -31,7 +40,6 @@ grafana_install:
   - require:
     - git: grafana_repository
 
-
 grafana_grun_build:
   cmd.run:
   - names: 
@@ -40,16 +48,8 @@ grafana_grun_build:
   - unless: test -e /srv/grafana/site/dist
   - require:
     - git: grafana_repository
-
+    - file: /srv/grafana/site/src/config.js
 
 {% endif %}
 
-/srv/grafana/site/src/config.js:
-  file:
-  - managed
-  - source: salt://grafana/conf/config.js
-  - template: jinja
-  - require:
-    - cmd: grafana_install
-
 {%- endif %}