summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <makefu@nixos.dev>2016-05-02 16:02:15 +0200
committermakefu <makefu@nixos.dev>2016-05-02 16:02:15 +0200
commit3f77b6c89f4a3a28d62e9117712481489ac56fa1 (patch)
treec3d0a1bd054d389ca486d33ecfff0e6f4edb1093 /makefu
parentc606288fbd405cd76b20479957bdf84cc93d71e2 (diff)
ma 1 vbob: cleanup
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/vbob.nix26
1 files changed, 16 insertions, 10 deletions
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" ];
};
}