makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

ma 1 vbob: remove unstable

Browse source
This commit is contained in:
makefu 2016-01-18 12:54:03 +01:00 committed by makefu
parent 0c290c98f0
commit fbe826ba2a
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
makefu/1systems/vbob.nix
View file

@ -2,9 +2,7 @@
# #
# #
{ lib, 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.host = config.krebs.hosts.vbob;
krebs.build.target = "root@10.10.10.220"; krebs.build.target = "root@10.10.10.220";
imports = imports =
@ -15,14 +13,13 @@ in {
# environment # environment
]; ];
nixpkgs.config.allowUnfree = true;
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
tinc = pkgs.tinc_pre; tinc = pkgs.tinc_pre;
buildbot = pkgs-unst.buildbot;
buildbot-slave = pkgs-unst.buildbot-slave;
}; };
makefu.buildbot.master = { makefu.buildbot.master = {
enable = true; enable = false;
irc = { irc = {
enable = true; enable = true;
server = "cd.retiolum"; server = "cd.retiolum";
@ -30,8 +27,9 @@ in {
allowForce = true; allowForce = true;
}; };
}; };
# services.logstash.enable = true;
makefu.buildbot.slave = { makefu.buildbot.slave = {
enable = true; enable = false;
masterhost = "localhost"; masterhost = "localhost";
username = "testslave"; username = "testslave";
password = "krebspass"; password = "krebspass";
@ -41,8 +39,8 @@ in {
krebs.build.source.git.nixpkgs = { krebs.build.source.git.nixpkgs = {
#url = https://github.com/nixos/nixpkgs; #url = https://github.com/nixos/nixpkgs;
# HTTP Everywhere # HTTP Everywhere + libredir
rev = "a3974e"; rev = "8239ac6";
}; };
fileSystems."/nix" = { fileSystems."/nix" = {
device ="/dev/disk/by-label/nixstore"; device ="/dev/disk/by-label/nixstore";
@ -56,9 +54,12 @@ in {
}; };
}; };
environment.systemPackages = with pkgs;[ environment.systemPackages = with pkgs;[
fortclientsslvpn
buildbot buildbot
buildbot-slave buildbot-slave
get get
genid
logstash
]; ];
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [