diff options
| author | lassulus <lass@aidsballs.de> | 2015-10-18 04:27:24 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-10-18 04:27:24 +0200 |
| commit | 5f67567d8527db8a83944fcda230394ce741baf0 (patch) | |
| tree | 1702b062a349b29a046dae192cc05ce84c9ae947 /krebs/3modules | |
| parent | 2e4573d2dd9f69da1dbd40c41ee70615171abebe (diff) | |
| parent | fa8abf4a270596ec418f923216c57c95c50cf7c8 (diff) | |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 5 | ||||
| -rw-r--r-- | krebs/3modules/tv/default.nix | 25 |
2 files changed, 21 insertions, 9 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index b958514cc..4628b2acc 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -129,12 +129,9 @@ with import ../../4lib { inherit lib; }; euer IN MX 1 aspmx.l.google.com. io IN NS pigstarter.krebsco.de. pigstarter IN A ${head nets.internet.addrs4} - conf IN A ${head nets.internet.addrs4} gold IN A ${head nets.internet.addrs4} - graph IN A ${head nets.internet.addrs4} tinc IN A ${head nets.internet.addrs4} - boot IN A ${head nets.internet.addrs4} - mx42 IN A ${head nets.internet.addrs4}''; + boot IN A ${head nets.internet.addrs4}''; }; nets = { internet = { diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 49204c74f..f5ec854c9 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -11,19 +11,24 @@ with import ../../4lib { inherit lib; }; cores = 2; dc = "tv"; #dc = "cac"; extraZones = { + # TODO generate krebsco.de zone from nets and don't use extraZones at all "krebsco.de" = '' - mx23 IN A ${elemAt nets.internet.addrs4 0} - cd IN A ${elemAt nets.internet.addrs4 0} - krebsco.de. IN MX 5 mx23''; + krebsco.de. 60 IN MX 5 mx23 + mx23 60 IN A ${elemAt nets.internet.addrs4 0} + cd 60 IN A ${elemAt nets.internet.addrs4 0} + cgit 60 IN A ${elemAt nets.internet.addrs4 0} + cgit.cd 60 IN A ${elemAt nets.internet.addrs4 0} + ''; }; nets = rec { internet = { addrs4 = ["162.219.7.216"]; aliases = [ "cd.internet" + "cd.krebsco.de" + "cgit.cd.krebsco.de" "cd.viljetic.de" "cgit.cd.viljetic.de" - "cd.krebsco.de" ]; ssh.port = 11423; }; @@ -88,10 +93,20 @@ with import ../../4lib { inherit lib; }; ssh.privkey.path = <secrets/ssh.id_ed25519>; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICuShEqU0Cdm7KCaMD5x1D6mgj+cr7qoqbzFJDKoBbbw"; }; - ire = { + ire = rec { + extraZones = { + # TODO generate krebsco.de zone from nets and don't use extraZones at all + "krebsco.de" = '' + ire 60 IN A ${elemAt nets.internet.addrs4 0} + ''; + }; nets = { internet = { addrs4 = ["198.147.22.115"]; + aliases = [ + "ire.internet" + "ire.krebsco.de" + ]; ssh.port = 11423; }; retiolum = { |