diff options
| author | makefu <github@syntax-fehler.de> | 2015-07-26 18:11:09 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-07-26 18:11:09 +0200 |
| commit | c355a1d86250aca3f5757082ddd392ef867ca4ee (patch) | |
| tree | a9a596081878d3117e625b9ce164c82339e35812 /2configs/tv/charybdis.nix | |
| parent | f338d3d4d15ff29b3048b4f89716a8aa1a19f21b (diff) | |
| parent | cea33984057136ea0deac369650e490f420b5445 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to '2configs/tv/charybdis.nix')
| -rw-r--r-- | 2configs/tv/charybdis.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/2configs/tv/charybdis.nix b/2configs/tv/charybdis.nix index a45c7aebe..d78e162cb 100644 --- a/2configs/tv/charybdis.nix +++ b/2configs/tv/charybdis.nix @@ -123,7 +123,7 @@ let #loadmodule "extensions/ip_cloaking.so"; serverinfo { - name = ${toJSON (head config.tv.identity.self.nets.retiolum.aliases)}; + name = ${toJSON (head config.krebs.build.host.nets.retiolum.aliases)}; sid = "4z3"; description = "miep!"; network_name = "irc.retiolum"; @@ -133,9 +133,9 @@ let /* 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.tv.identity.self.nets.retiolum.addrs4}; + vhost = ${concatMapStringsSep ", " toJSON config.krebs.build.host.nets.retiolum.addrs4}; /* for IPv6 */ - vhost6 = ${concatMapStringsSep ", " toJSON config.tv.identity.self.nets.retiolum.addrs6}; + vhost6 = ${concatMapStringsSep ", " toJSON config.krebs.build.host.nets.retiolum.addrs6}; /* ssl_private_key: our ssl private key */ ssl_private_key = "/tmp/ssl.key"; @@ -170,7 +170,7 @@ let admin { name = "tv"; description = "peer"; - email = "tv@wu.retiolum"; + mail = "${config.krebs.users.tv.mail}"; }; log { @@ -240,7 +240,7 @@ let */ # XXX This is stupid because only one host is allowed[?] #host = ''${concatMapStringsSep ", " toJSON ( - # config.tv.identity.self.nets.retiolum.addrs + # config.krebs.build.host.nets.retiolum.addrs #)}; port = 6667; sslport = 6697; |