secretsmgr: add bare hostnames everywhere

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) {

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"

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"