summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-01-05 15:42:32 +0100
committermakefu <github@syntax-fehler.de>2017-01-05 15:42:32 +0100
commit137cef757991c99aca9991e30c6ff680c3692910 (patch)
tree7398ac2c10443cab7166c68a504aad2d275dc66b /krebs
parentc1952c2d2bf84a7266da5092c0f9eef1561d49ce (diff)
parent2e9d5f604c32c9c938a90c3211d5b7726d17f9ee (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/shared/default.nix6
-rw-r--r--krebs/5pkgs/irc-announce/default.nix4
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 "