summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2023-01-05 15:43:04 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2023-01-05 15:43:04 +0100
commit69d539f43f6fac1b975bd64898dcf22302253ce9 (patch)
tree181e7cba3078844739976c43f988411304b1ffa0
parentc66c97110c4801844322af7cc9a28b5d4d8e17dc (diff)
downloadnixos-69d539f43f6fac1b975bd64898dcf22302253ce9.tar
nixos-69d539f43f6fac1b975bd64898dcf22302253ce9.tar.gz
nixos-69d539f43f6fac1b975bd64898dcf22302253ce9.tar.bz2
nixos-69d539f43f6fac1b975bd64898dcf22302253ce9.tar.xz
nixos-69d539f43f6fac1b975bd64898dcf22302253ce9.zip
...
-rw-r--r--accounts/gkleen@sif/ssh-hosts.nix5
-rw-r--r--hosts/surtr/email/default.nix2
2 files changed, 6 insertions, 1 deletions
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index 5957421e..0021c75e 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -463,4 +463,9 @@
463 { hostname = "cc-gpu-n02.mathinst.loc"; 463 { hostname = "cc-gpu-n02.mathinst.loc";
464 proxyJump = "cc-gpu-m01"; 464 proxyJump = "cc-gpu-m01";
465 }; 465 };
466 "gitlab.com" =
467 { hostname = "gitlab.com";
468 user = "git";
469 identityFile = "~/.ssh/gitlab.com";
470 };
466} 471}
diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index 3d0b43ee..0ee68599 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -110,7 +110,7 @@ in {
110 110
111 tls_server_sni_maps = ''texthash:${pkgs.writeText "sni" ( 111 tls_server_sni_maps = ''texthash:${pkgs.writeText "sni" (
112 concatMapStringsSep "\n\n" (domain: 112 concatMapStringsSep "\n\n" (domain:
113 concatMapStringsSep "\n" (subdomain: "${subdomain} /run/credentials/postfix.service/${subdomain}.full.pem") 113 concatMapStringsSep "\n" (subdomain: "${subdomain} /run/credentials/postfix.service/${removePrefix "." subdomain}.full.pem")
114 [domain "mailin.${domain}" "mailsub.${domain}" ".${domain}"] 114 [domain "mailin.${domain}" "mailsub.${domain}" ".${domain}"]
115 ) emailDomains 115 ) emailDomains
116 )}''; 116 )}'';