X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=doc%2Fexample_silcd.conf.in;h=32bb7be4545af70c56f69e119ab74389509f38cf;hp=2610cb23ba34be08461735a7b49472551f5c236e;hb=ec4e92ff1f602334c42883b6fe65bb2a0abbc221;hpb=413da0f8686910f5e627393157566ae729ca99c4

diff --git a/doc/example_silcd.conf.in b/doc/example_silcd.conf.in
index 2610cb23..32bb7be4 100644
--- a/doc/example_silcd.conf.in
+++ b/doc/example_silcd.conf.in
@@ -32,11 +32,6 @@ Include "@ETCDIR@/silcalgs.conf";
 # for different connections.
 #
 General {
-	# This is the default path where to search modules.  If omitted
-	# built-in modules will be used.  Built-in modules will also be
-	# used if a module file cannot be located.
-	module_path = "@MODULESDIR@";
-
 	# If both passphrase and public key authentication is set for a
 	# connection the public key authentication is the preferred one
 	# to use.  Set this to `true' to prefer passphrase authentication
@@ -48,8 +43,9 @@ General {
 	# without FQDN cannot connect to the server.
 	#require_reverse_lookup = true;
 
-	# Maximum number of incoming connections allowed to this server.
-	# If more attempt to connect they will be refused.
+	# Maximum number of connections server can handle.  If you want
+	# to limit the number of incoming connections, define the
+	# connections_max in the ConnectionParams.
 	connections_max = 1000;
 
 	# Maximum number of incoming connections allowed per single host.
@@ -70,14 +66,25 @@ General {
 	# number of the software.  The string can be a regex string to match
 	# more widely.  Usually the vendor version checking is not necessary
 	# and can be omitted.  These can be overridden with ConnectionParams.
-	#version_protocol = "1.1";
-	#version_software = "1.3";
+	#version_protocol = "1.3";
+	#version_software = "2.0";
 	#version_software_vendor = "SomeVendor";
 
 	# Default keepalive frequency (seconds).  This can be overridden with
 	# with ConnectionParams.
 	keepalive_secs = 300;
 
+	# Dynamic router connections.  If this is set for normal SILC server
+	# the connection to primary router is not created untill it is actually
+	# needed.  Giving for example /WHOIS foobar@silcnet.org would then
+	# create connection to the primary router to resolve user foobar.
+	# On the other hand giving /WHOIS foobar would try to search the
+	# user foobar locally, without creating the connection.  Note that
+	# giving /JOIN foobar will also created the connection as current
+	# SILC Server version supports only global channels (all JOINs require
+	# connection to router, if one is configured).
+	#dynamic_server = true;
+
 	# Default reconnection parameters defines how the server reconnect
 	# to the remote if the connection was lost.  The reconnection phase
 	# use so called exponential backoff algorithm;  The reconnect
@@ -158,6 +165,15 @@ General {
 	#qos_limit_sec = 0;
 	#qos_limit_usec = 500000;
 
+	# Limit on how many channels one client can join.  Default is 50.
+	#channel_join_limit = 100;
+
+	# HTTP server access to the server for retrieving server statistics
+	# with a web browser.  This is disabled by default.
+	#http_server = true;
+	#http_server_ip = "127.0.0.1";
+	#http_server_port = 5000;
+
 	# Debug string.  Debug string can be set to print debugging from
 	# the running server.  The debug is redirected to stderr.
 	# debug_string = "";
@@ -174,10 +190,12 @@ ServerInfo {
 
 	#
 	# Primary listener.  Specify the IP address and the port to bind
-	# the server.
+	# the server.  The public_ip can be used to specify the public IP
+	# if the server is behind NAT.
 	#
 	Primary {
 		ip = "10.2.1.6";
+		# public_ip = "11.1.1.1";
 		port = 706;
 	};