Mergability with development branch

[KiwiIRC.git] / config.example.js

diff --git a/config.example.js b/config.example.js
index bf107638ba8e0e17151d087ac81ccb295d280245..03f73cc0556dd0280e07a22ceff22b6b90d5a56b 100644 (file)
--- a/config.example.js
+++ b/config.example.js
@@ -35,6 +35,15 @@ conf.servers.push({
 
 
 
+// Do we want to enable the built in Identd server?
+conf.identd = {
+    enabled: false,
+    port: 113,
+    address: "0.0.0.0"
+};
+
+
+
 
 
 
@@ -44,6 +53,10 @@ conf.public_http = "client/";
 // Max connections per connection. 0 to disable
 conf.max_client_conns = 5;
 
+// Max connections per server. 0 to disable.
+// Setting is ignored if there is a WEBIRC password configured for the server or kiwi is running in restricted server mode.
+conf.max_server_conns = 0;
+
 
 /*
  * Client side plugins
@@ -63,10 +76,10 @@ conf.cap_options = [];
 
 
 // Directory to find the server modules
-conf.module_dir = "./kiwi_modules/";
+conf.module_dir = "../server_modules/";
 
 // Which modules to load
-conf.modules = ["spamfilter", "statistics"];
+conf.modules = [];
 
 
 
@@ -79,8 +92,8 @@ conf.webirc_pass = {
 
 // Some IRCDs require the clients IP via the username/ident
 conf.ip_as_username = [
-       "irc.network.com",
-       "127.0.0.1"
+    //"irc.network.com",
+    //"127.0.0.1"
 ];
 
 // Whether to verify IRC servers' SSL certificates against built-in well-known certificate authorities
@@ -93,6 +106,7 @@ conf.reject_unauthorised_certificates = false;
  * Reverse proxies that have been reported to work can be found at:
  *     http://github.com/prawnsalad/KiwiIRC/wiki/Running-behind-a-proxy
  */
+
 // Whitelisted HTTP proxies in CIDR format
 conf.http_proxies = ["127.0.0.1/32"];
 
@@ -120,7 +134,17 @@ conf.transports = [
 conf.quit_message = "http://www.kiwiirc.com/ - A hand-crafted IRC client";
 
 
-// If not empty, the client may only connect to this 1 IRC server
+// Default settings for the client. These may be changed in the browser
+conf.client = {
+    server: 'irc.kiwiirc.com',
+    port:    6697,
+    ssl:     true,
+    channel: '#kiwiirc',
+    nick:    'kiwi_?'
+};
+
+
+// If set, the client may only connect to this 1 IRC server
 //conf.restrict_server = "irc.kiwiirc.com";
 //conf.restrict_server_port = 6667;
 //conf.restrict_server_ssl = false;
@@ -129,7 +153,9 @@ conf.quit_message = "http://www.kiwiirc.com/ - A hand-crafted IRC client";
 //conf.restrict_server_nick = "kiwi_";
 
 
+
+
 /*
  * Do not ammend the below lines unless you understand the changes!
  */
-module.exports.production = conf;
\ No newline at end of file
+module.exports.production = conf;