From 8574f0f177c004031a4282d121931caab62158ad Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 3 Nov 2017 13:29:14 +0100
Subject: ma lancache-dns: add storage server names

---
 makefu/2configs/lanparty/lancache-dns.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/lanparty/lancache-dns.nix b/makefu/2configs/lanparty/lancache-dns.nix
index 4b4ebf0a0..f03fe8773 100644
--- a/makefu/2configs/lanparty/lancache-dns.nix
+++ b/makefu/2configs/lanparty/lancache-dns.nix
@@ -21,6 +21,13 @@ let
   stateDir = "/var/lib/unbound";
   user = "unbound";
   upstream-server = "8.8.8.8";
+  local_ip = "192.168.1.10";
+  extra-config = pkgs.writeText "local.conf" ''
+    server:
+    local-data: "piratebox. A ${local-ip}"
+    local-data: "store. A ${local-ip}"
+    local-data: "share. A ${local-ip}"
+  '';
 in {
   services.unbound = {
     enable = true;
@@ -29,6 +36,7 @@ in {
     forwardAddresses = [ upstream-server ];
     extraConfig = ''
       include: "${stateDir}/lancache/*.conf"
+      include: "${extra-config}"
     '';
   };
   services.dnscrypt-proxy.enable = lib.mkForce false;
@@ -42,7 +50,8 @@ in {
       path = [ pkgs.gawk pkgs.iproute pkgs.gnused ];
       script = ''
         set -xeu
-        current_ip=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}')
+        # current_ip=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}')
+        current_ip=${local_ip}
         old_ip=10.1.1.250
         mkdir -p ${stateDir}
         rm -rvf ${stateDir}/lancache
-- 
cgit v1.2.3


From a98010b11c68863feaa6ff30943ef21d39a59980 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 3 Nov 2017 14:46:31 +0100
Subject: ma lancache-dns: fix local-ip variable

---
 makefu/2configs/lanparty/lancache-dns.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/lanparty/lancache-dns.nix b/makefu/2configs/lanparty/lancache-dns.nix
index f03fe8773..5d90d1a99 100644
--- a/makefu/2configs/lanparty/lancache-dns.nix
+++ b/makefu/2configs/lanparty/lancache-dns.nix
@@ -24,9 +24,9 @@ let
   local_ip = "192.168.1.10";
   extra-config = pkgs.writeText "local.conf" ''
     server:
-    local-data: "piratebox. A ${local-ip}"
-    local-data: "store. A ${local-ip}"
-    local-data: "share. A ${local-ip}"
+    local-data: "piratebox. A ${local_ip}"
+    local-data: "store. A ${local_ip}"
+    local-data: "share. A ${local_ip}"
   '';
 in {
   services.unbound = {
-- 
cgit v1.2.3


From 328f9ffdac31e164ca34cadb5db3065ba0456686 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 3 Nov 2017 14:46:54 +0100
Subject: ma lanparty/samba: add new writeable share

---
 makefu/2configs/lanparty/samba.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/lanparty/samba.nix b/makefu/2configs/lanparty/samba.nix
index de834ab16..32a656ad7 100644
--- a/makefu/2configs/lanparty/samba.nix
+++ b/makefu/2configs/lanparty/samba.nix
@@ -10,9 +10,16 @@
   };
   services.samba = {
     enable = true;
+    enableNmbd = true;
     shares = {
-      share-home = {
+      lanparty = {
         path = "/data/lanparty/";
+        "read only" = "yes";
+        browseable = "yes";
+        "guest ok" = "yes";
+      };
+      share = {
+        path = "/data/lanparty/share";
         "read only" = "no";
         browseable = "yes";
         "guest ok" = "yes";
-- 
cgit v1.2.3


From 5a25b91d1d0b2380371ead7fee04e33bfa0814af Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 8 Nov 2017 10:47:36 +0100
Subject: ma tools: add lsof

---
 makefu/2configs/tools/core.nix | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 8a15ae2e7..eced961be 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -5,38 +5,43 @@
 #
 # essentially `nix-env -q` of the main user
 {
-  krebs.per-user.makefu.packages = with pkgs; [
+  environment.systemPackages = with pkgs; [
     at_spi2_core
     acpi
     bc
     rsync
     exif
     file
+    lsof
+    which
+
     # fs
-    ntfs3g
+    cifs-utils
     dosfstools
+    ntfs3g
+    smartmontools
+
+    # io
     pv
     sshpass
     usbutils
     p7zip
     hdparm
+
+    # net
+    wget
+    curl
     inetutils
     ncftp
-    mutt
     tcpdump
     sysstat
-    which
-    weechat
     wol
-    tmux
     iftop
+
     mkpasswd
-    # storage
-    smartmontools
-    cifs-utils
-    # net
-    wget
-    curl
+    mutt
+    weechat
+    tmux
 
     # stockholm
     git
-- 
cgit v1.2.3


From 9f8aa6abaedf8cbf3ce40548b1e52ac45c469c38 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 8 Nov 2017 10:48:14 +0100
Subject: ma lancache-dns: refactor

---
 makefu/2configs/lanparty/lancache-dns.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/lanparty/lancache-dns.nix b/makefu/2configs/lanparty/lancache-dns.nix
index 5d90d1a99..498162d13 100644
--- a/makefu/2configs/lanparty/lancache-dns.nix
+++ b/makefu/2configs/lanparty/lancache-dns.nix
@@ -1,6 +1,17 @@
 { pkgs, lib, config, ... }:
 with import <stockholm/lib>;
 let
+  upstream-server = "8.8.8.8";
+  local_ip = "192.168.10.10";
+
+  extra-config = pkgs.writeText "local.conf" ''
+    server:
+    local-data: "piratebox. A ${local_ip}"
+    local-data: "store. A ${local_ip}"
+    local-data: "share. A ${local_ip}"
+  '';
+
+
   # see https://github.com/zeropingheroes/lancache for full docs
   lancache-dns = pkgs.stdenv.mkDerivation rec {
     name = "lancache-dns-2017-06-28";
@@ -11,8 +22,9 @@ let
       rev = "420aa62";
       sha256 = "0ik7by7ripdv2avyy5kk9jp1i7rz9ksc8xmg7n9iik365q9pv94m";
     };
+
     phases = [ "unpackPhase" "installPhase" ];
-    # here we can chance to edit `includes/proxy-cache-paths.conf`
+    # here we have the chance to edit `includes/proxy-cache-paths.conf`
     installPhase = ''
       mkdir -p $out
       cp -r * $out/
@@ -20,14 +32,6 @@ let
   };
   stateDir = "/var/lib/unbound";
   user = "unbound";
-  upstream-server = "8.8.8.8";
-  local_ip = "192.168.1.10";
-  extra-config = pkgs.writeText "local.conf" ''
-    server:
-    local-data: "piratebox. A ${local_ip}"
-    local-data: "store. A ${local_ip}"
-    local-data: "share. A ${local_ip}"
-  '';
 in {
   services.unbound = {
     enable = true;
-- 
cgit v1.2.3


From 7184c979931af91187617d5b7d7c513e892b17a4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 8 Nov 2017 10:48:31 +0100
Subject: ma lancache: make statedir a variable

---
 makefu/2configs/lanparty/lancache.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/lanparty/lancache.nix b/makefu/2configs/lanparty/lancache.nix
index 3df2e3f59..bcacf2e15 100644
--- a/makefu/2configs/lanparty/lancache.nix
+++ b/makefu/2configs/lanparty/lancache.nix
@@ -17,15 +17,21 @@ let
     installPhase = ''
       mkdir -p $out
       cp -r * $out/
+      rm $out/caches-enabled/*
       sed -i -e 's/^\(user\).*/\1 ${cfg.user} ${cfg.group};/' \
              -e '1 idaemon off;' \
+             -e 's#/var/lancache#${cfg.statedir}#g' \
               $out/nginx.conf
+      sed -i -e 's#/var/lancache#${cfg.statedir}#g' \
+              $out/*/*.conf
+      ln -s $out/caches-available/* $out/caches-enabled/
     '';
   };
   cfg = {
+    statedir = "/data/cache";
+
     group = "nginx-lancache";
     user = "nginx-lancache";
-    statedir = "/var/lancache";
     package = pkgs.stdenv.lib.overrideDerivation pkgs.nginx (old:{
       configureFlags = old.configureFlags ++ [
         "--with-http_slice_module"
@@ -43,6 +49,7 @@ in {
 
     preStart = ''
       mkdir -p ${cfg.statedir} && cd ${cfg.statedir}
+      chmod 700 ${cfg.statedir}
       PATH_CACHE=$PATH_BASE/cache
       PATH_LOGS=$PATH_BASE/logs
 
-- 
cgit v1.2.3


From c8ab30951e9780a2bfd10bcb987c46e95d6b93a0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 8 Nov 2017 10:49:11 +0100
Subject: ma lanparty/samba: update path

---
 makefu/2configs/lanparty/samba.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/lanparty/samba.nix b/makefu/2configs/lanparty/samba.nix
index 32a656ad7..4176d7b35 100644
--- a/makefu/2configs/lanparty/samba.nix
+++ b/makefu/2configs/lanparty/samba.nix
@@ -19,7 +19,7 @@
         "guest ok" = "yes";
       };
       share = {
-        path = "/data/lanparty/share";
+        path = "/data/incoming";
         "read only" = "no";
         browseable = "yes";
         "guest ok" = "yes";
-- 
cgit v1.2.3


From a55be6a344f000aaa86eec32dc84be6c4ab32708 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 8 Nov 2017 10:49:33 +0100
Subject: ma tools: use upstream u3-tool

---
 makefu/2configs/tools/sec.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
index 817cd9ead..3dc02937d 100644
--- a/makefu/2configs/tools/sec.nix
+++ b/makefu/2configs/tools/sec.nix
@@ -13,6 +13,6 @@
     thc-hydra
     borgbackup
     ledger
-    u3_tool
+    u3-tool
   ];
 }
-- 
cgit v1.2.3


From 4fa4ee36ee5b9d3d15aa826007dd648e7cd5860e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 8 Nov 2017 10:49:47 +0100
Subject: ma lanparty: add mumble-server

---
 makefu/2configs/lanparty/mumble-server.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 makefu/2configs/lanparty/mumble-server.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/lanparty/mumble-server.nix b/makefu/2configs/lanparty/mumble-server.nix
new file mode 100644
index 000000000..5b9631cd1
--- /dev/null
+++ b/makefu/2configs/lanparty/mumble-server.nix
@@ -0,0 +1,12 @@
+{ config, ... }:
+{
+  networking.firewall.allowedTCPPorts = [ 64738 ];
+  networking.firewall.allowedUDPPorts = [ 64738 ];
+  services.murmur = {
+    enable = true;
+    welcometext = "Welcome to the LANest Party mumble server";
+    bonjour = true;
+    hostName = "0.0.0.0";
+    sendVersion = true;
+  };
+}
-- 
cgit v1.2.3


From f45a5057aa6584177064622ba13f53e59238dae8 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 8 Nov 2017 10:52:06 +0100
Subject: ma lanparty/lancache-dns: add documentation

---
 makefu/2configs/lanparty/lancache-dns.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/lanparty/lancache-dns.nix b/makefu/2configs/lanparty/lancache-dns.nix
index 498162d13..c9da7c4c4 100644
--- a/makefu/2configs/lanparty/lancache-dns.nix
+++ b/makefu/2configs/lanparty/lancache-dns.nix
@@ -2,6 +2,8 @@
 with import <stockholm/lib>;
 let
   upstream-server = "8.8.8.8";
+  # make sure the router pins the ip address to the deployed host
+  # and set it as dns server ( dhcp option 6,192.168.10.10 )
   local_ip = "192.168.10.10";
 
   extra-config = pkgs.writeText "local.conf" ''
-- 
cgit v1.2.3


From 36ad27a8ad1032afb57f765f5ef7701e7de7ab6b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 8 Nov 2017 10:55:09 +0100
Subject: ma backup: also backup /var/download from gum

---
 makefu/2configs/backup.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/backup.nix b/makefu/2configs/backup.nix
index 166365ba0..a4d02af6b 100644
--- a/makefu/2configs/backup.nix
+++ b/makefu/2configs/backup.nix
@@ -31,6 +31,19 @@ in {
   krebs.backup.plans = {
     # wry-to-omo_root = defaultPull config.krebs.hosts.wry "/";
     gum-to-omo_root = defaultPull config.krebs.hosts.gum "/";
+    gum-dl-to-omo_external = (defaultPull config.krebs.hosts.gum "/var/download" )//
+      {
+        dst.path = "/media/cryptX/backup/gum/var-download";
+        dst.host = defaultBackupServer;
+        startAt = "19:00";
+      };
+    gum-owncloud-to-omo_external = (defaultPull config.krebs.hosts.gum "/var/www/o.euer.krebsco.de" )//
+      {
+        dst.path = "/media/cryptX/backup/gum/var-www-o.euer.krebsco.de";
+        dst.host = defaultBackupServer;
+
+        startAt = "05:00";
+      };
     # wolf-to-omo_root = defaultPull config.krebs.hosts.wolf "/";
   };
   environment.systemPackages = [
-- 
cgit v1.2.3


From 2a9fec0dc846d908d7727e08863c0ba1ead077e3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 14 Nov 2017 10:15:30 +0100
Subject: ma tools/games: add wine

---
 makefu/2configs/tools/games.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
index 8e815da5e..8da615963 100644
--- a/makefu/2configs/tools/games.nix
+++ b/makefu/2configs/tools/games.nix
@@ -6,5 +6,6 @@
   ];
   users.users.makefu.packages = with pkgs; [
     games-user-env
+    wine
   ];
 }
-- 
cgit v1.2.3


From 3582dda308a472258853cbec3f2ec7f59c803d7b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 14 Nov 2017 10:15:45 +0100
Subject: ma tools/dev: add pyserial

---
 makefu/2configs/tools/dev.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index d3d50c433..46872279a 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -2,7 +2,8 @@
 
 {
   users.users.makefu.packages = with pkgs;[
-    python35Packages.virtualenv
+    python3Packages.virtualenv
+    python3Packages.pyserial
     # embedded
     gi
     flashrom
-- 
cgit v1.2.3


From 3b04a5d4da53f076468a1b0bb880490d9a98a697 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 14 Nov 2017 10:16:17 +0100
Subject: ma tools/core: add binutils

---
 makefu/2configs/tools/core.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index eced961be..7e9a459c3 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -14,6 +14,7 @@
     file
     lsof
     which
+    binutils
 
     # fs
     cifs-utils
-- 
cgit v1.2.3


From 1cbc2e5aa359e7e9b4b32c9ef75902576347a6d0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 14 Nov 2017 15:36:50 +0100
Subject: ma hw/stk1160: rip

---
 makefu/2configs/hw/stk1160.nix | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 makefu/2configs/hw/stk1160.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/hw/stk1160.nix b/makefu/2configs/hw/stk1160.nix
deleted file mode 100644
index b3a9e1a5a..000000000
--- a/makefu/2configs/hw/stk1160.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-{
-  # TODO: un-pin linuxPackages somehow
-  boot.kernelPackages = builtins.trace "Warning: overriding kernel Packages with 4.9" pkgs.linuxPackages;
-  nixpkgs.config.packageOverrides = pkgs: {
-    linux_4_9 = pkgs.linux_4_9.override {
-        extraConfig = ''
-          MEDIA_ANALOG_TV_SUPPORT y
-          VIDEO_STK1160_COMMON m
-          VIDEO_STK1160_AC97 y
-          VIDEO_STK1160 m
-        '';
-    };
-  };
-}
-- 
cgit v1.2.3


From 379ef615059bdda14c751bad9352504cac37f96d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 15 Nov 2017 16:43:32 +0100
Subject: ma temp: move elkstack to scrape

---
 makefu/2configs/deployment/scrape/elkstack.nix | 5 +++++
 makefu/2configs/temp/elkstack.nix              | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 makefu/2configs/deployment/scrape/elkstack.nix
 delete mode 100644 makefu/2configs/temp/elkstack.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/scrape/elkstack.nix b/makefu/2configs/deployment/scrape/elkstack.nix
new file mode 100644
index 000000000..c6bf1c6d8
--- /dev/null
+++ b/makefu/2configs/deployment/scrape/elkstack.nix
@@ -0,0 +1,5 @@
+_:
+{
+  services.elasticsearch.enable = true;
+  services.kibana.enable = true;
+}
diff --git a/makefu/2configs/temp/elkstack.nix b/makefu/2configs/temp/elkstack.nix
deleted file mode 100644
index c6bf1c6d8..000000000
--- a/makefu/2configs/temp/elkstack.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-_:
-{
-  services.elasticsearch.enable = true;
-  services.kibana.enable = true;
-}
-- 
cgit v1.2.3


From e37ca2ceaf83adfdf93f512dd5e5849ddba4e7fb Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 28 Nov 2017 22:49:25 +0100
Subject: ma tools/studio: remove owncloudclient

---
 makefu/2configs/tools/studio.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/studio.nix b/makefu/2configs/tools/studio.nix
index add021acd..0356ba391 100644
--- a/makefu/2configs/tools/studio.nix
+++ b/makefu/2configs/tools/studio.nix
@@ -5,6 +5,13 @@
     obs-studio
     studio-link
     audacity
-    owncloudclient
+    darkice
+    # owncloudclient
+    (pkgs.writeScriptBin "prepare-pulseaudio" ''
+      pactl load-module module-null-sink sink_name=stream sink_properties=device.description="Streaming"
+      pactl load-module module-loopback source=alsa_output.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo.monitor sink=stream latency_msec=1
+      pactl load-module module-loopback source=alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo sink=stream latency_msec=1
+      darkice -c ~/lol.conf
+    '')
   ];
 }
-- 
cgit v1.2.3


From 04e6eeb7c8e2e3141293a84bc147265725208999 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 5 Dec 2017 15:16:13 +0100
Subject: ma telegraf: separate, add airsensor

---
 makefu/2configs/stats/telegraf/airsensor.nix | 15 +++++++++++++++
 makefu/2configs/stats/telegraf/default.nix   |  3 ---
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 makefu/2configs/stats/telegraf/airsensor.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/stats/telegraf/airsensor.nix b/makefu/2configs/stats/telegraf/airsensor.nix
new file mode 100644
index 000000000..c0c64b238
--- /dev/null
+++ b/makefu/2configs/stats/telegraf/airsensor.nix
@@ -0,0 +1,15 @@
+{ pkgs, ...}:
+
+{
+  services.telegraf.extraConfig.inputs.exec = [
+    {
+      commands = [ "${pkgs.airsensor-py}/bin/airsensor-py"];
+      timeout = "10s";
+      data_format = "value";
+      data_type = "integer";
+      name_override = "airquality";
+      interval = "10s";
+      tags.unit="VOC";
+    }
+  ];
+}
diff --git a/makefu/2configs/stats/telegraf/default.nix b/makefu/2configs/stats/telegraf/default.nix
index 4da6561d6..049a9c037 100644
--- a/makefu/2configs/stats/telegraf/default.nix
+++ b/makefu/2configs/stats/telegraf/default.nix
@@ -2,9 +2,6 @@
 let
   url = "http://localhost:8086";
 in {
-  imports = [
-    ./europastats.nix
-  ];
   services.telegraf = {
     enable = true;
     extraConfig = {
-- 
cgit v1.2.3


From 20eb8ac1e2d72920814b9f354623646824a68b6b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 8 Dec 2017 13:40:02 +0100
Subject: ma bgt: add hidden service description

---
 makefu/2configs/deployment/bgt/hidden_service.nix | 48 +++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 makefu/2configs/deployment/bgt/hidden_service.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/bgt/hidden_service.nix b/makefu/2configs/deployment/bgt/hidden_service.nix
new file mode 100644
index 000000000..c1a31b8dc
--- /dev/null
+++ b/makefu/2configs/deployment/bgt/hidden_service.nix
@@ -0,0 +1,48 @@
+{ pkgs, lib, ... }:
+
+with lib;
+let
+  name = "bgt_cyberwar_hidden_service";
+  sec = (toString <secrets>) + "/";
+  secdir = sec + name;
+  srvdir = "/var/lib/tor/onion/";
+  basedir = srvdir + name;
+  hn = builtins.readFile (secdir + "/hostname");
+in
+{
+  systemd.services.prepare-hidden-service = {
+    wantedBy = [ "local-fs.target" ];
+    before = [ "tor.service" ];
+    serviceConfig = {
+      ExecStart = pkgs.writeScript "prepare-euer-blog-service" ''
+        #!/bin/sh
+        set -euf
+        if ! test -d "${basedir}" ;then
+          mkdir -p "${srvdir}"
+          cp -r "${secdir}" "${srvdir}"
+          chown -R tor:tor "${srvdir}"
+          chmod -R 700 "${basedir}"
+        else
+          echo "not overwriting ${basedir}"
+        fi
+      '';
+      Type = "oneshot";
+      RemainAfterExit = "yes";
+      TimeoutSec = "0";
+    };
+  };
+  services.nginx.virtualHosts."${hn}".locations."/" = {
+    proxyPass = "https://blog.binaergewitter.de";
+    extraConfig = ''
+        proxy_set_header  Host blog.binaergewitter.de;
+        proxy_ssl_server_name on;
+    '';
+  };
+  services.tor = {
+    enable = true;
+    hiddenServices."${name}".map = [
+     { port = "80"; }
+     # { port = "443"; toHost = "blog.binaergewitter.de"; }
+    ];
+  };
+}
-- 
cgit v1.2.3


From e99a9ac9f113ea9d79ae3b830d8b328c9ef03e40 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 8 Dec 2017 14:04:35 +0100
Subject: ma wbob.r: enable bureautomation

---
 .../2configs/deployment/bureautomation/default.nix | 41 ++++++++++++++++++++++
 makefu/2configs/deployment/led-fader.nix           | 28 +++++++--------
 makefu/2configs/share/wbob.nix                     | 38 ++++++++++++++++++++
 makefu/2configs/stats/telegraf/airsensor.nix       |  4 +++
 4 files changed, 97 insertions(+), 14 deletions(-)
 create mode 100644 makefu/2configs/deployment/bureautomation/default.nix
 create mode 100644 makefu/2configs/share/wbob.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/bureautomation/default.nix b/makefu/2configs/deployment/bureautomation/default.nix
new file mode 100644
index 000000000..3897537ea
--- /dev/null
+++ b/makefu/2configs/deployment/bureautomation/default.nix
@@ -0,0 +1,41 @@
+{ pkgs, lib, ... }:
+
+with lib;
+let
+  port = 3001;
+  runit = pkgs.writeDash "runit" ''
+    set -xeuf
+    PATH=${pkgs.curl}/bin:${pkgs.coreutils}/bin
+    name=''${1?must provide name as first arg}
+    state=''${2?must provide state as second arg}
+    # val=''${3?must provide val as third arg}
+
+    # we ignore non-alerting events
+    test $state = alerting || exit 0
+
+    echo $name - $state
+    curl 'http://bauarbeiterlampe/ay?o=1'
+    sleep 5
+    curl 'http://bauarbeiterlampe/ay?o=1'
+  '';
+in {
+  services.logstash = {
+    package = pkgs.logstash5;
+    enable = true;
+    inputConfig = ''
+       http {
+        port => ${toString port}
+        host => "127.0.0.1"
+      }
+    '';
+    filterConfig = ''
+    '';
+    outputConfig = ''
+      stdout { codec => json }
+      exec { command => "${runit} '%{ruleName}' '%{state}'" }
+    '';
+    extraSettings = ''
+      path.plugins: [ "${pkgs.logstash-output-exec}" ]
+    '';
+  };
+}
diff --git a/makefu/2configs/deployment/led-fader.nix b/makefu/2configs/deployment/led-fader.nix
index 4c17a1d50..292b6679d 100644
--- a/makefu/2configs/deployment/led-fader.nix
+++ b/makefu/2configs/deployment/led-fader.nix
@@ -1,27 +1,25 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, buildPythonPackage, ... }:
 
-with import <stockholm/lib>;
 let
   mq = "192.168.8.11";
 
-  pkg = pkgs.stdenv.mkDerivation {
+  pkg = pkgs.python3Packages.buildPythonPackage {
     name = "ampel-master";
+
     src = pkgs.fetchgit {
       url = "http://cgit.euer.krebsco.de/ampel";
-      rev = "07a6791de368e16cc0864d2676fd255eba522cee";
-      sha256 = "1jxjapvkfglvgapy7gjbr1nra3ay418nvz70bvypcmv7wc8d4h8q";
+      rev = "531741b";
+      sha256 = "110yij53jz074zbswylbzcd8jy7z49r9fg6i3j1gk2y3vl91g81c";
     };
-    buildInputs = [
-      (pkgs.python35.withPackages (pythonPackages: with pythonPackages; [
+    propagatedBuildInputs = with pkgs.python3Packages; [
         docopt
         paho-mqtt
-      ]))
+        requests
+        pytz
+        influxdb
+        httplib2
+        google_api_python_client
     ];
-    installPhase = ''
-      install -m755 -D fade.py  $out/bin/fade.py
-      install -m755 -D ampel.py $out/bin/ampel
-      install -m755 -D times.json $out/share/times.json
-    '';
   };
 in {
   systemd.services.led-fader  = {
@@ -34,7 +32,9 @@ in {
     serviceConfig = {
       # User = "nobody"; # need a user with permissions to run nix-shell
       ExecStartPre = pkgs.writeDash "sleep.sh" "sleep 2";
-      ExecStart = "${pkg}/bin/ampel 4 ${pkg}/share/times.json";
+      ExecStart = "${pkg}/bin/ampel 4";
+      Restart = "always";
+      RestartSec = 10;
       PrivateTmp = true;
     };
   };
diff --git a/makefu/2configs/share/wbob.nix b/makefu/2configs/share/wbob.nix
new file mode 100644
index 000000000..7d3fc38fe
--- /dev/null
+++ b/makefu/2configs/share/wbob.nix
@@ -0,0 +1,38 @@
+{config, ... }:{
+  networking.firewall.allowedUDPPorts = [ 137 138 ];
+  networking.firewall.allowedTCPPorts = [ 139 445 ];
+  users.users.smbguest = {
+    name = "smbguest";
+    uid = config.ids.uids.smbguest;
+    description = "smb guest user";
+    home = "/home/share";
+    createHome = true;
+  };
+  services.samba = {
+    enable = true;
+    enableNmbd = true;
+    shares = {
+      incoming = {
+        path = "/data/incoming";
+        "read only" = "no";
+        browseable = "yes";
+        "guest ok" = "yes";
+      };
+      data = {
+        path = "/data/";
+        "read only" = "yes";
+        browseable = "yes";
+        "guest ok" = "yes";
+      };
+    };
+    extraConfig = ''
+      guest account = smbguest
+      map to guest = bad user
+      # disable printing
+      load printers = no
+      printing = bsd
+      printcap name = /dev/null
+      disable spoolss = yes
+    '';
+  };
+}
diff --git a/makefu/2configs/stats/telegraf/airsensor.nix b/makefu/2configs/stats/telegraf/airsensor.nix
index c0c64b238..09d23e7d4 100644
--- a/makefu/2configs/stats/telegraf/airsensor.nix
+++ b/makefu/2configs/stats/telegraf/airsensor.nix
@@ -1,6 +1,10 @@
 { pkgs, ...}:
 
 {
+  services.udev.extraRules = ''
+    SUBSYSTEMS=="usb", ATTRS{product}=="iAQ Stick", GROUP="input"
+  '';
+  users.users.telegraf.extraGroups = [ "input" ];
   services.telegraf.extraConfig.inputs.exec = [
     {
       commands = [ "${pkgs.airsensor-py}/bin/airsensor-py"];
-- 
cgit v1.2.3


From 3f0fe3b9bcae2917c032583ada8349a73a01dfe7 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 8 Dec 2017 14:27:54 +0100
Subject: ma share/omo: cleanup

---
 makefu/2configs/share/omo.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/share/omo.nix b/makefu/2configs/share/omo.nix
index 7d7a4ec57..e4fef7c3c 100644
--- a/makefu/2configs/share/omo.nix
+++ b/makefu/2configs/share/omo.nix
@@ -30,20 +30,14 @@ in {
         browseable = "yes";
         "guest ok" = "yes";
       };
-      usenet = {
-        path = "/media/crypt0/usenet/dst";
-        "read only" = "yes";
-        browseable = "yes";
-        "guest ok" = "yes";
-      };
-      pyload = {
-        path = "/media/crypt0/pyload";
+      crypt0 = {
+        path = "/media/crypt0";
         "read only" = "yes";
         browseable = "yes";
         "guest ok" = "yes";
       };
-      crypt0 = {
-        path = "/media/crypt0";
+      crypX-games = {
+        path = "/media/cryptX/games";
         "read only" = "yes";
         browseable = "yes";
         "guest ok" = "yes";
-- 
cgit v1.2.3


From cb105d90302aad5397ca5b4daafb31c851ace3dd Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 8 Dec 2017 14:28:36 +0100
Subject: ma tools/dev: add stockholm

---
 makefu/2configs/tools/dev.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index 46872279a..26e9808b2 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -13,10 +13,12 @@
     esptool
     cac-api
     cac-panel
+    krebszones
     ovh-zone
     whatsupnix
     brain
     gen-oath-safe
     cdrtools
+    stockholm
   ];
 }
-- 
cgit v1.2.3


From 90f0675cb730e3e64b3622fd55f76c242270d672 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 8 Dec 2017 14:30:44 +0100
Subject: ma zsh: disable manual completions, enable ctrl-xewq

---
 makefu/2configs/zsh-user.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/zsh-user.nix b/makefu/2configs/zsh-user.nix
index f280fc852..6be078f6a 100644
--- a/makefu/2configs/zsh-user.nix
+++ b/makefu/2configs/zsh-user.nix
@@ -8,11 +8,12 @@ in
   users.extraUsers.${mainUser}.shell = "/run/current-system/sw/bin/zsh";
   programs.zsh= {
     enable = true;
-    enableCompletion = false ; #manually at the end
+    enableCompletion = true ; #manually at the end
     interactiveShellInit = ''
       HISTSIZE=900001
       HISTFILESIZE=$HISTSIZE
       SAVEHIST=$HISTSIZE
+      HISTFILE=$HOME/.zsh_history
 
       setopt HIST_IGNORE_ALL_DUPS
       setopt HIST_IGNORE_SPACE
@@ -65,13 +66,15 @@ in
       zle     -N   fzf-file-widget
       bindkey '^T' fzf-file-widget
 
-      # Auto-Completion
-      for p in ''${(z)NIX_PROFILES}; do
-        fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
-      done
-      autoload -U compinit && compinit
       compdef _pass brain
       zstyle ':completion::complete:brain::' prefix "$HOME/brain"
+
+      # ctrl-x ctrl-e
+      autoload -U edit-command-line
+      zle -N edit-command-line
+      bindkey '^xe' edit-command-line
+      bindkey '^x^e' edit-command-line
+
     '';
 
     promptInit = ''
-- 
cgit v1.2.3


From 635f6e82c64066c05dc0fb7808523f00b0d60ae6 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 8 Dec 2017 14:31:06 +0100
Subject: ma tools: add signal-desktop

---
 makefu/2configs/tools/extra-gui.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index bcc068d82..e25290297 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -14,5 +14,6 @@
     saleae-logic
     arduino-user-env
     gitAndTools.gitFull
+    signal-desktop
   ];
 }
-- 
cgit v1.2.3


From 0908acc61644da91c41118e7846923ac8535e1ef Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 8 Dec 2017 14:31:27 +0100
Subject: ma tools/games: add pkg2zip

---
 makefu/2configs/tools/games.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
index 8da615963..40ea4523d 100644
--- a/makefu/2configs/tools/games.nix
+++ b/makefu/2configs/tools/games.nix
@@ -7,5 +7,6 @@
   users.users.makefu.packages = with pkgs; [
     games-user-env
     wine
+    pkg2zip
   ];
 }
-- 
cgit v1.2.3


From 5d4e03e22730d617419fe51cf643e14a191707d2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 8 Dec 2017 14:31:43 +0100
Subject: ma scrape: init

---
 makefu/2configs/deployment/scrape/default.nix  |  6 +++
 makefu/2configs/deployment/scrape/selenium.nix | 65 ++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 makefu/2configs/deployment/scrape/default.nix
 create mode 100644 makefu/2configs/deployment/scrape/selenium.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/scrape/default.nix b/makefu/2configs/deployment/scrape/default.nix
new file mode 100644
index 000000000..c7a5b5c14
--- /dev/null
+++ b/makefu/2configs/deployment/scrape/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./elkstack.nix
+    ./selenium.nix
+  ];
+}
diff --git a/makefu/2configs/deployment/scrape/selenium.nix b/makefu/2configs/deployment/scrape/selenium.nix
new file mode 100644
index 000000000..d700259ba
--- /dev/null
+++ b/makefu/2configs/deployment/scrape/selenium.nix
@@ -0,0 +1,65 @@
+{config, pkgs, lib, ...}:
+with <stockholm/lib>;
+let
+  selenium-pw = <secrets/selenium-vncpasswd>;
+in {
+  services.jenkinsSlave.enable = true;
+  users.users.selenium = {
+    uid = genid "selenium";
+    extraGroups = [ "plugdev" ];
+  };
+
+  fonts.enableFontDir = true;
+
+  # networking.firewall.allowedTCPPorts = [ 5910 ];
+
+  systemd.services.selenium-X11 =
+  {
+    description = "X11 vnc for selenium";
+    wantedBy = [ "multi-user.target" ];
+    path = [ pkgs.xorg.xorgserver pkgs.tightvnc pkgs.dwm ];
+    environment =
+    {
+      DISPLAY = ":10";
+    };
+    script = ''
+      set -ex
+      [ -e /tmp/.X10-lock ] && ( set +e ; chmod u+w /tmp/.X10-lock ; rm /tmp/.X10-lock )
+      [ -e /tmp/.X11-unix/X10 ] && ( set +e ; chmod u+w /tmp/.X11-unix/X10 ; rm /tmp/.X11-unix/X10 )
+      mkdir -p ~/.vnc
+      cp -f ${selenium-pw} ~/.vnc/passwd
+      chmod go-rwx ~/.vnc/passwd
+      echo > ~/.vnc/xstartup
+      chmod u+x ~/.vnc/xstartup
+      vncserver $DISPLAY -geometry 1280x1024 -depth 24 -name jenkins -ac
+      dwm
+    '';
+    preStop = ''
+      vncserver -kill $DISPLAY
+    '';
+    serviceConfig = {
+      User = "selenium";
+    };
+  };
+
+  systemd.services.selenium-server =
+  {
+    description = "selenium-server";
+    wantedBy = [ "multi-user.target" ];
+    requires = [ "selenium-X11.service" ];
+    path = [ pkgs.chromium
+             pkgs.firefoxWrapper ];
+    environment =
+    {
+      DISPLAY = ":10";
+    };
+    script = ''
+      ${pkgs.selenium-server-standalone}/bin/selenium-server -Dwebdriver.enable.native.events=1
+    '';
+    serviceConfig = {
+      User = "selenium";
+    };
+  };
+
+
+}
-- 
cgit v1.2.3