Merge branch 'master' into development

[KiwiIRC.git] / config.example.js

diff --git a/config.example.js b/config.example.js
index 6d91eaa355c1bf589c2a4d723bff711f448bf479..9732497638973b4b6108ed5a35681ce75ce3b884 100644 (file)
--- a/config.example.js
+++ b/config.example.js
@@ -53,6 +53,13 @@ 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,
+//   - Kiwi is configured to send the client's ip as a username for the server, or
+//   - Kiwi is running in restricted server mode.
+conf.max_server_conns = 0;
+
 
 /*
  * Client side plugins
@@ -163,7 +170,15 @@ conf.client = {
     port:    6697,
     ssl:     true,
     channel: '#kiwiirc',
-    nick:    'kiwi_?'
+    nick:    'kiwi_?',
+    settings: {
+        theme: 'relaxed',
+        channel_list_style: 'tabs',
+        scrollback: 250,
+        show_joins_parts: true,
+        show_timestamps: false,
+        mute_sounds: false
+    }
 };