diff options
| author | lassulus <lass@aidsballs.de> | 2015-07-23 02:26:42 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-07-23 02:26:42 +0200 |
| commit | 0db3f4ee695148b60238861384b86f0fdc880459 (patch) | |
| tree | 8249b4e2713aeabdf4a9d1aeee4c38e1a527e487 /2configs/tv/charybdis.nix | |
| parent | b590d9e21d8c99a91fd419c3e0bea949a9ac6849 (diff) | |
| parent | 791a7e79977de76908ab9e33eb64cbd2b02da3ed (diff) | |
Merge branch 'tv' into master
Diffstat (limited to '2configs/tv/charybdis.nix')
| -rw-r--r-- | 2configs/tv/charybdis.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/2configs/tv/charybdis.nix b/2configs/tv/charybdis.nix index f4b7c1012..a45c7aebe 100644 --- a/2configs/tv/charybdis.nix +++ b/2configs/tv/charybdis.nix @@ -74,7 +74,7 @@ let user = { name = "charybdis"; - uid = 3731512864; # genid charybdis + uid = 3748224544; # genid charybdis }; configFile = toFile "charybdis-ircd.conf" '' @@ -123,7 +123,7 @@ let #loadmodule "extensions/ip_cloaking.so"; serverinfo { - name = ${toJSON config.tv.identity.self.fqdn}; + name = ${toJSON (head config.tv.identity.self.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 = ${toJSON config.tv.identity.self.addr}; + vhost = ${concatMapStringsSep ", " toJSON config.tv.identity.self.nets.retiolum.addrs4}; /* for IPv6 */ - vhost6 = ${toJSON config.tv.identity.self.addr6}; + vhost6 = ${concatMapStringsSep ", " toJSON config.tv.identity.self.nets.retiolum.addrs6}; /* ssl_private_key: our ssl private key */ ssl_private_key = "/tmp/ssl.key"; @@ -238,12 +238,10 @@ let /* If you want to listen on a specific IP only, specify host. * host definitions apply only to the following port line. */ - host = ${toJSON config.tv.identity.self.addr}; - port = 6667; - sslport = 6697; - - /* Listen on IPv6 (if you used host= above). */ - host = ${toJSON config.tv.identity.self.addr6}; + # XXX This is stupid because only one host is allowed[?] + #host = ''${concatMapStringsSep ", " toJSON ( + # config.tv.identity.self.nets.retiolum.addrs + #)}; port = 6667; sslport = 6697; }; |