From c606288fbd405cd76b20479957bdf84cc93d71e2 Mon Sep 17 00:00:00 2001
From: makefu <makefu@nixos.dev>
Date: Mon, 2 May 2016 16:00:39 +0200
Subject: ma 5 devpi: init

---
 makefu/5pkgs/default.nix       |  1 +
 makefu/5pkgs/devpi/default.nix | 70 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 makefu/5pkgs/devpi/default.nix

(limited to 'makefu')

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 8caab433e..d09d4a6e8 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -12,5 +12,6 @@ in
     nodemcu-uploader = callPackage ./nodemcu-uploader {};
     mycube-flask = callPackage ./mycube-flask {};
     tw-upload-plugin = callPackage ./tw-upload-plugin {};
+    inherit (callPackage ./devpi {}) devpi-web devpi-server;
   };
 }
diff --git a/makefu/5pkgs/devpi/default.nix b/makefu/5pkgs/devpi/default.nix
new file mode 100644
index 000000000..0df8ecd2c
--- /dev/null
+++ b/makefu/5pkgs/devpi/default.nix
@@ -0,0 +1,70 @@
+{ pkgs ? import <nixpkgs> {} }:
+with pkgs.stdenv.lib;
+let
+  execnet14 = pkgs.python3Packages.buildPythonPackage rec {
+    name = "execnet-1.4.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/e/execnet/${name}.tar.gz";
+      sha256 = "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn";
+    };
+
+    propagatedBuildInputs = with pkgs.python3Packages;
+      [ setuptools_scm apipkg ];
+    meta = {
+      description = "rapid multi-Python deployment";
+      license = licenses.gpl2;
+    };
+  };
+
+  devpi-web = pkgs.python3Packages.buildPythonPackage rec {
+    name = "devpi-web";
+    version = "3.0.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/devpi-web/devpi-web-${version}.tar.gz";
+      sha256 = "156abxyhj17a8cg38hpyr31qkjb61mb2kggsxij4p4xvy9jwkbwi";
+    };
+
+    propagatedBuildInputs = with pkgs.python3Packages;
+      [ devpi-server pyramid_chameleon beautifulsoup4 Whoosh defusedxml ];
+
+    meta = {
+      homepage = https://bitbucket.org/hpk42/devpi;
+      description = "a web view for devpi-server";
+      license = licenses.mit;
+      maintainers = with maintainers; [ makefu ];
+    };
+  };
+  devpi-server = pkgs.python3Packages.buildPythonPackage rec {
+    name = "devpi-server";
+    version = "3.0.2";
+
+    # original postFixup adds "import sys; sys.argv[0] = 'devpi-server'" to
+    # `.devpi-server-wrapped` which
+    # results in "not existing devpi-server: 'devpi-server'"
+    postFixup = "";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/devpi-server/devpi-server-${version}.tar.gz";
+      sha256 = "14r1024i3x2pb72khyzvi56sh9smpdswmrbc88xvjxnalmzfn99d";
+    };
+
+    propagatedBuildInputs = with pkgs.python3Packages;
+      [ devpi-common execnet14 itsdangerous pluggy waitress pyramid ];
+    buildInputs = with pkgs.python3Packages; [ pytest beautifulsoup4 webtest ];
+
+    meta = {
+      homepage = https://bitbucket.org/hpk42/devpi;
+      description = "Devpi Server";
+      license = licenses.mit;
+      maintainers = with maintainers; [ makefu ];
+    };
+  };
+
+in {
+  inherit devpi-server;
+  devpi-web =  pkgs.python3.buildEnv.override {
+      extraLibs = [ devpi-web devpi-server ];
+    };
+}
-- 
cgit v1.2.3


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 748b08ef1..1fccbc1e1 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