Merge remote-tracking branch 'lass/master'

4 files changed, 71 insertions, 64 deletions

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 2d1819dee..6f79aea0e 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -298,6 +298,7 @@ with import <stockholm/lib>;
           '';
         };
       };
+      secure = true;
       ssh.privkey.path = <secrets/ssh.id_ed25519>;
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOPgQIMYiyD4/Co+nlOQWEzCKssemOEXAY/lbIZZaMhj";
     };
diff --git a/krebs/3modules/realwallpaper.nix b/krebs/3modules/realwallpaper.nix
index 1564bd94a..f9eae8c92 100644
--- a/krebs/3modules/realwallpaper.nix
+++ b/krebs/3modules/realwallpaper.nix
@@ -24,7 +24,7 @@ let
 
     daymap = mkOption {
       type = types.str;
-      default = "http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png";
+      default = "https://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png";
     };
 
     cloudmap = mkOption {
diff --git a/krebs/5pkgs/git-hooks/default.nix b/krebs/5pkgs/git-hooks/default.nix
index 6f2cb8b6a..9355a878c 100644
--- a/krebs/5pkgs/git-hooks/default.nix
+++ b/krebs/5pkgs/git-hooks/default.nix
@@ -108,67 +108,5 @@ let
     fi
   '';
 
-  irc-announce-script = pkgs.writeDash "irc-announce-script" ''
-    set -euf
-
-    export PATH=${makeSearchPath "bin" (with pkgs; [
-      coreutils
-      gawk
-      gnused
-      netcat
-      nettools
-    ])}
-
-    IRC_SERVER=$1
-    IRC_PORT=$2
-    IRC_NICK=$3$$
-    IRC_CHANNEL=$4
-    message=$5
-
-    export IRC_CHANNEL # for privmsg_cat
-
-    # echo2 and cat2 are used output to both, stdout and stderr
-    # This is used to see what we send to the irc server. (debug output)
-    echo2() { echo "$*"; echo "$*" >&2; }
-    cat2() { tee /dev/stderr; }
-
-    # privmsg_cat transforms stdin to a privmsg
-    privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; }
-
-    # ircin is used to feed the output of netcat back to the "irc client"
-    # so we can implement expect-like behavior with sed^_^
-    # XXX mkselfdestructingtmpfifo would be nice instead of this cruft
-    tmpdir="$(mktemp -d irc-announce_XXXXXXXX)"
-    cd "$tmpdir"
-    mkfifo ircin
-    trap "
-      rm ircin
-      cd '$OLDPWD'
-      rmdir '$tmpdir'
-      trap - EXIT INT QUIT
-    " EXIT INT QUIT
-
-    {
-      echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)"
-      echo2 "NICK $IRC_NICK"
-
-      # wait for MODE message
-      sed -n '/^:[^ ]* MODE /q'
-
-      echo2 "JOIN $IRC_CHANNEL"
-
-      printf '%s' "$message" \
-        | privmsg_cat \
-        | cat2
-
-      echo2 "PART $IRC_CHANNEL"
-
-      # wait for PART confirmation
-      sed -n '/:'"$IRC_NICK"'![^ ]* PART /q'
-
-      echo2 'QUIT :Gone to have lunch'
-    } < ircin \
-      | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin
-  '';
-
+  irc-announce-script = "${pkgs.irc-announce}/bin/irc-announce";
 in out
diff --git a/krebs/5pkgs/irc-announce/default.nix b/krebs/5pkgs/irc-announce/default.nix
new file mode 100644
index 000000000..af6b35ec6
--- /dev/null
+++ b/krebs/5pkgs/irc-announce/default.nix
@@ -0,0 +1,68 @@
+{ pkgs, lib, ... }:
+
+with lib;
+
+pkgs.writeDashBin "irc-announce" ''
+  set -euf
+
+  export PATH=${makeSearchPath "bin" (with pkgs; [
+    coreutils
+    gawk
+    gnused
+    netcat
+    nettools
+  ])}
+
+  IRC_SERVER=$1
+  IRC_PORT=$2
+  IRC_NICK=$3$$
+  IRC_CHANNEL=$4
+  message=$5
+
+  export IRC_CHANNEL # for privmsg_cat
+
+  # echo2 and cat2 are used output to both, stdout and stderr
+  # This is used to see what we send to the irc server. (debug output)
+  echo2() { echo "$*"; echo "$*" >&2; }
+  cat2() { tee /dev/stderr; }
+
+  # privmsg_cat transforms stdin to a privmsg
+  privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; }
+
+  # we cd to /tmp here to be able to create a tmpdir in the first place
+  cd /tmp
+  # ircin is used to feed the output of netcat back to the "irc client"
+  # so we can implement expect-like behavior with sed^_^
+  # XXX mkselfdestructingtmpfifo would be nice instead of this cruft
+  tmpdir="$(mktemp -d irc-announce_XXXXXXXX)"
+  cd "$tmpdir"
+  mkfifo ircin
+  trap "
+    rm ircin
+    cd '$OLDPWD'
+    rmdir '$tmpdir'
+    trap - EXIT INT QUIT
+  " EXIT INT QUIT
+
+  {
+    echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)"
+    echo2 "NICK $IRC_NICK"
+
+    # wait for MODE message
+    sed -n '/^:[^ ]* MODE /q'
+
+    echo2 "JOIN $IRC_CHANNEL"
+
+    printf '%s' "$message" \
+      | privmsg_cat \
+      | cat2
+
+    echo2 "PART $IRC_CHANNEL"
+
+    # wait for PART confirmation
+    sed -n '/:'"$IRC_NICK"'![^ ]* PART /q'
+
+    echo2 'QUIT :Gone to have lunch'
+  } < ircin \
+    | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin
+''