diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-22 01:08:46 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-22 01:08:46 +0100 |
| commit | 020fcc22000ce35337a765bfa37f4178fbbff68c (patch) | |
| tree | 8485531b5285b4dce6e9b9abecba4ccad5b9b46a /tv/1systems | |
| parent | 2924afb8a2cb7d734b56a4a8934737129a20154c (diff) | |
| parent | a2b8eb75506fa27bc3d44f6a33d860ce7d3470e0 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems')
| -rw-r--r-- | tv/1systems/cd.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 9b6382607..687f17951 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -14,11 +14,14 @@ with config.krebs.lib; ../2configs/retiolum.nix ../2configs/urlwatch.nix { - imports = [ ../2configs/charybdis.nix ]; tv.charybdis = { enable = true; - sslCert = ../Zcerts/charybdis_cd.crt.pem; + ssl_cert = ../Zcerts/charybdis_cd.crt.pem; }; + tv.iptables.input-retiolum-accept-new-tcp = [ + config.tv.charybdis.port + config.tv.charybdis.sslport + ]; } { tv.ejabberd = { |