diff options
| author | tv <tv@krebsco.de> | 2017-10-26 18:43:33 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-10-26 18:43:33 +0200 |
| commit | d5fd5107e6cd8e4d1cd0e63420d35a9df5279e7f (patch) | |
| tree | 05731b063ed6243632b6c3a61a329618da6a6951 /krebs | |
| parent | 1993cbc42114c759a47fed8de1e73980d3df57d9 (diff) | |
| parent | 458bd5f6bda5b5718959613ceb989862a530ed7b (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/2configs/news.nix | 1 | ||||
| -rw-r--r-- | krebs/3modules/lass/default.nix | 8 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/Reaktor/plugins.nix | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix index 56395c166..2628c7986 100644 --- a/krebs/2configs/news.nix +++ b/krebs/2configs/news.nix @@ -16,6 +16,7 @@ vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#news weechat|http://dev.weechat.org/feed/atom|#news xkcd|https://xkcd.com/rss.xml|#news + painload|https://github.com/krebscode/painload/commits/master.atom|#news ''; }; } diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 534eac716..3e03e71cb 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -437,8 +437,14 @@ with import <stockholm/lib>; ip4.addr = "129.215.90.4"; aliases = [ "eddie.i" ]; }; - retiolum = { + retiolum = rec { via = internet; + addrs = [ + # edinburgh university + "129.215.0.0/16" + ip4.addr + ip6.addr + ]; ip4.addr = "10.243.29.170"; ip6.addr = "42:4992:6a6d:700::1"; aliases = [ "eddie.r" ]; diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix index c611d7471..518e80d0e 100644 --- a/krebs/5pkgs/simple/Reaktor/plugins.nix +++ b/krebs/5pkgs/simple/Reaktor/plugins.nix @@ -144,7 +144,8 @@ rec { ''; }; wiki-todo-show = buildSimpleReaktorPlugin "wiki-todo" { - script = pkgs.writeDash "wiki-todo-add" '' + pattern = "^wiki-show$"; + script = pkgs.writeDash "wiki-show" '' ${pkgs.coreutils}/bin/cat wiki-todo ''; }; |