Skip to content

Commit ef7a3e1

Browse files
committed
Removed caddy.
1 parent f5e7347 commit ef7a3e1

6 files changed

Lines changed: 0 additions & 164 deletions

File tree

infra/ansible/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,6 @@ The `config-telemetry.ini` contains the variables to run the Telemetry in Aligne
180180

181181
| Variable | Description | Testnet | Stage | Mainnet
182182
|-------------------------------|---------------------------------------------------|-----------------------------------------------|----------------------------------------------------|------------------------------------|
183-
| caddy_metrics_url | Public URL for Grafana Metrics | `holesky.metrics.alignedlayer.com` | `stage1.metrics.alignedlayer.com` | `mainnet.metrics.alignedlayer.com`
184-
| caddy_telemetry_url | Public URL for Telemetry API | `holesky.metrics.alignedlayer.com` | `stage1.telemetry.alignedlayer.com` | `mainnet.telemetry.alignedlayer.com`
185-
| 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`
186183
| grafana_admin_password | Password for Grafana's admin user | <your_grafana_admin_password> | <your_grafana_admin_password> | <your_grafana_admin_password>
187184
| grafana_prometheus_datasource | Prometheus location for Grafana to pull data from | localhost | localhost | localhost
188185
| grafana_domain | Public URL for Grafana Metrics | `holesky.metrics.alignedlayer.com` | `stage1.metrics.alignedlayer.com` | `mainnet.metrics.alignedlayer.com`

infra/ansible/playbooks/caddy.yaml

Lines changed: 0 additions & 92 deletions
This file was deleted.

infra/ansible/playbooks/ini/caddy-batcher.ini.example

Lines changed: 0 additions & 2 deletions
This file was deleted.

infra/ansible/playbooks/ini/config-telemetry.ini.example

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
[global]
2-
caddy_metrics_url=
3-
caddy_telemetry_url=
4-
caddy_jaeger_url=
5-
62
grafana_admin_password=
73
grafana_prometheus_datasource=
84
grafana_domain=

infra/ansible/playbooks/telemetry.yaml

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,6 @@
33

44
tasks:
55

6-
- name: Add reverse proxy configuration to Caddyfile
7-
become: true
8-
blockinfile:
9-
path: /etc/caddy/Caddyfile
10-
block: |
11-
{{ caddy_metrics_url }} {
12-
reverse_proxy localhost:{{ caddy_metrics_port }}
13-
}
14-
15-
{{ caddy_telemetry_url }} {
16-
@whitelisted {
17-
path /versions*
18-
}
19-
reverse_proxy @whitelisted localhost:{{ caddy_telemetry_port }}
20-
}
21-
22-
{{ caddy_jaeger_url }} {
23-
reverse_proxy localhost:{{ caddy_jaeger_port }}
24-
}
25-
create: yes
26-
prepend_newline: true
27-
vars:
28-
ansible_ssh_user: "{{ admin_user }}"
29-
caddy_metrics_url: "{{ lookup('ini', 'caddy_metrics_url', file=ini_file) }}"
30-
caddy_metrics_port: 3000
31-
caddy_telemetry_url: "{{ lookup('ini', 'caddy_telemetry_url', file=ini_file) }}"
32-
caddy_telemetry_port: 4001
33-
caddy_jaeger_url: "{{ lookup('ini', 'caddy_jaeger_url', file=ini_file) }}"
34-
caddy_jaeger_port: 16686
35-
366
- name: Make sure /etc/default/tailscaled exists
377
become: true
388
file:
@@ -41,18 +11,6 @@
4111
vars:
4212
ansible_ssh_user: "{{ admin_user }}"
4313

44-
- name: Add permit to tailscale for caddy
45-
become: true
46-
lineinfile:
47-
path: /etc/default/tailscaled
48-
line: TS_PERMIT_CERT_UID=caddy
49-
state: present
50-
vars:
51-
ansible_ssh_user: "{{ admin_user }}"
52-
notify:
53-
- Restart caddy
54-
- Restart tailscale
55-
5614
- name: Clone Aligned repository
5715
ansible.builtin.git:
5816
repo: https://github.com/yetanotherco/aligned_layer.git
@@ -128,14 +86,6 @@
12886
scope: user
12987

13088
handlers:
131-
- name: Restart caddy
132-
become: true
133-
systemd_service:
134-
name: caddy
135-
state: restarted
136-
vars:
137-
ansible_ssh_user: "{{ admin_user }}"
138-
13989
- name: Restart tailscale
14090
become: true
14191
systemd_service:

infra/ansible/playbooks/templates/caddy/Caddyfile.batcher.j2

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)