summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <makefu@nixos.dev>2016-01-18 12:54:03 +0100
committermakefu <github@syntax-fehler.de>2016-01-19 20:47:21 +0100
commitfbe826ba2ae916b8f8fab1293e302e22a5d0b579 (patch)
tree7851863601039020c332f45b0e39a4991bbc21cb /makefu
parent0c290c98f00b11c8239fea6450667323137c6321 (diff)
ma 1 vbob: remove unstable
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/vbob.nix19
1 files changed, 10 insertions, 9 deletions
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index b8c02cb67..d95362919 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -2,9 +2,7 @@
#
#
{ 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 =
@@ -15,14 +13,13 @@ in {
# environment
];
+ nixpkgs.config.allowUnfree = true;
nixpkgs.config.packageOverrides = pkgs: {
tinc = pkgs.tinc_pre;
- buildbot = pkgs-unst.buildbot;
- buildbot-slave = pkgs-unst.buildbot-slave;
};
makefu.buildbot.master = {
- enable = true;
+ enable = false;
irc = {
enable = true;
server = "cd.retiolum";
@@ -30,8 +27,9 @@ in {
allowForce = true;
};
};
+ # services.logstash.enable = true;
makefu.buildbot.slave = {
- enable = true;
+ enable = false;
masterhost = "localhost";
username = "testslave";
password = "krebspass";
@@ -41,8 +39,8 @@ in {
krebs.build.source.git.nixpkgs = {
#url = https://github.com/nixos/nixpkgs;
- # HTTP Everywhere
- rev = "a3974e";
+ # HTTP Everywhere + libredir
+ rev = "8239ac6";
};
fileSystems."/nix" = {
device ="/dev/disk/by-label/nixstore";
@@ -56,9 +54,12 @@ in {
};
};
environment.systemPackages = with pkgs;[
+ fortclientsslvpn
buildbot
buildbot-slave
get
+ genid
+ logstash
];
networking.firewall.allowedTCPPorts = [