Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m 1 wry: host is the new provider for tinc.krebsco.de

Browse Source
This commit is contained in:
makefu 2015-10-19 21:51:20 +02:00
parent 754ea55ab8
commit 858034cc61
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/makefu/default.nix
View File

@ -130,7 +130,6 @@ with import ../../4lib { inherit lib; };
io IN NS pigstarter.krebsco.de. io IN NS pigstarter.krebsco.de.
pigstarter IN A ${head nets.internet.addrs4} pigstarter IN A ${head nets.internet.addrs4}
gold IN A ${head nets.internet.addrs4} gold IN A ${head nets.internet.addrs4}
tinc IN A ${head nets.internet.addrs4}
boot IN A ${head nets.internet.addrs4}''; boot IN A ${head nets.internet.addrs4}'';
}; };
nets = { nets = {
@ -167,6 +166,7 @@ with import ../../4lib { inherit lib; };
"krebsco.de" = '' "krebsco.de" = ''
wry IN A ${head nets.internet.addrs4} wry IN A ${head nets.internet.addrs4}
graphs IN A ${head nets.internet.addrs4} graphs IN A ${head nets.internet.addrs4}
tinc IN A ${head nets.internet.addrs4}
''; '';
}; };
nets = rec { nets = rec {

6
makefu/1systems/wry.nix
View File

@ -34,15 +34,19 @@ in {
# prepare graphs # prepare graphs
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
krebs.nginx.enable = true; krebs.nginx.enable = true;
krebs.retiolum-bootstrap.enable = true;
makefu.tinc_graphs.enable = true; makefu.tinc_graphs.enable = true;
makefu.tinc_graphs.krebsNginx = { makefu.tinc_graphs.krebsNginx = {
enable = true; enable = true;
# TODO: remove hard-coded hostname # TODO: remove hard-coded hostname
hostnames_complete = [ "graphs.wry" ]; hostnames_complete = [ "graphs.wry" ];
hostnames_anonymous = [ "graphs.krebsco.de" ]; hostnames_anonymous = [ "graphs.krebsco.de" ];
}; };
networking.firewall.allowedTCPPorts = [80];
networking.firewall.allowedTCPPorts = [ 80 443 ];
krebs.build = { krebs.build = {
user = config.krebs.users.makefu; user = config.krebs.users.makefu;