From 6ec3d922a48ad6a583315a4433a7170e6850c676 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 17 Apr 2016 05:24:33 +0200
Subject: krebs.backup network-ssh-port -> pkgs.get-ssh-port

---
 krebs/5pkgs/default.nix              | 21 +++++++++++----------
 krebs/5pkgs/get-ssh-port/default.nix | 29 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 krebs/5pkgs/get-ssh-port/default.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 0c39324a7..5ec0d54e9 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -14,7 +14,16 @@ with config.krebs.lib;
       then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
       else override;
 
-  in {
+  in {}
+  // import ./builders.nix args
+  // mapAttrs (_: flip callPackage {})
+              (filterAttrs (_: dir.has-default-nix)
+                           (subdirsOf ./.))
+  // {
+    get-ssh-port = callPackage ./get-ssh-port {
+      inherit config;
+    };
+
     haskellPackages = pkgs.haskellPackages.override {
       overrides = self: super:
         mapAttrs (name: path: self.callPackage path {})
@@ -29,18 +38,10 @@ with config.krebs.lib;
             (builtins.readDir ./haskell-overrides));
     };
 
-    push = callPackage ./push {
-      inherit (subdirs) get;
-    };
-
     ReaktorPlugins = callPackage ./Reaktor/plugins.nix {};
 
     test = {
       infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {};
     };
-  }
-  // import ./builders.nix args
-  // mapAttrs (_: flip callPackage {})
-              (filterAttrs (_: dir.has-default-nix)
-                           (subdirsOf ./.));
+  };
 }
diff --git a/krebs/5pkgs/get-ssh-port/default.nix b/krebs/5pkgs/get-ssh-port/default.nix
new file mode 100644
index 000000000..2d106b2b6
--- /dev/null
+++ b/krebs/5pkgs/get-ssh-port/default.nix
@@ -0,0 +1,29 @@
+{ config, pkgs, ... }: with config.krebs.lib;
+
+pkgs.writeScriptBin "get-ssh-port" ''
+  #! ${pkgs.dash}/bin/dash
+  set -efu
+  if test $# != 1 || test $1 = -h || test $1 = --help; then
+    echo "usage: get-ssh-port HOSTNAME" >&2
+    exit 23
+  fi
+  case $1 in
+  ${concatMapStringsSep ";;\n"
+    (host: toString [
+      "(${shell.escape host.name})"
+      "echo ${toString host.nets.${config.krebs.search-domain}.ssh.port}"
+    ])
+    (filter (host: hasAttr config.krebs.search-domain host.nets)
+            (attrValues config.krebs.hosts))
+  };;
+  ${concatMapStringsSep ";;\n"
+    (net: toString [
+      "(${concatMapStringsSep "|" shell.escape net.aliases})"
+      "echo ${toString net.ssh.port}"
+    ])
+    (concatMap (host: attrValues host.nets) (attrValues config.krebs.hosts))
+  };;
+  (*) echo "get-ssh-port: don't know ssh port of $1" >&2
+      exit 1
+  esac
+''
-- 
cgit v1.2.3


From 41ff57c6d6a7ed4d8562169c0d3fd9d6adb949e6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 17 Apr 2016 10:25:59 +0200
Subject: krebs.backup: use globally configured ssh ports

---
 krebs/5pkgs/default.nix              |  4 ----
 krebs/5pkgs/get-ssh-port/default.nix | 29 -----------------------------
 2 files changed, 33 deletions(-)
 delete mode 100644 krebs/5pkgs/get-ssh-port/default.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 5ec0d54e9..bcc894b2c 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -20,10 +20,6 @@ with config.krebs.lib;
               (filterAttrs (_: dir.has-default-nix)
                            (subdirsOf ./.))
   // {
-    get-ssh-port = callPackage ./get-ssh-port {
-      inherit config;
-    };
-
     haskellPackages = pkgs.haskellPackages.override {
       overrides = self: super:
         mapAttrs (name: path: self.callPackage path {})
diff --git a/krebs/5pkgs/get-ssh-port/default.nix b/krebs/5pkgs/get-ssh-port/default.nix
deleted file mode 100644
index 2d106b2b6..000000000
--- a/krebs/5pkgs/get-ssh-port/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, pkgs, ... }: with config.krebs.lib;
-
-pkgs.writeScriptBin "get-ssh-port" ''
-  #! ${pkgs.dash}/bin/dash
-  set -efu
-  if test $# != 1 || test $1 = -h || test $1 = --help; then
-    echo "usage: get-ssh-port HOSTNAME" >&2
-    exit 23
-  fi
-  case $1 in
-  ${concatMapStringsSep ";;\n"
-    (host: toString [
-      "(${shell.escape host.name})"
-      "echo ${toString host.nets.${config.krebs.search-domain}.ssh.port}"
-    ])
-    (filter (host: hasAttr config.krebs.search-domain host.nets)
-            (attrValues config.krebs.hosts))
-  };;
-  ${concatMapStringsSep ";;\n"
-    (net: toString [
-      "(${concatMapStringsSep "|" shell.escape net.aliases})"
-      "echo ${toString net.ssh.port}"
-    ])
-    (concatMap (host: attrValues host.nets) (attrValues config.krebs.hosts))
-  };;
-  (*) echo "get-ssh-port: don't know ssh port of $1" >&2
-      exit 1
-  esac
-''
-- 
cgit v1.2.3


From 97c2e4bbd99f6034d550a83804e508c278045b67 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 21 May 2016 11:18:24 +0200
Subject: krebs.exim: validate config file syntax

---
 krebs/5pkgs/builders.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/builders.nix b/krebs/5pkgs/builders.nix
index 146e6f9e1..70d65cfc3 100644
--- a/krebs/5pkgs/builders.nix
+++ b/krebs/5pkgs/builders.nix
@@ -56,6 +56,14 @@ rec {
     '';
   };
 
+  writeEximConfig = name: text: pkgs.runCommand name {
+    inherit text;
+    passAsFile = [ "text" ];
+  } ''
+    ${pkgs.exim}/bin/exim -C "$textPath" -bV >/dev/null
+    mv "$textPath" $out
+  '';
+
   writeNixFromCabal = name: path: pkgs.runCommand name {} ''
     ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out
   '';
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/da200000.lock: No such file or directory (2)