ADR 0056: selectable ACME issuer, step-ca init from operator root, route labels

Piece A + B of ADR 0056, completing the internal-CA work in ff01ada. Selectable issuer. acme-ca is now a role two providers can satisfy: step-ca (internal CA) or the new public-acme (a fact-only module, no container/listen) that serves Let's Encrypt production. A mesh assigns one or the other to satisfy route-proxy's `requires: acme-ca`. One directory shape for both. A provider serves the ACME directory's parts the way the mesh already models any reachable service -- an address (`at`), a `port` and a `path` -- and route-proxy composes `https://<at>:<port><path>`. step-ca lets the mesh fill `at` (its node) and `port` (its single listen) and serves only `path`; public-acme, not being a mesh service, serves all three (overriding `at` with the public host). Same composition either way. Empty root means the system trust store. Both providers serve `root`: step-ca the operator root PEM (settled per mesh), public-acme an empty string. route-proxy writes it to the CA bundle file unconditionally; the binary now reads an empty bundle as "the root is already trusted by the OS" and falls back to system roots (examples/route-proxy/main.go, committed on the mesh-control ADR-0056 branch). step-ca inits from the operator's root. The operator's root cert, root key and root-key password are mounted at the smallstep entrypoint's default init paths (/run/secrets/root_ca.crt, root_ca_key, root_ca_key_password) with the matching DOCKER_STEPCA_INIT_*_FILE vars, so `step ca init` adopts the operator's root instead of self-generating one -- the CA that signs is the CA route-proxy trusts. Route names are labels, not FQDNs. Every routed module now contributes a `label` (the leftmost subdomain) instead of a full public hostname; the node's public domain composes the name. Apex (novox.be) is left as a full name -- composeName has no empty-label/apex convention yet (mesh-control follow-up). Claude-Session: https://claude.ai/code/session_01LrgweAeERJYBg88c5cKDzF
2026-09-10 00:21:42 +02:00
parent ff01adaa45
commit f0665ba956
31 changed files with 61 additions and 33 deletions
@@ -14,7 +14,7 @@
      "name": "baserow"
    },
    "route": {
-      "name": "baserow.zurag.be",
+      "label": "baserow",
      "port": 80
    }
  },
@@ -109,7 +109,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "subs.zurag.be",
+      "label": "subs",
      "port": 6767
    }
  },
@@ -85,7 +85,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "books.zurag.be",
+      "label": "books",
      "port": 8787
    }
  },
@@ -10,7 +10,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "de-spiegel.novox.be",
+      "label": "de-spiegel",
      "port": 35621
    }
  },
@@ -10,7 +10,7 @@
      "name": "gitea"
    },
    "route": {
-      "name": "git.novox.be",
+      "label": "git",
      "port": 3000
    }
  },
@@ -94,7 +94,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "grafana.zurag.be",
+      "label": "grafana",
      "port": 3000
    }
  },
@@ -10,7 +10,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "hello.example",
+      "label": "hello",
      "port": 8080
    }
  },
@@ -83,7 +83,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "home-assistant.zurag.be",
+      "label": "home-assistant",
      "port": 8123
    }
  },
@@ -17,7 +17,7 @@
      "bucket": "invoicing"
    },
    "route": {
-      "name": "invoicing.novox.be",
+      "label": "invoicing",
      "port": 80
    }
  },
@@ -81,7 +81,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "indexers.zurag.be",
+      "label": "indexers",
      "port": 9117
    }
  },
@@ -10,7 +10,7 @@
      "name": "keycloak"
    },
    "route": {
-      "name": "keycloak.novox.be",
+      "label": "keycloak",
      "port": 8080
    }
  },
@@ -85,7 +85,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "lidarr.zurag.be",
+      "label": "lidarr",
      "port": 8686
    }
  },
@@ -13,7 +13,7 @@
      "name": "mailu"
    },
    "route": {
-      "name": "mail.novox.be",
+      "label": "mail",
      "port": 7080
    }
  },
@@ -14,7 +14,7 @@
      "name": "n8n"
    },
    "route": {
-      "name": "n8n.zurag.be",
+      "label": "n8n",
      "port": 5682
    }
  },
@@ -14,7 +14,7 @@
      "bucket": "nextcloud"
    },
    "route": {
-      "name": "nextcloud.novox.be",
+      "label": "nextcloud",
      "port": 80
    }
  },
@@ -80,7 +80,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "nodered.zurag.be",
+      "label": "nodered",
      "port": 1880
    }
  },
@@ -88,7 +88,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "ombi.zurag.be",
+      "label": "ombi",
      "port": 3579
    }
  },
@@ -10,7 +10,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "office.novox.be",
+      "label": "office",
      "port": 9070
    }
  },
@@ -10,7 +10,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "eef.novox.be",
+      "label": "eef",
      "port": 4012
    }
  },
@@ -10,7 +10,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "filip.novox.be",
+      "label": "filip",
      "port": 4013
    }
  },
@@ -17,7 +17,7 @@
      "name": "photos"
    },
    "route": {
-      "name": "photos.novox.be",
+      "label": "photos",
      "port": 4001
    }
  },
@@ -0,0 +1,18 @@
+{
+  "module": "public-acme",
+  "version": "1",
+  "provides": [
+    {
+      "name": "acme-ca",
+      "scope": "mesh"
+    }
+  ],
+  "serves": {
+    "acme-ca": {
+      "at": "acme-v02.api.letsencrypt.org",
+      "port": 443,
+      "path": "/directory",
+      "root": ""
+    }
+  }
+}
@@ -85,7 +85,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "movies.zurag.be",
+      "label": "movies",
      "port": 7878
    }
  },
@@ -60,7 +60,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "registry-api.novox.be",
+      "label": "registry-api",
      "port": 5000
    }
  },
@@ -73,7 +73,7 @@
      "type": "file",
      "path": "/var/lib/route-proxy/acme.env",
      "mode": "0600",
-      "content": "ACME_DIRECTORY=https://${bound:acme-ca:at}:${bound:acme-ca:port}/acme/acme/directory\n"
+      "content": "ACME_DIRECTORY=https://${bound:acme-ca:at}:${bound:acme-ca:port}${bound:acme-ca:path}\n"
    },
    {
      "id": "server",
@@ -105,7 +105,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "searxng.zurag.be",
+      "label": "searxng",
      "port": 8080
    }
  },
@@ -90,7 +90,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "series.zurag.be",
+      "label": "series",
      "port": 8989
    }
  },
@@ -11,7 +11,10 @@
    }
  ],
  "serves": {
-    "acme-ca": {}
+    "acme-ca": {
+      "path": "/acme/acme/directory",
+      "root": ""
+    }
  },
  "listens": [
    {
@@ -23,7 +26,9 @@
  ],
  "own-secrets": {
    "password": "/var/lib/mesh/step-ca/password",
-    "root-key": "/var/lib/mesh/step-ca/root-key"
+    "root-cert": "/var/lib/mesh/step-ca/root-cert",
+    "root-key": "/var/lib/mesh/step-ca/root-key",
+    "root-key-password": "/var/lib/mesh/step-ca/root-key-password"
  },
  "resources": [
    {
@@ -67,11 +72,16 @@
        "DOCKER_STEPCA_INIT_NAME": "Mesh Internal CA",
        "DOCKER_STEPCA_INIT_DNS_NAMES": "localhost,127.0.0.1",
        "DOCKER_STEPCA_INIT_ACME": "true",
-        "DOCKER_STEPCA_INIT_REMOTE_MANAGEMENT": "false"
+        "DOCKER_STEPCA_INIT_REMOTE_MANAGEMENT": "false",
+        "DOCKER_STEPCA_INIT_ROOT_FILE": "/run/secrets/root_ca.crt",
+        "DOCKER_STEPCA_INIT_KEY_FILE": "/run/secrets/root_ca_key",
+        "DOCKER_STEPCA_INIT_KEY_PASSWORD_FILE": "/run/secrets/root_ca_key_password"
      },
      "volumes": [
        "/var/lib/step-ca:/home/step",
-        "/var/lib/mesh/step-ca/root-key:/run/secrets/root-key:ro",
+        "/var/lib/mesh/step-ca/root-cert:/run/secrets/root_ca.crt:ro",
+        "/var/lib/mesh/step-ca/root-key:/run/secrets/root_ca_key:ro",
+        "/var/lib/mesh/step-ca/root-key-password:/run/secrets/root_ca_key_password:ro",
        "/var/lib/mesh/step-ca/config.json:/run/config/config.json:ro"
      ]
    }
@@ -84,7 +84,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "tautulli.zurag.be",
+      "label": "tautulli",
      "port": 8181
    }
  },
@@ -13,7 +13,7 @@
      "name": "umami"
    },
    "route": {
-      "name": "umami.novox.be",
+      "label": "umami",
      "port": 3000
    }
  },
@@ -92,7 +92,7 @@
  ],
  "contributes": {
    "route": {
-      "name": "npm.novox.be",
+      "label": "npm",
      "port": 4873
    }
  },