From f42d23f69bb84186b5218cfa49e1321a80acc293 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 17 Jan 2016 00:40:06 +0100
Subject: ma 2 smart-monitor: disable autodetection

---
 makefu/1systems/gum.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index 1907424ec..ac7524506 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -21,7 +21,7 @@ in {
 
   ];
 
-
+  services.smartd.devices = [ { device = "/dev/sda";} ];
   nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
 
   ###### stable
@@ -32,6 +32,9 @@ in {
     ListenAddress = ${external-ip} 655
     ListenAddress = ${external-ip} 21031
   '';
+  krebs.nginx.servers.cgit.server-names = [
+    "cgit.euer.krebsco.de"
+  ];
 
   # Chat
   environment.systemPackages = with pkgs;[
-- 
cgit v1.2.3


From 908149206b4680c951487d9ddded6636b35cd4d9 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 17 Jan 2016 00:40:26 +0100
Subject: ma 1 omo: bump to unstable@2016-01-13

---
 makefu/1systems/omo.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index e11665fbc..552af4e4f 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -33,6 +33,7 @@ in {
     ];
   # services.openssh.allowSFTP = false;
   krebs.build.host = config.krebs.hosts.omo;
+  krebs.build.source.git.nixpkgs.rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce";
 
   # copy config from <secrets/sabnzbd.ini> to /var/lib/sabnzbd/
   services.sabnzbd.enable = true;
-- 
cgit v1.2.3


From 0fe61d5d41aae9febdcf9dd507c67819868c8d32 Mon Sep 17 00:00:00 2001
From: makefu <makefu@nixos.dev>
Date: Mon, 18 Jan 2016 12:54:03 +0100
Subject: ma 1 vbob: remove unstable

---
 makefu/1systems/vbob.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'makefu/1systems')

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 = [
-- 
cgit v1.2.3