diff options
| author | lassulus <lass@lassul.us> | 2017-06-01 12:49:36 +0200 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-06-01 12:49:36 +0200 |
| commit | e50bc4f3eb3dac13bba4ae6158e839a52455c3c3 (patch) | |
| tree | b3c1fc1f3e00312e92e4ab747c31839db665eebd /makefu/1systems/gum.nix | |
| parent | 73b073c3fe037f31e05828a1071c9b4b19f7a2ff (diff) | |
| parent | 9e04d0132133840fba14aca194f18925e3f353d5 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/gum.nix')
| -rw-r--r-- | makefu/1systems/gum.nix | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 92c446212..519313f57 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -32,7 +32,7 @@ in { ../2configs/tools/sec.nix # services - ../2configs/gum-share.nix + ../2configs/share/gum.nix ../2configs/sabnzbd.nix ../2configs/torrent.nix ../2configs/iodined.nix @@ -48,14 +48,25 @@ in { ../2configs/deployment/mycube.connector.one.nix ../2configs/deployment/graphs.nix ../2configs/deployment/owncloud.nix - ../2configs/deployment/wiki-irc.nix + ../2configs/deployment/wiki-irc-bot ../2configs/deployment/boot-euer.nix + ../2configs/deployment/hound + { + services.taskserver.enable = true; + services.taskserver.fqdn = config.krebs.build.host.name; + services.taskserver.listenHost = "::"; + services.taskserver.organisations.home.users = [ "makefu" ]; + networking.firewall.extraCommands = '' + iptables -A INPUT -i retiolum -p tcp --dport 53589 -j ACCEPT + ip6tables -A INPUT -i retiolum -p tcp --dport 53589 -j ACCEPT + ''; + } # ../2configs/ipfs.nix ../2configs/syncthing.nix # ../2configs/opentracker.nix - ../2configs/logging/central-stats-client.nix - # ../2configs/logging/central-logging-client.nix + ../2configs/stats/client.nix + # ../2configs/logging/client.nix ]; makefu.dl-dir = "/var/download"; @@ -78,7 +89,6 @@ in { ]; }; - makefu.taskserver.enable = true; # access @@ -122,6 +132,8 @@ in { 21031 # taskserver 53589 + # temp vnc + 18001 ]; allowedUDPPorts = [ # tinc |