diff options
| author | tv <tv@shackspace.de> | 2015-10-09 14:48:58 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-10-09 14:48:58 +0200 |
| commit | 96f4248b65ff1539eded24572ae1805b27c53d50 (patch) | |
| tree | 31ff450cc4a5166306c62f99fdd2d1caf3219ecb /makefu/1systems | |
| parent | 694c79a5bc05014604fa2467f965b370102ff78f (diff) | |
| parent | 4072a32f89b9cc1c1e7c3583ac5b9ce5dcb004af (diff) | |
Merge remote-tracking branch 'cloudkrebs/master'
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/pnp.nix | 4 | ||||
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/wry.nix | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 7698ea14d..e7ceca60d 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -23,7 +23,9 @@ ## \/ are only plugins, must enable Reaktor explicitly ../2configs/Reaktor/stockholmLentil.nix ../2configs/Reaktor/simpleExtend.nix + ../2configs/Reaktor/random-emoji.nix ../2configs/Reaktor/titlebot.nix + ../2configs/Reaktor/shack-correct.nix ../2configs/exim-retiolum.nix ../2configs/urlwatch.nix @@ -34,7 +36,7 @@ krebs.Reaktor.debug = true; krebs.Reaktor.nickname = "Reaktor|bot"; krebs.Reaktor.extraEnviron = { - REAKTOR_CHANNELS = "#krebs,#binaergewitter"; + REAKTOR_CHANNELS = "#krebs,#binaergewitter,#shackspace"; }; krebs.build.host = config.krebs.hosts.pnp; 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]; |