From 6f4bc4b34c3cbac56f6a23740dca566980823990 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 10 Apr 2016 23:24:15 +0200 Subject: makefu: init taskserver, keep an eye on https://github.com/NixOS/nixpkgs/pull/14476 --- makefu/1systems/gum.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'makefu/1systems') diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 71042165..96a5f485 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -41,6 +41,8 @@ in { ]; }; + makefu.taskserver.enable = true; + krebs.nginx.servers.cgit = { server-names = [ "cgit.euer.krebsco.de" ]; listen = [ "${external-ip}:80" "${internal-ip}:80" ]; @@ -86,6 +88,8 @@ in { 21032 # tinc-retiolum 21031 + # taskserver + 53589 ]; allowedUDPPorts = [ # tinc -- cgit v1.2.3 From 00c9e4278b948fef73d32e572fa9d81e3518173c Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 16 Apr 2016 20:56:21 +0200 Subject: ma 1 vbob: remove proxies --- makefu/1systems/vbob.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index 5e2382f3..ce866cc4 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -1,6 +1,3 @@ -# -# -# { lib, config, pkgs, ... }: { krebs.build.host = config.krebs.hosts.vbob; @@ -42,18 +39,17 @@ krebs.retiolum = { enable = true; - extraConfig = "Proxy = http global.proxy.alcatel-lucent.com 8000"; + #extraConfig = "Proxy = http global.proxy.alcatel-lucent.com 8000"; connectTo = [ "gum" ]; }; - networking.proxy.default = "http://global.proxy.alcatel-lucent.com:8000"; + #networking.proxy.default = "http://global.proxy.alcatel-lucent.com:8000"; fileSystems."/media/share" = { fsType = "vboxsf"; device = "share"; - options = "rw,uid=9001,gid=9001"; + options = [ "rw" "uid=9001" "gid=9001" ]; }; } - -- cgit v1.2.3 From bdce2137e713944e77b3e35f758c757a43a99d3e Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 17 Apr 2016 02:03:15 +0200 Subject: ma awesome: refactor into module --- makefu/1systems/vbob.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'makefu/1systems') diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index ce866cc4..36ae88d2 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, ... }: { krebs.build.host = config.krebs.hosts.vbob; + makefu.awesome.modkey = "Mod1"; imports = [ # Include the results of the hardware scan. ../. -- cgit v1.2.3 From 3f77b6c89f4a3a28d62e9117712481489ac56fa1 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 2 May 2016 16:02:15 +0200 Subject: ma 1 vbob: cleanup --- makefu/1systems/vbob.nix | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index 748b08ef..1fccbc1e 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -15,15 +15,14 @@ ]; nixpkgs.config.allowUnfree = true; - krebs.build.source.upstream-nixpkgs = { - url = https://github.com/makefu/nixpkgs; - # HTTP Everywhere + libredir - rev = "8239ac6"; - }; fileSystems."/nix" = { device ="/dev/disk/by-label/nixstore"; fsType = "ext4"; }; + fileSystems."/var/lib/docker" = { + device ="/dev/disk/by-label/nix-docker"; + fsType = "ext4"; + }; #makefu.buildbot.master.enable = true; # allow vbob to deploy self users.extraUsers = { @@ -33,11 +32,14 @@ }; environment.systemPackages = with pkgs;[ fortclientsslvpn - buildbot - buildbot-slave get logstash + docker + devpi-web + devpi-client ]; + # virtualisation.docker.enable = true; + networking.firewall.allowedTCPPorts = [ 25 @@ -47,17 +49,21 @@ krebs.retiolum = { enable = true; - extraConfig = "Proxy = http global.proxy.alcatel-lucent.com 8000"; connectTo = [ + "omo" "gum" ]; }; - networking.proxy.default = "http://global.proxy.alcatel-lucent.com:8000"; + networking.extraHosts = '' + 172.17.20.190 gitlab + 172.17.62.27 svbittool01 tool + ''; + fileSystems."/media/share" = { fsType = "vboxsf"; device = "share"; - options = "rw,uid=9001,gid=9001"; + options = [ "rw" "uid=9001" "gid=9001" ]; }; } -- cgit v1.2.3 From 8d5e5dad8a72993ab5e1da98ac43feb9e9bda44a Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 2 Jun 2016 14:44:11 +0200 Subject: ma 1 pornocauster: cleanup --- makefu/1systems/pornocauster.nix | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 88c18775..fa39b121 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -26,6 +26,7 @@ # services ../2configs/git/brain-retiolum.nix ../2configs/tor.nix + ../2configs/steam.nix # ../2configs/buildbot-standalone.nix # hardware specifics are in here @@ -35,23 +36,36 @@ # ../2configs/mediawiki.nix #../2configs/wordpress.nix ../2configs/nginx/public_html.nix + + # temporary modules + # ../2configs/temp/share-samba.nix + # ../2configs/temp/elkstack.nix + # ../2configs/temp/sabnzbd.nix ]; + krebs.nginx = { default404 = false; servers.default.listen = [ "80 default_server" ]; servers.default.server-names = [ "_" ]; }; - krebs.retiolum.enable = true; - # steam - hardware.opengl.driSupport32Bit = true; - hardware.pulseaudio.support32Bit = true; + + environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ]; + + virtualisation.docker.enable = true; # configure pulseAudio to provide a HDMI sink as well networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [ - 25 - 80 - ]; + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.firewall.allowedUDPPorts = [ 665 ]; krebs.build.host = config.krebs.hosts.pornocauster; + + krebs.hosts.omo.nets.retiolum.via.ip4.addr = "192.168.1.11"; + krebs.retiolum = { + enable = true; + connectTo = [ "omo" "gum" "prism" ]; + }; + networking.extraHosts = '' + 192.168.1.11 omo.local + ''; } -- cgit v1.2.3