Linux-Help/formula-grafana
1
0
Fork 0
mirror of synced 2024-11-22 08:55:35 -05:00
Code Issues Releases Wiki Activity

fixes

Browse source
This commit is contained in:
Michael Kutý 2014-03-03 20:21:06 +01:00
parent 04ec5afa58
commit 4eecac22d4
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
server.sls
View file

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