summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--roles/monitoring/graphite/web/tasks/main.yml6
-rw-r--r--roles/monitoring/prometheus/exporter/base/tasks/main.yml2
2 files changed, 6 insertions, 2 deletions
diff --git a/roles/monitoring/graphite/web/tasks/main.yml b/roles/monitoring/graphite/web/tasks/main.yml
index 7c796722..e450fac4 100644
--- a/roles/monitoring/graphite/web/tasks/main.yml
+++ b/roles/monitoring/graphite/web/tasks/main.yml
@@ -41,10 +41,14 @@
include_role:
name: uwsgi/app
+- name: render nginx-vhost config template
+ set_fact:
+ graphite_web_nginx_vhost_content: "{{ lookup('template', 'nginx-vhost.conf.j2') }}"
+
- name: install nginx vhost
vars:
nginx_vhost:
name: graphite
- content: "{{ lookup('template', 'nginx-vhost.conf.j2') }}"
+ content: "{{ graphite_web_nginx_vhost_content }}"
include_role:
name: nginx/vhost
diff --git a/roles/monitoring/prometheus/exporter/base/tasks/main.yml b/roles/monitoring/prometheus/exporter/base/tasks/main.yml
index 3cedc042..235b7241 100644
--- a/roles/monitoring/prometheus/exporter/base/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/base/tasks/main.yml
@@ -30,5 +30,5 @@
nginx_vhost:
name: prometheus-exporter
content: "{{ prometheus_exporter_nginx_vhost_content }}"
- import_role:
+ include_role:
name: nginx/vhost