From 223f75b4c3c2b712a5c152fdb750670d056f8228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ullrich=20Sch=C3=A4fer?= Date: Mon, 23 Mar 2026 00:14:57 +0100 Subject: [PATCH 1/2] Warn against pushing to auto-merged branches in CLAUDE.md Commits pushed after a PR auto-merges are orphaned from main. Always check PR state before pushing to an existing branch. Co-Authored-By: Claude Opus 4.6 (1M context) --- CLAUDE.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CLAUDE.md b/CLAUDE.md index 89726a9..8b21257 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -127,6 +127,12 @@ main → feature-a → feature-b → feature-c - When feature-a merges, rebase feature-b onto main - This keeps you unblocked while PRs are in CI +### Important: Do not push to a branch after its PR auto-merges +With the `automerge` label, PRs squash-merge as soon as CI passes. If you +push additional commits to the branch after that, those commits are orphaned +— they won't be on main. Always check `gh pr view --json state` +before pushing to an existing PR branch. + ### After merging - Update main: `git checkout main && git pull` - Delete merged branches: `git branch -d ` From bf4eb81fcb10462bcff5977770f61a5fe592011b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ullrich=20Sch=C3=A4fer?= Date: Mon, 23 Mar 2026 00:15:28 +0100 Subject: [PATCH 2/2] Add reverse DNS (PTR) records to Terraform config IPv4 and IPv6 PTR records pointing to trails.cool. These were applied to the server but missing from the committed config. Co-Authored-By: Claude Opus 4.6 (1M context) --- infrastructure/terraform/main.tf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/infrastructure/terraform/main.tf b/infrastructure/terraform/main.tf index a5f14ff..8d2650f 100644 --- a/infrastructure/terraform/main.tf +++ b/infrastructure/terraform/main.tf @@ -74,6 +74,20 @@ resource "hcloud_firewall_attachment" "trails" { server_ids = [hcloud_server.trails.id] } +# Reverse DNS + +resource "hcloud_rdns" "trails_ipv4" { + server_id = hcloud_server.trails.id + ip_address = hcloud_server.trails.ipv4_address + dns_ptr = "trails.cool" +} + +resource "hcloud_rdns" "trails_ipv6" { + server_id = hcloud_server.trails.id + ip_address = hcloud_server.trails.ipv6_address + dns_ptr = "trails.cool" +} + # DNS resource "hcloud_zone_rrset" "root_a" {