From bc98352d3e331003db625be96139b3c1f95f63b2 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 9 Aug 2023 14:38:23 +0200 Subject: nginx/vhost: major change in certifcate/tls handling (WIP) --- roles/monitoring/prometheus/exporter/base/tasks/main.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'roles/monitoring/prometheus/exporter/base/tasks') diff --git a/roles/monitoring/prometheus/exporter/base/tasks/main.yml b/roles/monitoring/prometheus/exporter/base/tasks/main.yml index c69c6e05..3cedc042 100644 --- a/roles/monitoring/prometheus/exporter/base/tasks/main.yml +++ b/roles/monitoring/prometheus/exporter/base/tasks/main.yml @@ -21,10 +21,14 @@ - name: create TLS certificate and key import_tasks: tls.yml +- name: render nginx-vhost config template + set_fact: + prometheus_exporter_nginx_vhost_content: "{{ lookup('template', 'nginx-vhost.j2') }}" + - name: configure nginx vhost - import_role: - name: nginx/vhost vars: nginx_vhost: name: prometheus-exporter - content: "{{ lookup('template', 'nginx-vhost.j2') }}" + content: "{{ prometheus_exporter_nginx_vhost_content }}" + import_role: + name: nginx/vhost -- cgit v1.2.3 From e310a985a82c959cb9f9da8a5a7cda54c6dd12b9 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 15 Aug 2023 00:57:58 +0200 Subject: monitoring/graphite/web: make sure to render nginx vhost config template before calling nginx/vhost role --- roles/monitoring/graphite/web/tasks/main.yml | 6 +++++- roles/monitoring/prometheus/exporter/base/tasks/main.yml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'roles/monitoring/prometheus/exporter/base/tasks') 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 -- cgit v1.2.3