From 6ec1a6296930569c97cf029bad17c998d4fae66d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 13 Mar 2017 23:54:15 +0100
Subject: m 2 urlwatch: supervise radare2

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

(limited to 'makefu')

diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix
index 20eb031a..6402b364 100644
--- a/makefu/2configs/urlwatch.nix
+++ b/makefu/2configs/urlwatch.nix
@@ -19,6 +19,7 @@
       https://api.github.com/repos/embray/d2to1/tags
       https://api.github.com/repos/dorimanx/exfat-nofuse/commits
       https://api.github.com/repos/dorimanx/exfat-nofuse/tags
+      https://api.github.com/repos/radare/radare2/tags
     ];
   };
 }
-- 
cgit v1.2.3


From 679a03403f0b5152c091f23c4dc1b94625f5771b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 17 Mar 2017 01:21:20 +0100
Subject: m 1 x: re-enable virtualbox

want to test 3d acceleration
---
 makefu/1systems/x.nix           |  3 ++-
 makefu/2configs/extra-fonts.nix | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 makefu/2configs/extra-fonts.nix

(limited to 'makefu')

diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 9666f50f..9cedc04a 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -8,6 +8,7 @@
     [ # base
       ../.
       ../2configs/main-laptop.nix
+      ../2configs/extra-fonts.nix
       ../2configs/tools/all.nix
       ../2configs/laptop-backup.nix
       ../2configs/dnscrypt.nix
@@ -46,7 +47,7 @@
       ../2configs/mail-client.nix
       ../2configs/printer.nix
       ../2configs/virtualization.nix
-      # ../2configs/virtualization-virtualbox.nix
+      ../2configs/virtualization-virtualbox.nix
       ../2configs/wwan.nix
       ../2configs/rad1o.nix
 
diff --git a/makefu/2configs/extra-fonts.nix b/makefu/2configs/extra-fonts.nix
new file mode 100644
index 00000000..7b3a5f19
--- /dev/null
+++ b/makefu/2configs/extra-fonts.nix
@@ -0,0 +1,14 @@
+ { pkgs, ... }:
+ {
+   fonts = {
+     enableFontDir = true;
+     enableGhostscriptFonts = true;
+     fonts = with pkgs; [
+       inconsolata  # monospaced
+       ubuntu_font_family  # Ubuntu fonts
+       unifont # some international languages
+       dejavu_fonts
+       terminus_font
+     ];
+   };
+ }
-- 
cgit v1.2.3


From defaf14983770e880285c358f175e91244eaf2da Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 24 Mar 2017 13:02:26 +0100
Subject: m 2 base-gui: enable GS fonts

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

(limited to 'makefu')

diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 43b37cd8..55dd4457 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -41,7 +41,7 @@ in
   fonts = {
     enableCoreFonts = true;
     enableFontDir = true;
-    enableGhostscriptFonts = false;
+    enableGhostscriptFonts = true;
     fonts = [ pkgs.terminus_font ];
   };
 
-- 
cgit v1.2.3


From 5a004c891096b805f26fef818fa75227fe1d071f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 24 Mar 2017 13:03:46 +0100
Subject: m 1 wry: mv Reaktor to omo

---
 makefu/1systems/omo.nix | 12 ++++++++++++
 makefu/1systems/wry.nix | 14 +-------------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index a6a336fe..f77a19c1 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -182,5 +182,17 @@ in {
 
   zramSwap.enable = true;
 
+  krebs.Reaktor.reaktor = {
+    nickname = "Reaktor|bot";
+    channels = [ "#krebs" "#shackspace" "#binaergewitter" ];
+    plugins = with pkgs.ReaktorPlugins;[
+                               titlebot
+                               # stockholm-issue
+                               nixos-version
+                               shack-correct
+                               sed-plugin
+                               random-emoji ];
+  };
+
   krebs.build.host = config.krebs.hosts.omo;
 }
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 2457ab92..c403d235 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -33,18 +33,6 @@ in {
 
   krebs.build.host = config.krebs.hosts.wry;
 
-  krebs.Reaktor.reaktor = {
-    nickname = "Reaktor|bot";
-    channels = [ "#krebs" "#shackspace" "#binaergewitter" ];
-    plugins = with pkgs.ReaktorPlugins;[
-                               titlebot
-                               # stockholm-issue
-                               nixos-version
-                               shack-correct
-                               sed-plugin
-                               random-emoji ];
-  };
-
   # prepare graphs
   services.nginx.enable = true;
   krebs.retiolum-bootstrap.enable = true;
@@ -64,7 +52,7 @@ in {
             return 403;
           }
         '';
-        serverAliases = [  "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
+        serverAliases = [  "graphs.r" "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
       };
       anonymous = {
         enableSSL = true;
-- 
cgit v1.2.3


From 4ddfc208e14bfb1b307a65960fa883166e49005e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 24 Mar 2017 13:16:52 +0100
Subject: m 2 default: bump to 73a6832

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

(limited to 'makefu')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 1ad7f071..6d5a2f68 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,7 +22,7 @@ with import <stockholm/lib>;
       user = config.krebs.users.makefu;
       source = let
           inherit (config.krebs.build) host user;
-          ref = "53a2baa"; # unstable @ 2017-02-28
+          ref = "73a6832"; # unstable @ 2017-03-24
       in {
         nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
           {
-- 
cgit v1.2.3


From a81a624345947848ed08a876c5ddd86a0dede62f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 25 Mar 2017 00:39:56 +0100
Subject: m 5 dymo-cups-drivers: nuke

---
 makefu/5pkgs/dymo-cups-drivers/default.nix | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 makefu/5pkgs/dymo-cups-drivers/default.nix

(limited to 'makefu')

diff --git a/makefu/5pkgs/dymo-cups-drivers/default.nix b/makefu/5pkgs/dymo-cups-drivers/default.nix
deleted file mode 100644
index d47bae6d..00000000
--- a/makefu/5pkgs/dymo-cups-drivers/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, lib, pkgs, fetchurl, cups, ... }:
-
-stdenv.mkDerivation rec {
-  name = "dymo-cups-drivers-${version}";
-  version = "1.4.0";
-  src = fetchurl {
-    url = "http://download.dymo.com/dymo/Software/Download%20Drivers/Linux/Download/${name}.tar.gz";
-    sha256 = "0wagsrz3q7yrkzb5ws0m5faq68rqnqfap9p98sgk5jl6x7krf1y6";
-  };
-  buildInputs = [ cups ];
-  makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ];
-
-  # acd_cli gets dumped in bin and gets overwritten by fixupPhase
-  meta = {
-    description = "Dymo printer drivers";
-  };
-}
-- 
cgit v1.2.3


From 79737faaa693ee775f1b3e99ebb33a9729d95f9f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 25 Mar 2017 16:37:10 +0100
Subject: m 2: fix printer

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

(limited to 'makefu')

diff --git a/makefu/2configs/printer.nix b/makefu/2configs/printer.nix
index 7c7b00ab..509ed512 100644
--- a/makefu/2configs/printer.nix
+++ b/makefu/2configs/printer.nix
@@ -5,7 +5,7 @@
     enable = true;
     drivers = [
       pkgs.samsungUnifiedLinuxDriver
-      pkgs.dymo-cups-drivers
+      pkgs.cups-dymo
     ];
   };
 
-- 
cgit v1.2.3


From 8c93fa4c740fde141697300f85fa756fcfb61a2f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 29 Mar 2017 21:27:33 +0200
Subject: m 5 taskserver: rip

---
 makefu/5pkgs/taskserver/default.nix | 43 -------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 makefu/5pkgs/taskserver/default.nix

(limited to 'makefu')

diff --git a/makefu/5pkgs/taskserver/default.nix b/makefu/5pkgs/taskserver/default.nix
deleted file mode 100644
index a1502b4d..00000000
--- a/makefu/5pkgs/taskserver/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "taskserver-${version}";
-  version = "1.1.0";
-
-  enableParallelBuilding = true;
-
-  src = fetchurl {
-    url = "http://www.taskwarrior.org/download/taskd-${version}.tar.gz";
-    sha256 = "1d110q9vw8g5syzihxymik7hd27z1592wkpz55kya6lphzk8i13v";
-  };
-
-  patchPhase = ''
-    pkipath=$out/share/taskd/pki
-    mkdir -p $pkipath
-    cp -r pki/* $pkipath
-    echo "patching paths in pki/generate"
-    sed -i "s#^\.#$pkipath#" $pkipath/generate
-    for f in $pkipath/generate* ;do
-      i=$(basename $f)
-      echo patching $i
-      sed -i \
-          -e 's/which/type -p/g' \
-          -e 's#^\. ./vars#if test -e ./vars;then . ./vars; else echo "cannot find ./vars - copy the template from '$pkipath'/vars into the working directory";exit 1; fi#' $f
-
-      echo wrapping $i
-      makeWrapper  $pkipath/$i $out/bin/taskd-pki-$i \
-        --prefix PATH : ${gnutls}/bin/
-    done
-  '';
-
-  buildInputs = [ makeWrapper ];
-  nativeBuildInputs = [ cmake libuuid gnutls ];
-
-  meta = {
-    description = "Server for synchronising Taskwarrior clients";
-    homepage = http://taskwarrior.org;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ];
-  };
-}
-- 
cgit v1.2.3


From 52eac8085972d6d042f48b26fcc429e6379ddc62 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 30 Mar 2017 16:48:30 +0200
Subject: m 1 omo: do not watch urls

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

(limited to 'makefu')

diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index f77a19c1..99303b60 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -43,7 +43,6 @@ in {
       # TODO: unlock home partition via ssh
       ../2configs/fs/sda-crypto-root.nix
       ../2configs/zsh-user.nix
-      ../2configs/urlwatch.nix
       ../2configs/backup.nix
       ../2configs/exim-retiolum.nix
       ../2configs/smart-monitor.nix
-- 
cgit v1.2.3


From 6688dfbabe8ea9fa271ace59dad6650ff37e1fae Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 31 Mar 2017 13:00:52 +0200
Subject: m 2 urlwatch: Mic92 is the new maintainer of vicious

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

(limited to 'makefu')

diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix
index 6402b364..5b82d810 100644
--- a/makefu/2configs/urlwatch.nix
+++ b/makefu/2configs/urlwatch.nix
@@ -10,6 +10,7 @@
       https://api.github.com/repos/ovh/python-ovh/tags
       https://api.github.com/repos/embray/d2to1/tags
       http://git.sysphere.org/vicious/log/?qt=grep&q=Next+release
+      https://api.github.com/repos/Mic92/vicious/tags
       https://pypi.python.org/simple/bepasty/
       https://pypi.python.org/simple/xstatic/
       http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/
-- 
cgit v1.2.3


From 1d1b113465878e69f3511e1092f4ec2ff592502c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 31 Mar 2017 13:01:26 +0200
Subject: m 2 backup: wry on standby

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

(limited to 'makefu')

diff --git a/makefu/2configs/backup.nix b/makefu/2configs/backup.nix
index 280dc1df..9ed89032 100644
--- a/makefu/2configs/backup.nix
+++ b/makefu/2configs/backup.nix
@@ -29,7 +29,7 @@ let
   };
 in {
   krebs.backup.plans = {
-    wry-to-omo_root = defaultPull config.krebs.hosts.wry "/";
+    # wry-to-omo_root = defaultPull config.krebs.hosts.wry "/";
     gum-to-omo_root = defaultPull config.krebs.hosts.gum "/";
   };
 }
-- 
cgit v1.2.3


From f9555d014ac6c87cd5a361765728f611b0c30c32 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 31 Mar 2017 13:39:13 +0200
Subject: m 2 default: use cups-dymo patch

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

(limited to 'makefu')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 6d5a2f68..2f340a67 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,7 +22,7 @@ with import <stockholm/lib>;
       user = config.krebs.users.makefu;
       source = let
           inherit (config.krebs.build) host user;
-          ref = "73a6832"; # unstable @ 2017-03-24
+          ref = "3ff00fa"; # unstable @ 2017-03-31 + cups-dymo
       in {
         nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
           {
-- 
cgit v1.2.3


From 9a5cd35de345db85480df7f7dabe561439cf2e69 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 31 Mar 2017 18:25:54 +0200
Subject: m 2 base-gui: Terminus naming fuckup

https://bbs.archlinux.org/viewtopic.php?id=221794
---
 makefu/2configs/base-gui.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'makefu')

diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 55dd4457..ba4c551b 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -62,7 +62,7 @@ in
       cat |derp <<EOF
       XTerm*background: black
       XTerm*foreground: white
-      XTerm*FaceName  : Terminus:pixelsize=14
+      XTerm*FaceName  : xft:xos4 Terminus:pixelsize=14
 
       URxvt*termName:         rxvt
       URxvt*saveLines:            10000
@@ -74,7 +74,8 @@ in
       URxvt.background: black
       URxvt.urgentOnBell: true
       URxvt.visualBell: false
-      URxvt.font : xft:Terminus
+      URxvt.font : xft:xos4 Terminus:size=12
+
 
       ! blue
       URxvt*color4:                         #268bd2
-- 
cgit v1.2.3


From 79f36f6408052d8b83091036e342094de3ce1a32 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 3 Apr 2017 08:26:13 +0200
Subject: m 2 urlwatch: remove old vicious url

---
 makefu/2configs/urlwatch.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'makefu')

diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix
index 5b82d810..d1dcec65 100644
--- a/makefu/2configs/urlwatch.nix
+++ b/makefu/2configs/urlwatch.nix
@@ -9,7 +9,6 @@
       ## nixpkgs maintenance
       https://api.github.com/repos/ovh/python-ovh/tags
       https://api.github.com/repos/embray/d2to1/tags
-      http://git.sysphere.org/vicious/log/?qt=grep&q=Next+release
       https://api.github.com/repos/Mic92/vicious/tags
       https://pypi.python.org/simple/bepasty/
       https://pypi.python.org/simple/xstatic/
-- 
cgit v1.2.3


From 16b8fef4f59583d8fa8ef0e7806ef1b3175bce40 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 11 Apr 2017 21:35:49 +0200
Subject: m 2 deployment: add graphs

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

(limited to 'makefu')

diff --git a/makefu/2configs/deployment/graphs.nix b/makefu/2configs/deployment/graphs.nix
new file mode 100644
index 00000000..35a724f6
--- /dev/null
+++ b/makefu/2configs/deployment/graphs.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with import <stockholm/lib>;
+let
+  external-ip = config.krebs.build.host.nets.internet.ip4.addr;
+  internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
+  hn = config.krebs.build.host.name;
+in {
+  krebs.bepasty.servers."paste.r".nginx.extraConfig = ''
+    if ( $server_addr = "${external-ip}" ) {
+      return 403;
+    }
+  '';
+  krebs.tinc_graphs = {
+    enable = true;
+    nginx = {
+      enable = true;
+      # TODO: remove hard-coded hostname
+      complete = {
+        extraConfig = ''
+          if ( $server_addr = "${external-ip}" ) {
+            return 403;
+          }
+        '';
+        serverAliases = [
+          "graphs.r" "graphs.retiolum"
+          "graphs.${hn}" "graphs.${hn}.retiolum"
+        ];
+      };
+      anonymous = {
+        enableSSL = true;
+        forceSSL = true;
+        enableACME = true;
+      };
+    };
+  };
+}
-- 
cgit v1.2.3


From 63a35e7bd7a5f402d9c6805b9e6d13806b82b118 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 11 Apr 2017 21:36:10 +0200
Subject: m 2 deployment: uwsgi add

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

(limited to 'makefu')

diff --git a/makefu/2configs/deployment/uwsgi.nix b/makefu/2configs/deployment/uwsgi.nix
new file mode 100644
index 00000000..4ad9961f
--- /dev/null
+++ b/makefu/2configs/deployment/uwsgi.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+# more than just nginx config but not enough to become a module
+with import <stockholm/lib>;
+let
+  external-ip = config.krebs.build.host.nets.internet.ip4.addr;
+  wsgi-sock = "${config.services.uwsgi.runDir}/uwsgi.sock";
+  elch-sock = "${config.services.uwsgi.runDir}/uwsgi-elch.sock";
+in {
+
+  services.uwsgi = {
+    enable = true;
+    user = "nginx";
+    plugins = [ "python2" ];
+    instance.type = "emperor";
+  };
+}
-- 
cgit v1.2.3


From e0a423e1f0a228dbcaa70dd5037404608af8daeb Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 11 Apr 2017 21:36:27 +0200
Subject: m 2 deployment/uwsgi: purge

---
 makefu/2configs/deployment/uwsgi.nix | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 makefu/2configs/deployment/uwsgi.nix

(limited to 'makefu')

diff --git a/makefu/2configs/deployment/uwsgi.nix b/makefu/2configs/deployment/uwsgi.nix
deleted file mode 100644
index 4ad9961f..00000000
--- a/makefu/2configs/deployment/uwsgi.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-# more than just nginx config but not enough to become a module
-with import <stockholm/lib>;
-let
-  external-ip = config.krebs.build.host.nets.internet.ip4.addr;
-  wsgi-sock = "${config.services.uwsgi.runDir}/uwsgi.sock";
-  elch-sock = "${config.services.uwsgi.runDir}/uwsgi-elch.sock";
-in {
-
-  services.uwsgi = {
-    enable = true;
-    user = "nginx";
-    plugins = [ "python2" ];
-    instance.type = "emperor";
-  };
-}
-- 
cgit v1.2.3


From 4c7f5909d82c368d9dc316d0987eadb4a1ff03e1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 11 Apr 2017 21:36:41 +0200
Subject: m 5 awesomecfg: add todo

---
 makefu/5pkgs/awesomecfg/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu')

diff --git a/makefu/5pkgs/awesomecfg/default.nix b/makefu/5pkgs/awesomecfg/default.nix
index c2276887..b94b6fa5 100644
--- a/makefu/5pkgs/awesomecfg/default.nix
+++ b/makefu/5pkgs/awesomecfg/default.nix
@@ -1,6 +1,7 @@
 _:
 
 {
+  # TODO:  requires in path: amixer, xlock, xbacklight
   full = ./full.cfg;
   kiosk = ./kiosk.lua;
 }
-- 
cgit v1.2.3


From 8a40e9346e9fbfd20cf53d733f0c2790b1a7f7b1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 11 Apr 2017 21:37:37 +0200
Subject: m 2 bepasty-dual: use secretKeyFile

---
 makefu/2configs/bepasty-dual.nix | 6 +++---
 makefu/2configs/default.nix      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'makefu')

diff --git a/makefu/2configs/bepasty-dual.nix b/makefu/2configs/bepasty-dual.nix
index 936aaf00..ecf5f8a3 100644
--- a/makefu/2configs/bepasty-dual.nix
+++ b/makefu/2configs/bepasty-dual.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
 let
   sec = toString <secrets>;
   # secKey is nothing worth protecting on a local machine
-  secKey = import <secrets/bepasty-secret.nix>;
+  secKey = "${secrets}/bepasty-secret";
   acmepath = "/var/lib/acme/";
   acmechall = acmepath + "/challenges/";
   ext-dom = "paste.krebsco.de" ;
@@ -31,7 +31,7 @@ in {
           serverAliases = [ "paste.retiolum" "paste.${config.krebs.build.host.name}" ];
         };
         defaultPermissions = "admin,list,create,read,delete";
-        secretKey = secKey;
+        secretKeyFile = secKey;
       };
 
       "${ext-dom}" = {
@@ -41,7 +41,7 @@ in {
           enableACME = true;
         };
         defaultPermissions = "read";
-        secretKey = secKey;
+        secretKeyFile = secKey;
       };
     };
   };
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 2f340a67..7b2e6b61 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,7 +22,7 @@ with import <stockholm/lib>;
       user = config.krebs.users.makefu;
       source = let
           inherit (config.krebs.build) host user;
-          ref = "3ff00fa"; # unstable @ 2017-03-31 + cups-dymo
+          ref = "2982661"; # unstable @ 2017-03-31 + cups-dymo + snapraid-11.1
       in {
         nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
           {
-- 
cgit v1.2.3


From 9224e9c4c8432ce8d7788592b9d25cfc29440ee6 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 11 Apr 2017 21:38:27 +0200
Subject: m: gum takes over euer,wiki,graphs from wry

---
 makefu/1systems/gum.nix |  3 +++
 makefu/1systems/wry.nix | 27 ---------------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index 91049302..c39997eb 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -29,9 +29,12 @@ in {
       ../2configs/deployment/owncloud.nix
       ../2configs/nginx/share-download.nix
       ../2configs/nginx/euer.test.nix
+      ../2configs/nginx/euer.wiki.nix
+      ../2configs/nginx/euer.blog.nix
       ../2configs/nginx/public_html.nix
       ../2configs/nginx/update.connector.one.nix
       ../2configs/deployment/mycube.connector.one.nix
+      ../2configs/deployment/graphs.nix
 
       # ../2configs/opentracker.nix
       ../2configs/logging/central-stats-client.nix
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index c403d235..a5c4d3cc 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -19,8 +19,6 @@ in {
       ../2configs/backup.nix
 
       # other nginx
-      ../2configs/nginx/euer.wiki.nix
-      ../2configs/nginx/euer.blog.nix
       # ../2configs/nginx/euer.test.nix
 
       # collectd
@@ -36,31 +34,6 @@ in {
   # prepare graphs
   services.nginx.enable = true;
   krebs.retiolum-bootstrap.enable = true;
-  krebs.bepasty.servers."paste.r".nginx.extraConfig = ''
-    if ( $server_addr = "${external-ip}" ) {
-      return 403;
-    }
-  '';
-  krebs.tinc_graphs = {
-    enable = true;
-    nginx = {
-      enable = true;
-      # TODO: remove hard-coded hostname
-      complete = {
-        extraConfig = ''
-          if ( $server_addr = "${external-ip}" ) {
-            return 403;
-          }
-        '';
-        serverAliases = [  "graphs.r" "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
-      };
-      anonymous = {
-        enableSSL = true;
-        forceSSL = true;
-        enableACME = true;
-      };
-    };
-  };
 
   networking = {
     firewall = {
-- 
cgit v1.2.3