bitcoin-knots, fulcrum, datum-gateway: add and use the socket_proxy role
Three near-identical hosts: edge plays become one role plus three short
calls. 183 lines removed, 34 added, plus a 111-line role.
Verified before touching any playbook: all six live units on vipy reproduced
byte-identically. Then --limit edge --check per playbook - bitcoin-knots and
fulcrum changed=0; datum-gateway changed=2, both attributable to the already
known caddy_site comment line and the Reload caddy handler it triggers.
The 6 units and 14 Caddy files on the hosts are byte-identical afterwards.
PLAN_4 claimed these three plays had "no behavioural drift at all". That was
wrong - it came from a diff truncated by head -60. The live bitcoin-p2p-proxy
units carry four settings this playbook never wrote:
.socket Documentation=, FreeBind=true
.service Documentation=, TimeoutStopSec=5,
StandardOutput=journal, StandardError=journal
FreeBind is the one that matters: it lets the socket bind to an address that
is not up yet, so without it the socket can fail to start on boot. Running
the bitcoin-knots playbook would have stripped it. Same class of hazard as
headscale. The role expresses all four; bitcoin-p2p is the only caller that
passes any.
Also: UFW treats the rule comment as part of the rule. datum-stratum's live
comment is "DATUM Gateway Stratum public access" but the role's derived
default produced "DATUM Stratum public access", which rewrote the rule.
Caught in the dry-run; datum now passes the comment explicitly.
Two deliberate differences from the original, both documented in the README:
ignore_errors: yes on the upstream check became failed_when: false, and the
handler restarts the .socket, which drops connections open through it - it
fires only when a unit file actually changes.
The inert Uptime Kuma TCP monitor blocks stay in the playbooks rather than
being pulled into a new role (12/12/18 guarded tasks).
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
16cbd189b8
commit
c4094b692f
9 changed files with 207 additions and 183 deletions
|
|
@ -753,62 +753,21 @@
|
|||
uptime_kuma_api_url: "https://{{ subdomains.uptime_kuma }}.{{ root_domain }}"
|
||||
|
||||
tasks:
|
||||
- name: Create Bitcoin P2P proxy socket unit
|
||||
copy:
|
||||
dest: /etc/systemd/system/bitcoin-p2p-proxy.socket
|
||||
content: |
|
||||
[Unit]
|
||||
Description=Bitcoin P2P Proxy Socket
|
||||
|
||||
[Socket]
|
||||
ListenStream={{ bitcoin_p2p_port }}
|
||||
|
||||
[Install]
|
||||
WantedBy=sockets.target
|
||||
owner: root
|
||||
group: root
|
||||
mode: '0644'
|
||||
notify: Restart bitcoin-p2p-proxy socket
|
||||
|
||||
- name: Create Bitcoin P2P proxy service unit
|
||||
copy:
|
||||
dest: /etc/systemd/system/bitcoin-p2p-proxy.service
|
||||
content: |
|
||||
[Unit]
|
||||
Description=Bitcoin P2P Proxy to {{ bitcoin_tailscale_hostname }}
|
||||
Requires=bitcoin-p2p-proxy.socket
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
ExecStart=/lib/systemd/systemd-socket-proxyd {{ bitcoin_tailscale_hostname }}:{{ bitcoin_p2p_port }}
|
||||
owner: root
|
||||
group: root
|
||||
mode: '0644'
|
||||
|
||||
- name: Reload systemd daemon
|
||||
systemd:
|
||||
daemon_reload: yes
|
||||
|
||||
- name: Enable and start Bitcoin P2P proxy socket
|
||||
systemd:
|
||||
name: bitcoin-p2p-proxy.socket
|
||||
enabled: yes
|
||||
state: started
|
||||
|
||||
- name: Allow Bitcoin P2P port through UFW
|
||||
ufw:
|
||||
rule: allow
|
||||
port: "{{ bitcoin_p2p_port | string }}"
|
||||
proto: tcp
|
||||
comment: "Bitcoin P2P public access"
|
||||
|
||||
- name: Verify connectivity to knots-box via Tailscale
|
||||
wait_for:
|
||||
host: "{{ bitcoin_tailscale_hostname }}"
|
||||
port: "{{ bitcoin_p2p_port }}"
|
||||
timeout: 10
|
||||
ignore_errors: yes
|
||||
- name: Expose Bitcoin P2P through a socket proxy
|
||||
ansible.builtin.include_role:
|
||||
name: socket_proxy
|
||||
vars:
|
||||
socket_proxy_name: bitcoin-p2p
|
||||
socket_proxy_description: "Bitcoin P2P"
|
||||
socket_proxy_listen_port: "{{ bitcoin_p2p_port }}"
|
||||
socket_proxy_upstream_host: "{{ bitcoin_tailscale_hostname }}"
|
||||
# These four were added by hand on vipy and were NOT in this playbook;
|
||||
# writing the unit without them would have dropped FreeBind, which lets
|
||||
# the socket bind before the address is up.
|
||||
socket_proxy_documentation: "https://github.com/bitcoin/bitcoin"
|
||||
socket_proxy_free_bind: true
|
||||
socket_proxy_timeout_stop_sec: 5
|
||||
socket_proxy_log_to_journal: true
|
||||
|
||||
- name: Display public endpoint
|
||||
when: uptime_kuma_enabled | default(false)
|
||||
|
|
@ -931,8 +890,3 @@
|
|||
- /tmp/setup_bitcoin_p2p_tcp_monitor.py
|
||||
- /tmp/ansible_bitcoin_p2p_config.yml
|
||||
|
||||
handlers:
|
||||
- name: Restart bitcoin-p2p-proxy socket
|
||||
systemd:
|
||||
name: bitcoin-p2p-proxy.socket
|
||||
state: restarted
|
||||
|
|
|
|||
|
|
@ -663,62 +663,17 @@
|
|||
uptime_kuma_api_url: "https://{{ subdomains.uptime_kuma }}.{{ root_domain }}"
|
||||
|
||||
tasks:
|
||||
- name: Create Stratum proxy socket unit
|
||||
copy:
|
||||
dest: /etc/systemd/system/datum-stratum-proxy.socket
|
||||
content: |
|
||||
[Unit]
|
||||
Description=DATUM Stratum Proxy Socket
|
||||
|
||||
[Socket]
|
||||
ListenStream={{ datum_gateway_stratum_port }}
|
||||
|
||||
[Install]
|
||||
WantedBy=sockets.target
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
notify: Restart datum-stratum-proxy socket
|
||||
|
||||
- name: Create Stratum proxy service unit
|
||||
copy:
|
||||
dest: /etc/systemd/system/datum-stratum-proxy.service
|
||||
content: |
|
||||
[Unit]
|
||||
Description=DATUM Stratum Proxy to {{ datum_tailscale_hostname }}
|
||||
Requires=datum-stratum-proxy.socket
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
ExecStart=/lib/systemd/systemd-socket-proxyd {{ datum_tailscale_hostname }}:{{ datum_gateway_stratum_port }}
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
|
||||
- name: Reload systemd daemon
|
||||
systemd:
|
||||
daemon_reload: yes
|
||||
|
||||
- name: Enable and start Stratum proxy socket
|
||||
systemd:
|
||||
name: datum-stratum-proxy.socket
|
||||
enabled: yes
|
||||
state: started
|
||||
|
||||
- name: Allow Stratum port through UFW
|
||||
ufw:
|
||||
rule: allow
|
||||
port: "{{ datum_gateway_stratum_port | string }}"
|
||||
proto: tcp
|
||||
comment: "DATUM Gateway Stratum public access"
|
||||
|
||||
- name: Verify connectivity to knots-box Stratum via Tailscale
|
||||
wait_for:
|
||||
host: "{{ datum_tailscale_hostname }}"
|
||||
port: "{{ datum_gateway_stratum_port }}"
|
||||
timeout: 10
|
||||
ignore_errors: yes
|
||||
- name: Expose the DATUM Stratum port through a socket proxy
|
||||
ansible.builtin.include_role:
|
||||
name: socket_proxy
|
||||
vars:
|
||||
socket_proxy_name: datum-stratum
|
||||
socket_proxy_description: "DATUM Stratum"
|
||||
socket_proxy_listen_port: "{{ datum_gateway_stratum_port }}"
|
||||
socket_proxy_upstream_host: "{{ datum_tailscale_hostname }}"
|
||||
# Matches the UFW comment already on vipy; the derived default would
|
||||
# have said "DATUM Stratum" and rewritten the rule.
|
||||
socket_proxy_ufw_comment: "DATUM Gateway Stratum public access"
|
||||
|
||||
- name: Display public Stratum endpoint
|
||||
when: uptime_kuma_enabled | default(false)
|
||||
|
|
@ -845,8 +800,3 @@
|
|||
- /tmp/setup_datum_stratum_tcp_monitor.py
|
||||
- /tmp/ansible_datum_stratum_config.yml
|
||||
|
||||
handlers:
|
||||
- name: Restart datum-stratum-proxy socket
|
||||
systemd:
|
||||
name: datum-stratum-proxy.socket
|
||||
state: restarted
|
||||
|
|
|
|||
|
|
@ -552,62 +552,14 @@
|
|||
uptime_kuma_api_url: "https://{{ subdomains.uptime_kuma }}.{{ root_domain }}"
|
||||
|
||||
tasks:
|
||||
- name: Create Fulcrum SSL proxy socket unit
|
||||
copy:
|
||||
dest: /etc/systemd/system/fulcrum-ssl-proxy.socket
|
||||
content: |
|
||||
[Unit]
|
||||
Description=Fulcrum SSL Proxy Socket
|
||||
|
||||
[Socket]
|
||||
ListenStream={{ fulcrum_ssl_port }}
|
||||
|
||||
[Install]
|
||||
WantedBy=sockets.target
|
||||
owner: root
|
||||
group: root
|
||||
mode: '0644'
|
||||
notify: Restart fulcrum-ssl-proxy socket
|
||||
|
||||
- name: Create Fulcrum SSL proxy service unit
|
||||
copy:
|
||||
dest: /etc/systemd/system/fulcrum-ssl-proxy.service
|
||||
content: |
|
||||
[Unit]
|
||||
Description=Fulcrum SSL Proxy to {{ fulcrum_tailscale_hostname }}
|
||||
Requires=fulcrum-ssl-proxy.socket
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
ExecStart=/lib/systemd/systemd-socket-proxyd {{ fulcrum_tailscale_hostname }}:{{ fulcrum_ssl_port }}
|
||||
owner: root
|
||||
group: root
|
||||
mode: '0644'
|
||||
|
||||
- name: Reload systemd daemon
|
||||
systemd:
|
||||
daemon_reload: yes
|
||||
|
||||
- name: Enable and start Fulcrum SSL proxy socket
|
||||
systemd:
|
||||
name: fulcrum-ssl-proxy.socket
|
||||
enabled: yes
|
||||
state: started
|
||||
|
||||
- name: Allow Fulcrum SSL port through UFW
|
||||
ufw:
|
||||
rule: allow
|
||||
port: "{{ fulcrum_ssl_port | string }}"
|
||||
proto: tcp
|
||||
comment: "Fulcrum SSL public access"
|
||||
|
||||
- name: Verify connectivity to fulcrum-box via Tailscale
|
||||
wait_for:
|
||||
host: "{{ fulcrum_tailscale_hostname }}"
|
||||
port: "{{ fulcrum_ssl_port }}"
|
||||
timeout: 10
|
||||
ignore_errors: yes
|
||||
- name: Expose Fulcrum SSL through a socket proxy
|
||||
ansible.builtin.include_role:
|
||||
name: socket_proxy
|
||||
vars:
|
||||
socket_proxy_name: fulcrum-ssl
|
||||
socket_proxy_description: "Fulcrum SSL"
|
||||
socket_proxy_listen_port: "{{ fulcrum_ssl_port }}"
|
||||
socket_proxy_upstream_host: "{{ fulcrum_tailscale_hostname }}"
|
||||
|
||||
- name: Display public endpoint
|
||||
when: uptime_kuma_enabled | default(false)
|
||||
|
|
@ -730,9 +682,4 @@
|
|||
- /tmp/setup_fulcrum_ssl_tcp_monitor.py
|
||||
- /tmp/ansible_fulcrum_ssl_config.yml
|
||||
|
||||
handlers:
|
||||
- name: Restart fulcrum-ssl-proxy socket
|
||||
systemd:
|
||||
name: fulcrum-ssl-proxy.socket
|
||||
state: restarted
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue