lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

secretsmgr: add bare hostnames everywhere

Browse source
This commit is contained in:
Luke Granger-Brown 2023-05-26 17:39:01 +01:00
parent bcb9683aed
commit 86f193d44a
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go/secretsmgr/secretsmgr.go
View file

@ -58,7 +58,7 @@ func hostname() string {
} }
func defaultPrincipals(hostname string) 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) { func sshHostKeyPaths(ctx context.Context) ([]string, error) {

1
ops/nixos/lib/secretsmgr.nix
View file

@ -68,6 +68,7 @@ in
sshCertificates.principals = mkOption { sshCertificates.principals = mkOption {
type = with types; listOf str; type = with types; listOf str;
default = let inherit (config.networking) hostName; in [ default = let inherit (config.networking) hostName; in [
"${hostName}"
"${hostName}.as205479.net" "${hostName}.as205479.net"
"${hostName}.int.as205479.net" "${hostName}.int.as205479.net"
"${hostName}.otter-acoustic.ts.net" "${hostName}.otter-acoustic.ts.net"

1
ops/vault/cfg/servers.nix
View file

@ -43,6 +43,7 @@ let
hostnames = mkOption { hostnames = mkOption {
type = with types; listOf str; type = with types; listOf str;
default = [ default = [
"${name}"
"${name}.as205479.net" "${name}.as205479.net"
"${name}.blade.as205479.net" "${name}.blade.as205479.net"
"${name}.int.as205479.net" "${name}.int.as205479.net"