Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
38b11b5ba4
|
@ -13,12 +13,8 @@ let
|
||||||
cores = 1;
|
cores = 1;
|
||||||
nets = {
|
nets = {
|
||||||
retiolum = {
|
retiolum = {
|
||||||
ip4.addr = "10.243.111.111";
|
ip4.addr = "10.243.73.57";
|
||||||
ip6.addr = "42:0:0:0:0:0:0:7357";
|
ip6.addr = "42:0:0:0:0:0:0:7357";
|
||||||
aliases = [
|
|
||||||
"test.r"
|
|
||||||
"test.retiolum"
|
|
||||||
];
|
|
||||||
tinc.pubkey = ''
|
tinc.pubkey = ''
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
MIIBCgKCAQEAy41YKF/wpHLnN370MSdnAo63QUW30aw+6O79cnaJyxoL6ZQkk4Nd
|
MIIBCgKCAQEAy41YKF/wpHLnN370MSdnAo63QUW30aw+6O79cnaJyxoL6ZQkk4Nd
|
||||||
|
|
|
@ -29,12 +29,10 @@ pkgs.writeDashBin "irc-announce" ''
|
||||||
# privmsg_cat transforms stdin to a privmsg
|
# privmsg_cat transforms stdin to a privmsg
|
||||||
privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; }
|
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"
|
# ircin is used to feed the output of netcat back to the "irc client"
|
||||||
# so we can implement expect-like behavior with sed^_^
|
# so we can implement expect-like behavior with sed^_^
|
||||||
# XXX mkselfdestructingtmpfifo would be nice instead of this cruft
|
# XXX mkselfdestructingtmpfifo would be nice instead of this cruft
|
||||||
tmpdir="$(mktemp -d irc-announce_XXXXXXXX)"
|
tmpdir=$(mktemp --tmpdir -d irc-announce_XXXXXXXX)
|
||||||
cd "$tmpdir"
|
cd "$tmpdir"
|
||||||
mkfifo ircin
|
mkfifo ircin
|
||||||
trap "
|
trap "
|
||||||
|
|
Loading…
Reference in New Issue
Block a user