Revert "collapse zero activity"

[KiwiIRC.git] / config.example.js

diff --git a/config.example.js b/config.example.js
index 03f73cc0556dd0280e07a22ceff22b6b90d5a56b..674f8f999712fc4bb5142fae44f35fa87c499ce1 100644 (file)
--- a/config.example.js
+++ b/config.example.js
@@ -54,7 +54,10 @@ conf.public_http = "client/";
 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.
+// 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;
 
 
@@ -117,6 +120,33 @@ conf.http_proxy_ip_header = "x-forwarded-for";
 conf.http_base_path = "/kiwi";
 
 
+/*
+ * SOCKS (version 5) proxy settings
+ * This feature is only available on node 0.10.0 and above.
+ * Do not enable it if you're running 0.8 or below or Bad Things will happen.
+ */
+conf.socks_proxy = {};
+
+// Enable proxying outbound connections through a SOCKS proxy
+conf.socks_proxy.enabled = false;
+
+// Proxy *all* outbound connections through a SOCKS proxy
+conf.socks_proxy.all = false;
+
+// Use SOCKS proxy for these hosts only (if conf.sock_proxy.all === false)
+conf.socks_proxy.proxy_hosts = [
+    "irc.example.com"
+];
+
+// Host and port for the SOCKS proxy
+conf.socks_proxy.address = '127.0.0.1';
+conf.socks_proxy.port = 1080;
+
+// Username and password for the SOCKS proxy
+// Set user to null to disable password authentication
+conf.socks_proxy.user = null;
+conf.socks_proxy.pass = null;
+
 
 // Enabled transports for the browser to use
 conf.transports = [