diff options
author | jeschli <jeschli@gmail.com> | 2018-01-16 19:15:31 +0100 |
---|---|---|
committer | jeschli <jeschli@gmail.com> | 2018-01-16 19:15:31 +0100 |
commit | 595b5de0bd57e3f9567ff8554fd49e43b3d9c7b1 (patch) | |
tree | eb273130855884aaa5cc28bba0b70b9e2dc7540d /krebs | |
parent | 05b3e4b0cb4e83dcc84939919ca0a83e694606bf (diff) | |
parent | 74d1531be988057ccadd3de5184d915dcf84c92d (diff) |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'krebs')
-rw-r--r-- | krebs/2configs/repo-sync.nix | 2 | ||||
-rw-r--r-- | krebs/3modules/lass/default.nix | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix index 84b7d9c0e..48da88a8d 100644 --- a/krebs/2configs/repo-sync.nix +++ b/krebs/2configs/repo-sync.nix @@ -58,7 +58,7 @@ let ref = "heads/master"; }; }; - krebs.git = defineRepo name true; + krebs.git = defineRepo name false; }; in { diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 0567d58ba..37bb31563 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -3,6 +3,9 @@ with import <stockholm/lib>; { + dns.providers = { + "lassul.us" = "zones"; + }; hosts = mapAttrs (_: recursiveUpdate { owner = config.krebs.users.lass; ci = true; @@ -80,6 +83,18 @@ with import <stockholm/lib>; prism IN A ${nets.internet.ip4.addr} paste IN A ${nets.internet.ip4.addr} ''; + "lassul.us" = '' + $TTL 3600 + @ IN SOA dns16.ovh.net. tech.ovh.net. (2017093001 86400 3600 3600000 300) + 60 IN NS ns16.ovh.net. + 60 IN NS dns16.ovh.net. + 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr} + 60 IN TXT v=spf1 mx -all + cgit 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr} + io 60 IN NS ions.lassul.us. + ions 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr} + paste 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr} + ''; }; nets = rec { internet = { |