From 36d43bf73f498228ff540e86e6dd6596a353a0da Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 7 Oct 2015 15:21:24 +0200
Subject: makefu 3 tinc_graphs: actually start the timer

---
 makefu/3modules/tinc_graphs.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'makefu')

diff --git a/makefu/3modules/tinc_graphs.nix b/makefu/3modules/tinc_graphs.nix
index 06b3f6263..62d607527 100644
--- a/makefu/3modules/tinc_graphs.nix
+++ b/makefu/3modules/tinc_graphs.nix
@@ -64,13 +64,11 @@ let
     environment.systemPackages = [ pkgs.tinc_graphs];
     systemd.timers.tinc_graphs = {
       description = "Build Tinc Graphs via via timer";
-
+      wantedBy = [ "timers.target"];
       timerConfig = cfg.timerConfig;
     };
     systemd.services.tinc_graphs = {
       description = "Build Tinc Graphs";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
       environment = {
         EXTERNAL_FOLDER = external_dir;
         INTERNAL_FOLDER = internal_dir;
-- 
cgit v1.2.3


From 5f5c1f5f661a2c4236fb62bc4c0ec7d43ae7a5b1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 8 Oct 2015 16:51:57 +0200
Subject: m 2 Reaktor: add shack-correct, update pnp Reaktor Channels

---
 makefu/1systems/pnp.nix                   |  3 ++-
 makefu/2configs/Reaktor/shack-correct.nix | 20 ++++++++++++++++++++
 makefu/2configs/Reaktor/shack-correct.sh  |  6 ++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 makefu/2configs/Reaktor/shack-correct.nix
 create mode 100644 makefu/2configs/Reaktor/shack-correct.sh

(limited to 'makefu')

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index fdc2f0135..e7ceca60d 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -25,6 +25,7 @@
       ../2configs/Reaktor/simpleExtend.nix
       ../2configs/Reaktor/random-emoji.nix
       ../2configs/Reaktor/titlebot.nix
+      ../2configs/Reaktor/shack-correct.nix
 
       ../2configs/exim-retiolum.nix
       ../2configs/urlwatch.nix
@@ -35,7 +36,7 @@
   krebs.Reaktor.debug = true;
   krebs.Reaktor.nickname = "Reaktor|bot";
   krebs.Reaktor.extraEnviron = {
-    REAKTOR_CHANNELS = "#krebs,#binaergewitter";
+    REAKTOR_CHANNELS = "#krebs,#binaergewitter,#shackspace";
   };
 
   krebs.build.host = config.krebs.hosts.pnp;
diff --git a/makefu/2configs/Reaktor/shack-correct.nix b/makefu/2configs/Reaktor/shack-correct.nix
new file mode 100644
index 000000000..8f30807f1
--- /dev/null
+++ b/makefu/2configs/Reaktor/shack-correct.nix
@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+
+with pkgs;
+let
+  script = pkgs.substituteAll ( {
+    name="shack-correct";
+    isExecutable=true;
+    dir = "";
+    src = ./shack-correct.sh;
+    });
+in {
+  krebs.Reaktor.extraConfig = ''
+  public_commands.insert(0,{
+    'capname' : "shack-correct",
+    'pattern' : '^(?P<args>.*Shack.*)$$',
+    'argv'    : ["${script}"],
+    'env'     : {  }})
+  '';
+}
+
diff --git a/makefu/2configs/Reaktor/shack-correct.sh b/makefu/2configs/Reaktor/shack-correct.sh
new file mode 100644
index 000000000..3b4d04f80
--- /dev/null
+++ b/makefu/2configs/Reaktor/shack-correct.sh
@@ -0,0 +1,6 @@
+#! /bin/sh
+set -eu
+printf "Sie meinten wohl \""
+echo -n $@ | sed 's/Shack/shack/g'
+echo "\""
+echo "${_from}--"
-- 
cgit v1.2.3