Skip to content

Commit

Permalink
Removed caddy.
Browse files Browse the repository at this point in the history
  • Loading branch information
samoht9277 committed Jan 3, 2025
1 parent f5e7347 commit ef7a3e1
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 164 deletions.
3 changes: 0 additions & 3 deletions infra/ansible/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,6 @@ The `config-telemetry.ini` contains the variables to run the Telemetry in Aligne

| Variable | Description | Testnet | Stage | Mainnet
|-------------------------------|---------------------------------------------------|-----------------------------------------------|----------------------------------------------------|------------------------------------|
| caddy_metrics_url | Public URL for Grafana Metrics | `holesky.metrics.alignedlayer.com` | `stage1.metrics.alignedlayer.com` | `mainnet.metrics.alignedlayer.com`
| caddy_telemetry_url | Public URL for Telemetry API | `holesky.metrics.alignedlayer.com` | `stage1.telemetry.alignedlayer.com` | `mainnet.telemetry.alignedlayer.com`
| caddy_jaeger_url | Tailscale URL for Jaeger | `aligned-holesky-metrics.tail665ae.ts.net` | `aligned-holesky-stage-1-metrics.tail665ae.ts.net` | `aligned-mainnet-telemetry.tail665ae.ts.net`
| grafana_admin_password | Password for Grafana's admin user | <your_grafana_admin_password> | <your_grafana_admin_password> | <your_grafana_admin_password>
| grafana_prometheus_datasource | Prometheus location for Grafana to pull data from | localhost | localhost | localhost
| grafana_domain | Public URL for Grafana Metrics | `holesky.metrics.alignedlayer.com` | `stage1.metrics.alignedlayer.com` | `mainnet.metrics.alignedlayer.com`
Expand Down
92 changes: 0 additions & 92 deletions infra/ansible/playbooks/caddy.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions infra/ansible/playbooks/ini/caddy-batcher.ini.example

This file was deleted.

4 changes: 0 additions & 4 deletions infra/ansible/playbooks/ini/config-telemetry.ini.example
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
[global]
caddy_metrics_url=
caddy_telemetry_url=
caddy_jaeger_url=

grafana_admin_password=
grafana_prometheus_datasource=
grafana_domain=
Expand Down
50 changes: 0 additions & 50 deletions infra/ansible/playbooks/telemetry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,6 @@

tasks:

- name: Add reverse proxy configuration to Caddyfile
become: true
blockinfile:
path: /etc/caddy/Caddyfile
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:
Expand All @@ -41,18 +11,6 @@
vars:
ansible_ssh_user: "{{ admin_user }}"

- name: Add permit to tailscale for caddy
become: true
lineinfile:
path: /etc/default/tailscaled
line: TS_PERMIT_CERT_UID=caddy
state: present
vars:
ansible_ssh_user: "{{ admin_user }}"
notify:
- Restart caddy
- Restart tailscale

- name: Clone Aligned repository
ansible.builtin.git:
repo: https://github.com/yetanotherco/aligned_layer.git
Expand Down Expand Up @@ -128,14 +86,6 @@
scope: user

handlers:
- name: Restart caddy
become: true
systemd_service:
name: caddy
state: restarted
vars:
ansible_ssh_user: "{{ admin_user }}"

- name: Restart tailscale
become: true
systemd_service:
Expand Down
13 changes: 0 additions & 13 deletions infra/ansible/playbooks/templates/caddy/Caddyfile.batcher.j2

This file was deleted.

0 comments on commit ef7a3e1

Please sign in to comment.