From de6564e5f5caf394db8fe22d1ecfee22cb6155d3 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 17 Aug 2015 15:35:27 +0200
Subject: krebs 5: add youtube-tools

---
 krebs/5pkgs/default.nix       |  1 +
 krebs/5pkgs/youtube-tools.nix | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 krebs/5pkgs/youtube-tools.nix

(limited to 'krebs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 89872f1eb..062f0a515 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -13,4 +13,5 @@ pkgs //
   github-known_hosts = callPackage ./github-known_hosts.nix {};
   hashPassword = callPackage ./hashPassword.nix {};
   posix-array = callPackage ./posix-array.nix {};
+  youtube-tools = callPackage ./youtube-tools.nix {};
 }
diff --git a/krebs/5pkgs/youtube-tools.nix b/krebs/5pkgs/youtube-tools.nix
new file mode 100644
index 000000000..29142b8b9
--- /dev/null
+++ b/krebs/5pkgs/youtube-tools.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, ... }:
+
+stdenv.mkDerivation {
+  name = "youtube-tools";
+
+  src = fetchgit {
+    url = https://github.com/Lassulus/the_playlist;
+    rev = "323a66775168b6addb3acddaee0a8ff227ea4bd4";
+    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/* $out/bin/
+  '';
+}
-- 
cgit v1.2.3


From 7f11bbcfc0b0c53d9d2838d253d7bd48af8a4b7e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 17 Aug 2015 16:18:57 +0200
Subject: krebs 5 youtube-tools: bump rev

---
 krebs/5pkgs/youtube-tools.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/youtube-tools.nix b/krebs/5pkgs/youtube-tools.nix
index 29142b8b9..d767728be 100644
--- a/krebs/5pkgs/youtube-tools.nix
+++ b/krebs/5pkgs/youtube-tools.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = https://github.com/Lassulus/the_playlist;
-    rev = "323a66775168b6addb3acddaee0a8ff227ea4bd4";
-    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
+    rev = "9218b163f2d8bc965b853ed9fc9e13d15a703456";
+    sha256 = "ae5db4be652d015a518e57e4ed2de34b9127e77d9272af3049832bb134e96e4d";
   };
 
   phases = [
-- 
cgit v1.2.3


From 1c3f7610c594e5918acd96adce2b79d7fba2765b Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@syntax-fehler.de>
Date: Mon, 17 Aug 2015 23:21:51 +0200
Subject: urlwatch: fix ca-bundle path

---
 krebs/3modules/urlwatch.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/urlwatch.nix b/krebs/3modules/urlwatch.nix
index 39d9fec54..531e6c87b 100644
--- a/krebs/3modules/urlwatch.nix
+++ b/krebs/3modules/urlwatch.nix
@@ -78,7 +78,7 @@ let
         HOME = cfg.dataDir;
         LC_ALL = "en_US.UTF-8";
         LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
-        SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+        SSL_CERT_FILE = "${pkgs.cacert}/etc/ca-bundle.crt";
       };
       serviceConfig = {
         User = user.name;
@@ -100,7 +100,6 @@ let
         ExecStart = pkgs.writeScript "urlwatch" ''
           #! /bin/sh
           set -euf
-
           from=${escapeShellArg cfg.from}
           mailto=${escapeShellArg cfg.mailto}
           urlsFile=${escapeShellArg urlsFile}
-- 
cgit v1.2.3


From 0a634d3a993fbf787811130da7383e7ba4b4818a Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 19 Aug 2015 17:54:11 +0200
Subject: krebs 3: make uriel secure

---
 krebs/3modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index f143e64b8..e508b919d 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -272,6 +272,7 @@ let
             '';
           };
         };
+        secure = true;
       };
       mors = {
         cores = 2;
-- 
cgit v1.2.3


From 5a1a36e1f2038df9ef7663f6675a2080a796b579 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 20 Aug 2015 15:57:12 +0200
Subject: krebs 3: fix uriel's email

---
 krebs/3modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index e508b919d..3d34ddf12 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -308,7 +308,7 @@ let
       };
       uriel = {
         pubkey = readFile ../../Zpubkeys/uriel.ssh.pub;
-        mail = "uriel@mors.retiolum";
+        mail = "lass@uriel.retiolum";
       };
     };
   };
-- 
cgit v1.2.3