diff options
| -rw-r--r-- | krebs/3modules/shared/default.nix | 6 | ||||
| -rw-r--r-- | krebs/5pkgs/irc-announce/default.nix | 4 | ||||
| -rw-r--r-- | lass/2configs/tests/dummy-secrets/grafana_security.nix | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/shared/default.nix index a0588963..8870f039 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 af6b35ec..e1f4919d 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 " diff --git a/lass/2configs/tests/dummy-secrets/grafana_security.nix b/lass/2configs/tests/dummy-secrets/grafana_security.nix new file mode 100644 index 00000000..ef75d4e0 --- /dev/null +++ b/lass/2configs/tests/dummy-secrets/grafana_security.nix @@ -0,0 +1,4 @@ +{ + adminUser = "bla"; + adminPassword = "blub"; +} |