From e59094500603ebcd23be36d7448ca0615a6dacd2 Mon Sep 17 00:00:00 2001 From: Erich Blume Date: Sun, 25 Jan 2026 09:00:38 -0800 Subject: [PATCH] Fix caddy handler and add port to site addresses Co-Authored-By: Claude Opus 4.5 --- ansible/roles/caddy/handlers/main.yml | 15 ++++----------- ansible/roles/caddy/templates/Caddyfile.j2 | 4 ++-- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/ansible/roles/caddy/handlers/main.yml b/ansible/roles/caddy/handlers/main.yml index ade2b85..4f2b3d7 100644 --- a/ansible/roles/caddy/handlers/main.yml +++ b/ansible/roles/caddy/handlers/main.yml @@ -1,13 +1,6 @@ --- - name: Restart caddy - block: - - name: Unload caddy LaunchAgent - ansible.builtin.command: - cmd: launchctl unload ~/Library/LaunchAgents/mcquack.eblume.caddy.plist - failed_when: false - changed_when: true - - - name: Load caddy LaunchAgent - ansible.builtin.command: - cmd: launchctl load ~/Library/LaunchAgents/mcquack.eblume.caddy.plist - changed_when: true + ansible.builtin.shell: | + launchctl unload ~/Library/LaunchAgents/mcquack.eblume.caddy.plist 2>/dev/null || true + launchctl load ~/Library/LaunchAgents/mcquack.eblume.caddy.plist + changed_when: true diff --git a/ansible/roles/caddy/templates/Caddyfile.j2 b/ansible/roles/caddy/templates/Caddyfile.j2 index 7759e45..2af6e28 100644 --- a/ansible/roles/caddy/templates/Caddyfile.j2 +++ b/ansible/roles/caddy/templates/Caddyfile.j2 @@ -15,7 +15,7 @@ } # Wildcard certificate for all services -*.{{ caddy_domain }} { +*.{{ caddy_domain }}:{{ caddy_https_port }} { tls { dns gandi { api_token {file.{{ caddy_gandi_token_file }}} @@ -36,7 +36,7 @@ } # Base domain (ops.eblu.me) -{{ caddy_domain }} { +{{ caddy_domain }}:{{ caddy_https_port }} { tls { dns gandi { api_token {file.{{ caddy_gandi_token_file }}}