Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of gum.krebsco.de:stockholm

Browse Source
This commit is contained in:
makefu 2016-05-02 17:40:59 +02:00
commit 89ad52088d
3 changed files with 86 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
makefu/1systems/vbob.nix
View File

@ -17,6 +17,10 @@
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 = {
@ -26,11 +30,14 @@
};
environment.systemPackages = with pkgs;[
fortclientsslvpn
buildbot
buildbot-slave
get
logstash
docker
devpi-web
devpi-client
];
# virtualisation.docker.enable = true;
networking.firewall.allowedTCPPorts = [
25
@ -40,13 +47,17 @@
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";

1
makefu/5pkgs/default.nix
View File

@ -12,6 +12,7 @@ in
mycube-flask = callPackage ./mycube-flask {};
nodemcu-uploader = callPackage ./nodemcu-uploader {};
tw-upload-plugin = callPackage ./tw-upload-plugin {};
inherit (callPackage ./devpi {}) devpi-web devpi-server;
taskserver = callPackage ./taskserver {};
};
}

70
makefu/5pkgs/devpi/default.nix Normal file
View File

@ -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 ];
};
}