[Pkg-silc-commits] r266 - in /silc-server/trunk/debian: changelog silcd.conf.default

[lunar at users.alioth.debian.org]

Author: lunar
Date: Mon Apr 14 19:39:22 2008
New Revision: 266

URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=266
Log:
* Upgrade silcd.conf.default to last upstream example configuration.

Modified:
    silc-server/trunk/debian/changelog
    silc-server/trunk/debian/silcd.conf.default

Modified: silc-server/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/changelog?rev=266&op=diff
==============================================================================
--- silc-server/trunk/debian/changelog (original)
+++ silc-server/trunk/debian/changelog Mon Apr 14 19:39:22 2008
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Upstream changelog has been renamed from CHANGES to ChangeLog.
+  * Upgrade silcd.conf.default to last upstream example configuration.
 
  -- Jérémy Bobbio <lunar at debian.org>  Mon, 14 Apr 2008 20:57:56 +0200
 

Modified: silc-server/trunk/debian/silcd.conf.default
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/silcd.conf.default?rev=266&op=diff
==============================================================================
--- silc-server/trunk/debian/silcd.conf.default (original)
+++ silc-server/trunk/debian/silcd.conf.default Mon Apr 14 19:39:22 2008
@@ -1,7 +1,8 @@
 #
 # silcd.conf
 #
-# Main Debian configuration file for the SILC server.  Some option in this file # are managed using debconf.  You can invoke `dpkg-reconfigure silcd` if
+# Main Debian configuration file for the SILC server.  Some option in this file
+# are managed using debconf.  You can invoke `dpkg-reconfigure silcd` if
 # you want to change such options.
 #
 # The syntax and options of this file are documented in silcd.conf(5).
@@ -33,11 +34,6 @@
 # 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 = "";
-
 	# 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
@@ -79,6 +75,17 @@
 	# 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 at 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