Refactored Caddyfile creation.

Author: samoht9277

infra/ansible/playbooks/caddy.yaml

@@ -50,17 +50,6 @@
     vars:
       ansible_ssh_user: "{{ admin_user }}"
 
-  - name: Add caddyfile config
-    become: true
-    template:
-      src: caddy/Caddyfile.{{ host }}.j2
-      dest: /etc/caddy/Caddyfile
-    vars:
-      ansible_ssh_user: "{{ admin_user }}"
-      caddy_metrics_url: "{{ lookup('ini', 'caddy_metrics_url', file=ini_file) }}"
-      caddy_telemetry_url: "{{ lookup('ini', 'caddy_telemetry_url', file=ini_file) }}"
-      caddy_jaeger_url: "{{ lookup('ini', 'caddy_jaeger_url', file=ini_file) }}"
-
   - name: Enable caddy
     become: true
     systemd_service:

infra/ansible/playbooks/telemetry.yaml

@@ -1,74 +1,38 @@
-- name: Run Setup playbook
-  ansible.builtin.import_playbook: setup.yaml
-  vars:
-    host: telemetry
-
-- name: Run Caddy playbook
-  ansible.builtin.import_playbook: caddy.yaml
-  vars:
-    host: telemetry
-    ini_file: ini/config-telemetry.ini
-
-- name: Run Prometheus playbook
-  ansible.builtin.import_playbook: prometheus.yaml
-  vars:
-    host: telemetry
-    prometheus_version: "2.53.2"
-    ini_file: ini/config-telemetry.ini
-
-- name: Run Alert Manager playbook
-  ansible.builtin.import_playbook: alert_manager.yaml
-  vars:
-    host: telemetry
-    alert_manager_version: 0.27.0
-    ini_file: ini/config-telemetry.ini
-
-- name: Run Grafana playbook
-  ansible.builtin.import_playbook: grafana.yaml
-  vars:
-    host: telemetry
-    ini_file: ini/config-telemetry.ini
-
-- name: Run OpenTelemetry playbook
-  ansible.builtin.import_playbook: open_telemetry.yaml
-  vars:
-    host: telemetry
-    open_telemetry_version: "0.113.0"
-
-- name: Run Cassandra playbook
-  ansible.builtin.import_playbook: cassandra.yaml
-  vars:
-    host: telemetry
-    ini_file: ini/config-telemetry.ini
-    cassandra_version: 5.0.2
-
-- name: Run Jaeger playbook
-  ansible.builtin.import_playbook: jaeger.yaml
-  vars:
-    host: telemetry
-    ini_file: ini/config-telemetry.ini
-    jaeger_version: 1.63.0
-
-- name: Run Postgres 16 playbook
-  ansible.builtin.import_playbook: postgres.yaml
-  vars:
-    host: telemetry
-    ini_file: ini/config-telemetry.ini
-
-- name: Run Elixir playbook
-  ansible.builtin.import_playbook: elixir.yaml
-  vars:
-    host: telemetry
-
-- name: Run Go playbook
-  ansible.builtin.import_playbook: go.yaml
-  vars:
-    host: telemetry
-
 - name: Setup Telemetry
   hosts: telemetry
 
   tasks:
+
+  - name: Add reverse proxy configuration to Caddyfile
+    become: true
+    blockinfile:
+      path: /etc/caddy/Caddyfile.test
+      block: |
+        {{ caddy_metrics_url }} {
+          reverse_proxy localhost:{{ caddy_metrics_port }}
+        }
+
+        {{ caddy_telemetry_url }} {
+          @whitelisted {
+            path /versions*
+          }
+          reverse_proxy @whitelisted localhost:{{ caddy_telemetry_port }}
+        }
+
+        {{ caddy_jaeger_url }} {
+          reverse_proxy localhost:{{ caddy_jaeger_port }}
+        }
+      create: yes
+      prepend_newline: true
+    vars:
+      ansible_ssh_user: "{{ admin_user }}"
+      caddy_metrics_url: "{{ lookup('ini', 'caddy_metrics_url', file=ini_file) }}"
+      caddy_metrics_port: 3000
+      caddy_telemetry_url: "{{ lookup('ini', 'caddy_telemetry_url', file=ini_file) }}"
+      caddy_telemetry_port: 4001
+      caddy_jaeger_url: "{{ lookup('ini', 'caddy_jaeger_url', file=ini_file) }}"
+      caddy_jaeger_port: 16686
+
   - name: Make sure /etc/default/tailscaled exists
     become: true
     file:
@@ -118,7 +82,7 @@
 
   - name: Install dependencies for Telemetry API
     shell:
-      cmd: | 
+      cmd: |
         source .env
         mix deps.get
         mix phx.gen.release