# 
# 
# patch "ChangeLog"
#  from [3b275e8663ce8601acfbf7d9c1ff4ab874e9bb33]
#    to [ba17d0a171e17dabdaf00bd5495a24066fa7dc31]
# 
# patch "debian/monotone-server.monotone.default"
#  from [04e6dc484170339a07cbcf909bbb9393f2a39d2d]
#    to [9e76b3d5b7f68c4ac992cb3eddf5350582a77bc6]
# 
# patch "debian/monotone-server.monotone.init"
#  from [d49eb4c1ce43fcbb28b640a307f4ecfe76f52328]
#    to [ffba21db2ca4ff6f48297e88f0b2bd0a835ed575]
# 
============================================================
--- ChangeLog	3b275e8663ce8601acfbf7d9c1ff4ab874e9bb33
+++ ChangeLog	ba17d0a171e17dabdaf00bd5495a24066fa7dc31
@@ -1,3 +1,11 @@
+2006-05-04  Matthew Nicholson  <address@hidden>
+
+	* debian/monotone-server.monotone.default: Removed BRANCHES option and
+	make all other options optional.  Also DB became MTN_DB.
+	* debian/monotone-server.monotone.init: Set defaults for every option
+	in /etc/default/monotone, also serve '*' instead of specific branches.
+	Restrictions can be added using the read and write permissions files.
+
 2006-04-30  Matthew Nicholson  <address@hidden>
 
 	* debian/monotone-server.postinst: Change $MONOTONE to $MTN.  Added
============================================================
--- debian/monotone-server.monotone.default	04e6dc484170339a07cbcf909bbb9393f2a39d2d
+++ debian/monotone-server.monotone.default	9e76b3d5b7f68c4ac992cb3eddf5350582a77bc6
@@ -1,18 +1,16 @@
 # init.d config file for monotone
 
 # this must be set to 1 for monotone to start
 START=0
 
 # the address and or port (ADDRESS[:PORT]) monotone should listen on
-ADDRESS=0.0.0.0
+#ADDRESS=0.0.0.0
 
 # the database to use
-DB=/var/lib/monotone/default.mtn
+#MTN_DB=/var/lib/monotone/default.mtn
 
-# Branches that monotone should serve (seperated by white space)
-BRANCHES='tld.domain.*
-          tld.domain.branch
-          domain.tld/*
-          domain.tld/branch
-          address@hidden/branch'
+# Various other options, don't touch unless you know what you are doing.
+#MTN_HOME=/var/lib/monotone
+#MTN_CONFDIR=/etc/monotone
+#MTN_KEYDIR=$MTN_HOME/keys
 
============================================================
--- debian/monotone-server.monotone.init	d49eb4c1ce43fcbb28b640a307f4ecfe76f52328
+++ debian/monotone-server.monotone.init	ffba21db2ca4ff6f48297e88f0b2bd0a835ed575
@@ -30,7 +30,11 @@
 MTN_HOME=/var/lib/monotone
 MTN_CONFDIR=/etc/monotone
 MTN_KEYDIR=$MTN_HOME/keys
+MTN_DB=$MTN_HOME/default.mtn
 
+START=1
+ADDRESS=0.0.0.0
+
 # Gracefully exit if the package has been removed.
 test -x $DAEMON || exit 0
 
@@ -51,10 +55,10 @@
 
        start-stop-daemon --start --quiet --pidfile $PIDFILE --background \
           --exec $DAEMON --chuid monotone --chdir $MTN_HOME -- \
-          --confdir=$MTN_CONFDIR --db=$DB --norc --pid-file=$PIDFILE \
+          --confdir=$MTN_CONFDIR --db=$MTN_DB --norc --pid-file=$PIDFILE \
           --log=$MAINLOG --dump=$ERRORLOG \
           --rcfile=$MTN_CONFDIR/hooks.lua --keydir=$MTN_KEYDIR --quiet \
-          --bind=$ADDRESS serve $BRANCHES 
+          --bind=$ADDRESS serve "*"
 
 }