summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/vbob.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-12-16 15:46:23 +0100
committerlassulus <lass@aidsballs.de>2015-12-16 15:46:23 +0100
commit07f4510ad0bff0f9d72e5dcee279a30a0d5f8da3 (patch)
tree5848f7727500895df71a523a3405087448ba9e4a /makefu/1systems/vbob.nix
parentd94784efbecbd437ec6268bb9bfca57a8088d6e8 (diff)
parent8f18b00ab141df92b7df4725a18bb3283b184d76 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/vbob.nix')
-rw-r--r--makefu/1systems/vbob.nix57
1 files changed, 49 insertions, 8 deletions
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index 4d8e8ced1..5b03d40a8 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -1,9 +1,10 @@
#
#
#
-{ config, pkgs, ... }:
-
-{
+{ lib, config, pkgs, ... }:
+let
+ pkgs-unst = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {};
+in {
krebs.build.host = config.krebs.hosts.vbob;
krebs.build.target = "root@10.10.10.220";
imports =
@@ -12,13 +13,52 @@
../2configs/main-laptop.nix #< base-gui
# environment
- ../2configs/zsh-user.nix
- ../2configs/virtualization.nix
+
];
- nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
+ nixpkgs.config.packageOverrides = pkgs: {
+ tinc = pkgs.tinc_pre;
+ buildbot = pkgs-unst.buildbot;
+ buildbot-slave = pkgs-unst.buildbot-slave;
+ };
+
+ makefu.buildbot.master = {
+ enable = true;
+ irc = {
+ enable = true;
+ server = "cd.retiolum";
+ channel = "retiolum";
+ allowForce = true;
+ };
+ };
+ makefu.buildbot.slave = {
+ enable = true;
+ masterhost = "localhost";
+ username = "testslave";
+ password = "krebspass";
+ };
+
+ krebs.build.source.git.nixpkgs = {
+ #url = https://github.com/nixos/nixpkgs;
+ # HTTP Everywhere
+ rev = "a3974e";
+ };
+ fileSystems."/nix" = {
+ device ="/dev/disk/by-label/nixstore";
+ fsType = "ext4";
+ };
+ #makefu.buildbot.master.enable = true;
+ # allow vbob to deploy self
+ users.extraUsers = {
+ root = {
+ openssh.authorizedKeys.keys = [ config.krebs.users.makefu-vbob.pubkey ];
+ };
+ };
environment.systemPackages = with pkgs;[
+ buildbot
+ buildbot-slave
get
- ];
+ genid
+ ];
networking.firewall.allowedTCPPorts = [
25
@@ -32,8 +72,8 @@
connectTo = [
"gum"
];
-
};
+
networking.proxy.default = "http://global.proxy.alcatel-lucent.com:8000";
fileSystems."/media/share" = {
fsType = "vboxsf";
@@ -42,3 +82,4 @@
};
}
+