diff options
| author | lassulus <lass@aidsballs.de> | 2015-10-05 12:16:05 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-10-05 12:16:05 +0200 |
| commit | 6c61ba3f9e9ed16d0814b45f53eb5be5ea218145 (patch) | |
| tree | a5d866c74076cdb849b8c2529b89e638cbae9f79 /makefu/1systems | |
| parent | 059037f5ec15754563ab1627d3056f128c986f38 (diff) | |
| parent | ab48fbd9720508520c5c3f951ed3b10bef139212 (diff) | |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/wry.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index d43f89a03..d208e5112 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -42,7 +42,7 @@ krebs.build.user = config.krebs.users.makefu; krebs.build.target = "root@pornocauster"; - + environment.systemPackages = with pkgs;[ get]; networking.firewall.allowedTCPPorts = [ 25 ]; diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix index 9368f1ae5..819a208ac 100644 --- a/makefu/1systems/wry.nix +++ b/makefu/1systems/wry.nix @@ -32,8 +32,8 @@ in { makefu.tinc_graphs.enable = true; makefu.tinc_graphs.krebsNginx = { enable = true; - hostnames_complete = [ "graphs.wry" "graphs.wry.retiolum" ]; - # TODO: remove hard-coded path + # TODO: remove hard-coded hostname + hostnames_complete = [ "graphs.wry" ]; hostnames_anonymous = [ "graphs.krebsco.de" ]; }; networking.firewall.allowedTCPPorts = [80]; |