diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2023-08-15 00:57:58 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2023-08-20 22:12:03 +0200 |
| commit | e310a985a82c959cb9f9da8a5a7cda54c6dd12b9 (patch) | |
| tree | 6be008153140607e552228b25f2a4eeb70cd0318 /roles/monitoring | |
| parent | ch-pan: make use of new features of nginx/vhost generic template (diff) | |
monitoring/graphite/web: make sure to render nginx vhost config template before calling nginx/vhost role
Diffstat (limited to 'roles/monitoring')
| -rw-r--r-- | roles/monitoring/graphite/web/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/monitoring/prometheus/exporter/base/tasks/main.yml | 2 |
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 |