Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2019-04-14 14:15:08 +02:00
commit 13388e1d9c
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/lass/default.nix
View File

@ -20,6 +20,7 @@ in {
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
cache IN A ${nets.internet.ip4.addr} cache IN A ${nets.internet.ip4.addr}
p IN A ${nets.internet.ip4.addr}
paste IN A ${nets.internet.ip4.addr} paste IN A ${nets.internet.ip4.addr}
prism IN A ${nets.internet.ip4.addr} prism IN A ${nets.internet.ip4.addr}
''; '';
@ -38,7 +39,6 @@ in {
io 60 IN NS ions.lassul.us. io 60 IN NS ions.lassul.us.
ions 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr} ions 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr}
lol 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr} lol 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr}
p 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr}
paste 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr} paste 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr}
radio 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr} radio 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr}
''; '';

12
krebs/5pkgs/simple/krebspaste/default.nix
View File

@ -1,6 +1,12 @@
{ writeDashBin, bepasty-client-cli }: { bepasty-client-cli, gnused, writeDashBin }:
# TODO use `pkgs.exec` instead?
writeDashBin "krebspaste" '' writeDashBin "krebspaste" ''
exec ${bepasty-client-cli}/bin/bepasty-cli -L 1m --url http://paste.r "$@" | sed '$ s/$/\/+inline/g' ${bepasty-client-cli}/bin/bepasty-cli -L 1m --url http://paste.r "$@" |
${gnused}/bin/sed '
$ {
s/$/\/+inline/
p
s/\<r\>/krebsco.de/
}
'
'' ''