From 86f193d44a7372dea4d1871638a627e4f3f51128 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Fri, 26 May 2023 17:39:01 +0100
Subject: [PATCH] secretsmgr: add bare hostnames everywhere

---
 go/secretsmgr/secretsmgr.go  | 2 +-
 ops/nixos/lib/secretsmgr.nix | 1 +
 ops/vault/cfg/servers.nix    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/go/secretsmgr/secretsmgr.go b/go/secretsmgr/secretsmgr.go
index 298044702a..83c324c1dc 100644
--- a/go/secretsmgr/secretsmgr.go
+++ b/go/secretsmgr/secretsmgr.go
@@ -58,7 +58,7 @@ func hostname() string {
 }
 
 func defaultPrincipals(hostname string) string {
-	return fmt.Sprintf("%s,%s.as205479.net,%s.int.as205479.net", hostname, hostname, hostname)
+	return fmt.Sprintf("%s,%s.as205479.net,%s.int.as205479.net,%s.otter-acoustic.ts.net", hostname, hostname, hostname, hostname)
 }
 
 func sshHostKeyPaths(ctx context.Context) ([]string, error) {
diff --git a/ops/nixos/lib/secretsmgr.nix b/ops/nixos/lib/secretsmgr.nix
index 9818f89a1e..080889dccd 100644
--- a/ops/nixos/lib/secretsmgr.nix
+++ b/ops/nixos/lib/secretsmgr.nix
@@ -68,6 +68,7 @@ in
     sshCertificates.principals = mkOption {
       type = with types; listOf str;
       default = let inherit (config.networking) hostName; in [
+        "${hostName}"
         "${hostName}.as205479.net"
         "${hostName}.int.as205479.net"
         "${hostName}.otter-acoustic.ts.net"
diff --git a/ops/vault/cfg/servers.nix b/ops/vault/cfg/servers.nix
index 82e07bf3d7..eccc2642a3 100644
--- a/ops/vault/cfg/servers.nix
+++ b/ops/vault/cfg/servers.nix
@@ -43,6 +43,7 @@ let
       hostnames = mkOption {
         type = with types; listOf str;
         default = [
+          "${name}"
           "${name}.as205479.net"
           "${name}.blade.as205479.net"
           "${name}.int.as205479.net"