From 3f77b6c89f4a3a28d62e9117712481489ac56fa1 Mon Sep 17 00:00:00 2001
From: makefu <makefu@nixos.dev>
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')

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