diff options
| author | lassulus <lass@lassul.us> | 2016-12-28 12:42:58 +0100 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2016-12-28 12:42:58 +0100 |
| commit | 38b11b5ba4423421adeb13f5c510286587080627 (patch) | |
| tree | 1ce268cd8c784c60491b00e320d18f0781bb9a91 | |
| parent | e205e09a20c0ad310e7397d8e4fd69f13259050c (diff) | |
| parent | deb6764522b9aedc796ccee27311089b965da9ad (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | krebs/3modules/shared/default.nix | 6 | ||||
| -rw-r--r-- | krebs/5pkgs/irc-announce/default.nix | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/shared/default.nix index a05889632..8870f039c 100644 --- a/krebs/3modules/shared/default.nix +++ b/krebs/3modules/shared/default.nix @@ -13,12 +13,8 @@ let cores = 1; nets = { retiolum = { - ip4.addr = "10.243.111.111"; + ip4.addr = "10.243.73.57"; ip6.addr = "42:0:0:0:0:0:0:7357"; - aliases = [ - "test.r" - "test.retiolum" - ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAy41YKF/wpHLnN370MSdnAo63QUW30aw+6O79cnaJyxoL6ZQkk4Nd diff --git a/krebs/5pkgs/irc-announce/default.nix b/krebs/5pkgs/irc-announce/default.nix index af6b35ec6..e1f4919d5 100644 --- a/krebs/5pkgs/irc-announce/default.nix +++ b/krebs/5pkgs/irc-announce/default.nix @@ -29,12 +29,10 @@ pkgs.writeDashBin "irc-announce" '' # 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)" + tmpdir=$(mktemp --tmpdir -d irc-announce_XXXXXXXX) cd "$tmpdir" mkfifo ircin trap " |