diff options
| author | makefu <github@syntax-fehler.de> | 2016-01-18 17:23:54 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-01-18 17:23:54 +0100 |
| commit | 043047d7e651dba88a6b355df7f931bcc89047ec (patch) | |
| tree | 4cffb5322abbae410f507ba7131d52b349cfbb31 /makefu/1systems/vbob.nix | |
| parent | 7cf54a1d791fff716968a145feb55f28b84aef76 (diff) | |
| parent | a3d2a86e38c4c9cf710be041e94791f046493f01 (diff) | |
Merge remote-tracking branch 'gum/fix-cert' into fix-cert
Diffstat (limited to 'makefu/1systems/vbob.nix')
| -rw-r--r-- | makefu/1systems/vbob.nix | 19 |
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 = [ |