diff options
author | lassulus <lass@aidsballs.de> | 2016-11-10 23:18:17 +0100 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2016-11-10 23:18:17 +0100 |
commit | 40befd5a36bfbe61748568491040d2741a687a6a (patch) | |
tree | c3984726d4cfac2459c1548b56f7a264015fc1c2 /krebs/3modules | |
parent | 06d8bf1476d7ac0d6aadc146f2c5eb44829fa1b1 (diff) | |
parent | 2adac450ac1f613acd81069895448623a4c8937b (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/3modules')
-rw-r--r-- | krebs/3modules/os-release.nix | 2 | ||||
-rw-r--r-- | krebs/3modules/tv/default.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/krebs/3modules/os-release.nix b/krebs/3modules/os-release.nix index 50cf72ef9..0779feede 100644 --- a/krebs/3modules/os-release.nix +++ b/krebs/3modules/os-release.nix @@ -13,7 +13,7 @@ let version-id = "${stockholm-version-id}/${nixos-version-id}"; pretty-name = "${stockholm-pretty-name} / ${nixos-pretty-name}"; - home-url = http://cgit.cd.krebsco.de/stockholm; + home-url = http://cgit.ni.krebsco.de/stockholm; in { # http://0pointer.de/public/systemd-man/os-release.html diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index eaec64d50..ca8e577d8 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -222,12 +222,14 @@ with import <stockholm/lib>; extraZones = { "krebsco.de" = '' ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} + cgit.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} ''; }; nets = { internet = { ip4.addr = "188.68.36.196"; aliases = [ + "cgit.ni.i" "ni.i" ]; ssh.port = 11423; |