diff options
| author | lassulus <lass@aidsballs.de> | 2016-04-09 00:49:56 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-04-09 00:49:56 +0200 |
| commit | e57841421bbb818572145dfec3dce12bf40017b4 (patch) | |
| tree | 329c116cccc0e10bb6bcc74331933171bf195f12 /tv/3modules | |
| parent | 5268f22ee99672a2185b959231208a23fd24f073 (diff) | |
| parent | 345efd36833fc0ada2805b46fd71bcc9642f4374 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/3modules')
| -rw-r--r-- | tv/3modules/charybdis/config.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tv/3modules/charybdis/config.nix b/tv/3modules/charybdis/config.nix index e4d754ff3..1b160926c 100644 --- a/tv/3modules/charybdis/config.nix +++ b/tv/3modules/charybdis/config.nix @@ -56,9 +56,9 @@ in toFile "charybdis.conf" '' /* On multi-homed hosts you may need the following. These define * the addresses we connect from to other servers. */ /* for IPv4 */ - vhost = ${concatMapStringsSep ", " toJSON config.krebs.build.host.nets.retiolum.addrs4}; + vhost = ${toJSON config.krebs.build.host.nets.retiolum.ip4.addr}; /* for IPv6 */ - vhost6 = ${concatMapStringsSep ", " toJSON config.krebs.build.host.nets.retiolum.addrs6}; + vhost6 = ${toJSON config.krebs.build.host.nets.retiolum.ip6.addr}; /* ssl_private_key: our ssl private key */ ssl_private_key = ${toJSON cfg.ssl_private_key.path}; @@ -160,10 +160,7 @@ in toFile "charybdis.conf" '' /* If you want to listen on a specific IP only, specify host. * host definitions apply only to the following port line. */ - # XXX This is stupid because only one host is allowed[?] - #host = ''${concatMapStringsSep ", " toJSON ( - # config.krebs.build.host.nets.retiolum.addrs - #)}; + #host = ${toJSON config.krebs.build.host.nets.retiolum.ip4.addr}; port = ${toString cfg.port}; sslport = ${toString cfg.sslport}; }; |