summaryrefslogtreecommitdiff
path: root/roles/monitoring
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2023-08-09 14:38:23 +0200
committerChristian Pointner <equinox@spreadspace.org>2023-08-20 22:12:03 +0200
commitbc98352d3e331003db625be96139b3c1f95f63b2 (patch)
tree6f05ce12309fb46aaa9c9eee692573b49b692e4d /roles/monitoring
parentprepare test setups for new acme/cert roles (diff)
nginx/vhost: major change in certifcate/tls handling (WIP)
Diffstat (limited to 'roles/monitoring')
-rw-r--r--roles/monitoring/landingpage/defaults/main.yml3
-rw-r--r--roles/monitoring/landingpage/tasks/main.yml3
-rw-r--r--roles/monitoring/prometheus/exporter/base/tasks/main.yml10
3 files changed, 11 insertions, 5 deletions
diff --git a/roles/monitoring/landingpage/defaults/main.yml b/roles/monitoring/landingpage/defaults/main.yml
index ad2a3895..88e1b133 100644
--- a/roles/monitoring/landingpage/defaults/main.yml
+++ b/roles/monitoring/landingpage/defaults/main.yml
@@ -2,6 +2,7 @@
# monitoring_landingpage_hostnames:
# - "mon.example.com"
-monitoring_landingpage_acme: no
+# monitoring_landingpage_tls:
+# certificate_provider: "{{ acme_client }}"
#monitoring_landingpage_title: "Example Monitoring Host"
diff --git a/roles/monitoring/landingpage/tasks/main.yml b/roles/monitoring/landingpage/tasks/main.yml
index 3158770b..225cab10 100644
--- a/roles/monitoring/landingpage/tasks/main.yml
+++ b/roles/monitoring/landingpage/tasks/main.yml
@@ -15,7 +15,8 @@
name: landingpage
template: generic
hostnames: "{{ monitoring_landingpage_hostnames }}"
- acme: "{{ monitoring_landingpage_acme }}"
+ ### make tls settings optional?
+ #tls: "{{ monitoring_landingpage_tls }}"
locations:
'/':
root: /var/www/landingpage
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