From bf4e2bd961b27d68e392cd1a53637b19feb887e4 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 28 Dec 2016 09:13:53 +0100 Subject: Revert "k 5 irc-announce: cd to /tmp" This reverts commit 3ecebca46f8924de9dd97bd79a1f0272f39d9ae6. --- krebs/5pkgs/irc-announce/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/irc-announce/default.nix b/krebs/5pkgs/irc-announce/default.nix index af6b35ec6..f02cec3c6 100644 --- a/krebs/5pkgs/irc-announce/default.nix +++ b/krebs/5pkgs/irc-announce/default.nix @@ -29,8 +29,6 @@ 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 -- cgit v1.2.3 From 4f87f3bf4ada67f7041c58af91073ce7062ac493 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 28 Dec 2016 09:14:33 +0100 Subject: irc-announce: mktemp --tmpdir --- krebs/5pkgs/irc-announce/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/5pkgs/irc-announce/default.nix b/krebs/5pkgs/irc-announce/default.nix index f02cec3c6..e1f4919d5 100644 --- a/krebs/5pkgs/irc-announce/default.nix +++ b/krebs/5pkgs/irc-announce/default.nix @@ -32,7 +32,7 @@ pkgs.writeDashBin "irc-announce" '' # 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 " -- cgit v1.2.3 From c263e650012d6b29b8fbc4885dd0b771173fd0f4 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 28 Dec 2016 09:32:36 +0100 Subject: shared: test ip4 addr 10.243.111.111 -> 10.243.73.57 --- krebs/3modules/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/shared/default.nix index a05889632..498303601 100644 --- a/krebs/3modules/shared/default.nix +++ b/krebs/3modules/shared/default.nix @@ -13,7 +13,7 @@ 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" -- cgit v1.2.3 From deb6764522b9aedc796ccee27311089b965da9ad Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 28 Dec 2016 09:33:30 +0100 Subject: shared: don't define test aliases --- krebs/3modules/shared/default.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/shared/default.nix index 498303601..8870f039c 100644 --- a/krebs/3modules/shared/default.nix +++ b/krebs/3modules/shared/default.nix @@ -15,10 +15,6 @@ let retiolum = { 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 -- cgit v1.2.3