Merge branch 'master' of prism.r:stockholm

This commit is contained in:
jeschli 2019-04-30 19:19:55 +02:00
commit 97b78b45a8
2 changed files with 2 additions and 2 deletions

View File

@ -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 =

View File

@ -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