Generalize nginx config and proxy prometheus for pis

evroon · Mar 20, 2024 · a3e2e4a · a3e2e4a
1 parent 787c6a5
commit a3e2e4a
Show file tree

Hide file tree

Showing 27 changed files with 63 additions and 20 deletions.
diff --git a/ansible/provision.yml b/ansible/provision.yml
diff --git a/ansible/roles/grafana/templates/prometheus.yml.j2 b/ansible/roles/grafana/templates/prometheus.yml.j2
@@ -37,7 +37,7 @@ scrape_configs:
 
   - job_name: esp32
     static_configs:
-      - targets: ["{{ esp32_host }}:4040"]
+      - targets: ["andromeda:4040"]
     relabel_configs: *instance_relabel_config
 
   - job_name: wireguard-exporter

diff --git a/...le/roles/nginx/tasks/get-certificates.yml → ...oles/nginx-dmz/tasks/get-certificates.yml b/...le/roles/nginx/tasks/get-certificates.yml → ...oles/nginx-dmz/tasks/get-certificates.yml
diff --git a/ansible/roles/nginx-dmz/tasks/main.yml b/ansible/roles/nginx-dmz/tasks/main.yml
diff --git a/...templates/sites-available/alertmanager.j2 → ...templates/sites-available/alertmanager.j2 b/...templates/sites-available/alertmanager.j2 → ...templates/sites-available/alertmanager.j2
diff --git a/...inx/templates/sites-available/authelia.j2 → ...dmz/templates/sites-available/authelia.j2 b/...inx/templates/sites-available/authelia.j2 → ...dmz/templates/sites-available/authelia.j2
diff --git a/...ginx/templates/sites-available/bracket.j2 → ...-dmz/templates/sites-available/bracket.j2 b/...ginx/templates/sites-available/bracket.j2 → ...-dmz/templates/sites-available/bracket.j2
diff --git a/.../nginx/templates/sites-available/dashy.j2 → ...nx-dmz/templates/sites-available/dashy.j2 b/.../nginx/templates/sites-available/dashy.j2 → ...nx-dmz/templates/sites-available/dashy.j2
diff --git a/...ginx/templates/sites-available/default.j2 → ...-dmz/templates/sites-available/default.j2 b/...ginx/templates/sites-available/default.j2 → ...-dmz/templates/sites-available/default.j2
diff --git a/.../nginx/templates/sites-available/drone.j2 → ...nx-dmz/templates/sites-available/drone.j2 b/.../nginx/templates/sites-available/drone.j2 → ...nx-dmz/templates/sites-available/drone.j2
diff --git a/.../nginx/templates/sites-available/gitea.j2 → ...nx-dmz/templates/sites-available/gitea.j2 b/.../nginx/templates/sites-available/gitea.j2 → ...nx-dmz/templates/sites-available/gitea.j2
diff --git a/...ginx/templates/sites-available/grafana.j2 → ...-dmz/templates/sites-available/grafana.j2 b/...ginx/templates/sites-available/grafana.j2 → ...-dmz/templates/sites-available/grafana.j2
diff --git a/.../nginx/templates/sites-available/munin.j2 → ...nx-dmz/templates/sites-available/munin.j2 b/.../nginx/templates/sites-available/munin.j2 → ...nx-dmz/templates/sites-available/munin.j2
diff --git a/.../nginx/templates/sites-available/nomad.j2 → ...nx-dmz/templates/sites-available/nomad.j2 b/.../nginx/templates/sites-available/nomad.j2 → ...nx-dmz/templates/sites-available/nomad.j2
diff --git a/...x/templates/sites-available/prometheus.j2 → ...z/templates/sites-available/prometheus.j2 b/...x/templates/sites-available/prometheus.j2 → ...z/templates/sites-available/prometheus.j2
diff --git a/...ginx/templates/sites-available/selfoss.j2 → ...-dmz/templates/sites-available/selfoss.j2 b/...ginx/templates/sites-available/selfoss.j2 → ...-dmz/templates/sites-available/selfoss.j2
diff --git a/...nx/templates/sites-available/shopware6.j2 → ...mz/templates/sites-available/shopware6.j2 b/...nx/templates/sites-available/shopware6.j2 → ...mz/templates/sites-available/shopware6.j2
diff --git a/.../templates/sites-available/umami-admin.j2 → .../templates/sites-available/umami-admin.j2 b/.../templates/sites-available/umami-admin.j2 → .../templates/sites-available/umami-admin.j2
diff --git a/...emplates/sites-available/umami-bracket.j2 → ...emplates/sites-available/umami-bracket.j2 b/...emplates/sites-available/umami-bracket.j2 → ...emplates/sites-available/umami-bracket.j2
diff --git a/.../templates/sites-available/uptime_kuma.j2 → .../templates/sites-available/uptime_kuma.j2 b/.../templates/sites-available/uptime_kuma.j2 → .../templates/sites-available/uptime_kuma.j2
diff --git a/.../templates/sites-available/web1090-api.j2 → .../templates/sites-available/web1090-api.j2 b/.../templates/sites-available/web1090-api.j2 → .../templates/sites-available/web1090-api.j2
diff --git a/...ginx/templates/sites-available/web1090.j2 → ...-dmz/templates/sites-available/web1090.j2 b/...ginx/templates/sites-available/web1090.j2 → ...-dmz/templates/sites-available/web1090.j2
diff --git a/...x/templates/sites-available/wg_easy_ui.j2 → ...z/templates/sites-available/wg_easy_ui.j2 b/...x/templates/sites-available/wg_easy_ui.j2 → ...z/templates/sites-available/wg_easy_ui.j2
diff --git a/...nx/templates/sites-available/wordpress.j2 → ...mz/templates/sites-available/wordpress.j2 b/...nx/templates/sites-available/wordpress.j2 → ...mz/templates/sites-available/wordpress.j2
diff --git a/ansible/roles/nginx-prometheus-proxy/tasks/main.yml b/ansible/roles/nginx-prometheus-proxy/tasks/main.yml
diff --git a/ansible/roles/nginx-prometheus-proxy/templates/sites-available/prometheus-proxy.j2 b/ansible/roles/nginx-prometheus-proxy/templates/sites-available/prometheus-proxy.j2
@@ -0,0 +1,7 @@
+server {
+    listen 4040;
+
+    location / {
+        proxy_pass {{ esp32_host_addr }};
+    }
+}
diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml