diff options
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/wry.nix | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 9311be59d..b958514cc 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -169,6 +169,7 @@ with import ../../4lib { inherit lib; }; extraZones = { "krebsco.de" = '' wry IN A ${head nets.internet.addrs4} + graphs IN A ${head nets.internet.addrs4} ''; }; nets = rec { @@ -183,6 +184,7 @@ with import ../../4lib { inherit lib; }; addrs4 = ["10.243.29.169"]; addrs6 = ["42:6e1e:cc8a:7cef:827:f938:8c64:baad"]; aliases = [ + "graphs.wry.retiolum" "wry.retiolum" ]; tinc.pubkey = '' diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix index b4cdab7cf..9368f1ae5 100644 --- a/makefu/1systems/wry.nix +++ b/makefu/1systems/wry.nix @@ -9,9 +9,8 @@ in { ../2configs/base.nix ../2configs/base-sources.nix ../2configs/tinc-basic-retiolum.nix - { - } ]; + networking.firewall.allowPing = true; networking.interfaces.enp2s1.ip4 = [ { @@ -29,6 +28,15 @@ in { # prepare graphs 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 = { user = config.krebs.users.makefu; |