summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2019-04-30 19:12:48 +0200
committertv <tv@krebsco.de>2019-04-30 19:12:48 +0200
commit7b5393fca1d5bdbcfcb954ebe9d209f77a67ec1d (patch)
treeef84fd0a0d3f91ddd3cf18f5da06af2186fe3543
parent1040fa21a577128c7cb826a1e2bb57c448eb6d24 (diff)
parent222160fc3a195415e859048bdef21f703154b3ee (diff)
Merge remote-tracking branch 'prism/master'
-rw-r--r--krebs/3modules/default.nix2
-rw-r--r--krebs/5pkgs/simple/irc-announce/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 734d6c781..10a33d5d7 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -132,7 +132,7 @@ let
services.openssh.hostKeys =
let inherit (config.krebs.build.host.ssh) privkey; in
- mkIf (privkey != null) (mkForce [privkey]);
+ mkIf (privkey != null) [privkey];
# TODO use imports for merging
services.openssh.knownHosts =
diff --git a/krebs/5pkgs/simple/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix
index e1f4919d5..b22e67535 100644
--- a/krebs/5pkgs/simple/irc-announce/default.nix
+++ b/krebs/5pkgs/simple/irc-announce/default.nix
@@ -15,7 +15,7 @@ pkgs.writeDashBin "irc-announce" ''
IRC_SERVER=$1
IRC_PORT=$2
- IRC_NICK=$3$$
+ IRC_NICK=$3_$$
IRC_CHANNEL=$4
message=$5