From 90822f64e0bf247c5cca2f035077553cac5ceb79 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 1 Jun 2017 09:21:20 +0200
Subject: shared: move shack config to shack/

---
 shared/2configs/shack/muell_caller.nix | 41 ++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 shared/2configs/shack/muell_caller.nix

(limited to 'shared/2configs/shack/muell_caller.nix')

diff --git a/shared/2configs/shack/muell_caller.nix b/shared/2configs/shack/muell_caller.nix
new file mode 100644
index 00000000..613ed2e4
--- /dev/null
+++ b/shared/2configs/shack/muell_caller.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+with import <stockholm/lib>;
+let
+  pkg = pkgs.stdenv.mkDerivation {
+    name = "muell_caller-2017-06-01";
+    src = pkgs.fetchgit {
+      url = "https://github.com/shackspace/muell_caller/";
+      rev = "bbd4009";
+      sha256 = "06xaa1j6sfyvvdxg0366fcslhn478anqh4m5hljyf0z29knvz7pg";
+    };
+    buildInputs = [
+      (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
+        docopt
+        requests
+        paramiko
+        python
+      ]))
+    ];
+    installPhase = ''
+      install -m755 -D call.py  $out/bin/call-muell
+    '';
+  };
+  cfg = "${toString <secrets>}/tell.json";
+in {
+  systemd.services.mqtt_sub  = {
+    description = "call muell";
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      User = "nobody"; # TODO separate user
+      ExecStartPre = writeDash "call-muell-pre" ''
+        cp ${cfg} /tmp/tell.json
+        chown nobody /tmp/tell.json
+      '';
+      ExecStart = "${pkg}/bin/call-muell --cfg /tmp/tell.json --mode mpd loop 60";
+      Restart = "always";
+      PrivateTmp = true;
+      PermissionsStartOnly = true;
+    };
+  };
+}
-- 
cgit v1.2.3


From 1c1314f667730264c91f75d50f679ef87c8a6e3a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 1 Jun 2017 10:13:14 +0200
Subject: s 2 muell_caller: fix derivation

---
 shared/2configs/shack/muell_caller.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'shared/2configs/shack/muell_caller.nix')

diff --git a/shared/2configs/shack/muell_caller.nix b/shared/2configs/shack/muell_caller.nix
index 613ed2e4..2d8d78e3 100644
--- a/shared/2configs/shack/muell_caller.nix
+++ b/shared/2configs/shack/muell_caller.nix
@@ -7,12 +7,12 @@ let
     src = pkgs.fetchgit {
       url = "https://github.com/shackspace/muell_caller/";
       rev = "bbd4009";
-      sha256 = "06xaa1j6sfyvvdxg0366fcslhn478anqh4m5hljyf0z29knvz7pg";
+      sha256 = "1bfnfl2vdh0p5wzyz5p48qh04vvsg2445avg86fzhzragx25fqv0";
     };
     buildInputs = [
       (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
         docopt
-        requests
+        requests2
         paramiko
         python
       ]))
@@ -23,12 +23,12 @@ let
   };
   cfg = "${toString <secrets>}/tell.json";
 in {
-  systemd.services.mqtt_sub  = {
+  systemd.services.call_muell = {
     description = "call muell";
     wantedBy = [ "multi-user.target" ];
     serviceConfig = {
       User = "nobody"; # TODO separate user
-      ExecStartPre = writeDash "call-muell-pre" ''
+      ExecStartPre = pkgs.writeDash "call-muell-pre" ''
         cp ${cfg} /tmp/tell.json
         chown nobody /tmp/tell.json
       '';
-- 
cgit v1.2.3