diff options
author | tv <tv@shackspace.de> | 2015-10-04 22:28:27 +0200 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-10-04 22:28:27 +0200 |
commit | 04c0f3935b257ab3cd396a5274f691e982c8dba3 (patch) | |
tree | 6dc76859ba10e4a231b34d14b0ed39cb23585073 /makefu/1systems/wry.nix | |
parent | 41df3589f6f3aab31443a486a9d7e82f4e9ff559 (diff) | |
parent | b5977c92b3c3daa8023f4df1070a240617125019 (diff) |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu/1systems/wry.nix')
-rw-r--r-- | makefu/1systems/wry.nix | 12 |
1 files changed, 10 insertions, 2 deletions
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; |