diff options
| author | makefu <github@syntax-fehler.de> | 2015-10-14 00:17:15 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-10-14 00:17:15 +0200 |
| commit | df3dc3dac1f6c1cc36dbbea506e3d610aa1b417d (patch) | |
| tree | 038a837b20d267d0ba5aad837884b6a5a9087613 /tv | |
| parent | f73fe104d84b2f0d2fc3b4f0342c36735b3fb220 (diff) | |
| parent | 96f4248b65ff1539eded24572ae1805b27c53d50 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/1systems/cd.nix | 1 | ||||
| -rw-r--r-- | tv/1systems/wu.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/urlwatch.nix | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 4f66b3592..4f196095b 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -30,6 +30,7 @@ with lib; #../2configs/consul-server.nix ../2configs/exim-smarthost.nix ../2configs/git.nix + ../2configs/urlwatch.nix { imports = [ ../2configs/charybdis.nix ]; tv.charybdis = { diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index e54aed056..0ef846f93 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -32,7 +32,6 @@ with lib; ../2configs/xserver.nix ../2configs/synaptics.nix # TODO w110er if xserver is enabled ../2configs/test.nix - ../2configs/urlwatch.nix { environment.systemPackages = with pkgs; [ diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index 26e56e09c..c1c5d19d9 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -48,6 +48,9 @@ #http://hackage.haskell.org/package/transformers #http://hackage.haskell.org/package/web-routes-wai #http://hackage.haskell.org/package/web-page + + # ref <stockholm/krebs/3modules>, services.openssh.knownHosts.github* + https://help.github.com/articles/what-ip-addresses-does-github-use-that-i-should-whitelist/ ]; }; } |