makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

configure graphs for wry

Browse source
This commit is contained in:
makefu 2015-10-04 18:55:53 +02:00
parent fad02c8d24
commit 1140a16ba6
2 changed files with 12 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

@ -169,6 +169,7 @@ with import ../../4lib { inherit lib; };
extraZones = { extraZones = {
"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}
''; '';
}; };
nets = rec { nets = rec {
@ -183,6 +184,7 @@ with import ../../4lib { inherit lib; };
addrs4 = ["10.243.29.169"]; addrs4 = ["10.243.29.169"];
addrs6 = ["42:6e1e:cc8a:7cef:827:f938:8c64:baad"]; addrs6 = ["42:6e1e:cc8a:7cef:827:f938:8c64:baad"];
aliases = [ aliases = [
"graphs.wry.retiolum"
"wry.retiolum" "wry.retiolum"
]; ];
tinc.pubkey = '' tinc.pubkey = ''

12
makefu/1systems/wry.nix
View file

@ -9,9 +9,8 @@ in {
../2configs/base.nix ../2configs/base.nix
../2configs/base-sources.nix ../2configs/base-sources.nix
../2configs/tinc-basic-retiolum.nix ../2configs/tinc-basic-retiolum.nix
{
}
]; ];
networking.firewall.allowPing = true; networking.firewall.allowPing = true;
networking.interfaces.enp2s1.ip4 = [ networking.interfaces.enp2s1.ip4 = [
{ {
@ -29,6 +28,15 @@ 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;
makefu.tinc_graphs.enable = true;
makefu.tinc_graphs.krebsNginx = {
enable = true;
hostnames_complete = [ "graphs.wry" "graphs.wry.retiolum" ];
# TODO: remove hard-coded path
hostnames_anonymous = [ "graphs.krebsco.de" ];
};
networking.firewall.allowedTCPPorts = [80];
krebs.build = { krebs.build = {
user = config.krebs.users.makefu; user = config.krebs.users.makefu;