Merge remote-tracking branch 'prism/master'
This commit is contained in:
commit
7b5393fca1
|
@ -132,7 +132,7 @@ let
|
||||||
|
|
||||||
services.openssh.hostKeys =
|
services.openssh.hostKeys =
|
||||||
let inherit (config.krebs.build.host.ssh) privkey; in
|
let inherit (config.krebs.build.host.ssh) privkey; in
|
||||||
mkIf (privkey != null) (mkForce [privkey]);
|
mkIf (privkey != null) [privkey];
|
||||||
|
|
||||||
# TODO use imports for merging
|
# TODO use imports for merging
|
||||||
services.openssh.knownHosts =
|
services.openssh.knownHosts =
|
||||||
|
|
|
@ -15,7 +15,7 @@ pkgs.writeDashBin "irc-announce" ''
|
||||||
|
|
||||||
IRC_SERVER=$1
|
IRC_SERVER=$1
|
||||||
IRC_PORT=$2
|
IRC_PORT=$2
|
||||||
IRC_NICK=$3$$
|
IRC_NICK=$3_$$
|
||||||
IRC_CHANNEL=$4
|
IRC_CHANNEL=$4
|
||||||
message=$5
|
message=$5
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user