Avoid syntax error when importing leaf servers from an old config.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1328 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index c404bdd4f6ab2bc9abfadafeb0e2bd60bafb44da..0e8f7b6810765ccc2531d2c075443e3e1dbfe0b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-19  Michael Poole <mdpoole@troilus.org>
+
+       * doc/example.conf (Connect): Remove a buggy comment about leaf
+       directives; refer the reader to the Connect block instead.
+
+       * tools/convert-conf.py: Set "leaf;" rather than "leaf = yes;"
+
 2005-03-19  Michael Poole <mdpoole@troilus.org>
 
        * doc/example.conf (Operator): Correct the comment explaining

diff --git a/doc/example.conf b/doc/example.conf
index 92eedc72c68fc9ab2bdea0655f6649ca7c3c1d09..b9c5d7883c7a7c093f13edd816ba4ff9c5cddc36 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -409,9 +409,7 @@ motd {
 # assigned one or two uplinks to which your server can connect.
 # If your uplink(s) also connect to other servers than yours (which is
 # probable), you need to define your uplink as being allowed to "hub".
-# To do this, set "hub = yes;"
-# You can also force a server(even one that doesn't connect to you)
-# to be a leaf with "leaf = yes;"
+# See the Connect block documentation for details on how to do that.
 
 UWorld {
  name = "uworld.eu.undernet.org";

diff --git a/tools/convert-conf.py b/tools/convert-conf.py
index 825b03f348312305c5de23ab1d09116a28e203cd..e91aa3df7883ae49da9e9d34e05d03aade184778 100755 (executable)
--- a/tools/convert-conf.py
+++ b/tools/convert-conf.py
@@ -22,7 +22,7 @@
 # Usage:
 #   convert-conf.py < old.conf > new.conf
 #
-# $Id: convert-conf.py,v 1.2 2005-02-19 21:50:48 isomer Exp $
+# $Id: convert-conf.py,v 1.3 2005-03-19 23:04:07 entrope Exp $
 #
 
 import sys
@@ -249,7 +249,7 @@ if len(connects.keys()):
                if connects[i].has_key("hub"):
                        print "\thub = \"%s\";" % qstr(connects[i]["hub"])
                else:
-                       print "\tleaf = \"yes\";"
+                       print "\tleaf;"
                print "};"
                print