#
#
# patch "contrib/monotone-mirror-postaction-push.sh"
#  from [18d31c98caa0513ccdc2c703795e67f081d609e6]
#    to [0772348dd1458fb03f553f174985f30e07062798]
# 
# patch "contrib/monotone-mirror-postaction-update.sh"
#  from [be5a5e91c04a6d29ec50af69fe1d458bf00671cd]
#    to [d6023cba208e7eabe7a787f328996bde064cb1ce]
#
============================================================
--- contrib/monotone-mirror-postaction-push.sh	18d31c98caa0513ccdc2c703795e67f081d609e6
+++ contrib/monotone-mirror-postaction-push.sh	0772348dd1458fb03f553f174985f30e07062798
@@ -1,15 +1,20 @@
 #! /bin/sh
 #
 # Reads a simple specification in the following form:
 #
-#	SERVER	PATTERN ...
+#	SERVER		PATTERN ...
 #
-# and for each line, the given branch PATTERNs are pushed to the given SERVER.
-# SERVER has the following syntax: ADDRESS[:PORT]
+# For each line, the given branch PATTERNs are pushed to the given
+# SERVER. SERVER has the following syntax: ADDRESS[:PORT]
 #
-# This script relies on the environment variable DATABASE to point out what
-# database to use as source.
+# This script relies on the following environment variables:
 #
+#	DATABASE	points out what database to use as source.
+#	KEYDIROPT	has the form '--keydir=<KEYDIRECTORY>' it the top
+#			mirror script has a keydir setting.
+#	KEYIDOPT	has the form '--key=<KEYID>' it the top mirror
+#			script has a keyid setting.
+#
 # $1	specification file name.
 #	Default: /etc/monotone/push.rc
 
@@ -43,10 +48,8 @@ sed -e '/^#/d' < "$rc" | while read SERV
 
 sed -e '/^#/d' < "$rc" | while read SERVER PATTERNS; do
     if [ -n "$SERVER" -a -n "$PATTERNS" ]; then
-	( eval "set -x; mtn -d \"$database\" push $SERVER $PATTERNS" )
+	( eval "set -x; mtn -d \"$database\" $KEYDIROPT $KEYIDOPT push $SERVER $PATTERNS" )
     elif [ -n "$SERVER" -o -n "$PATTERNS" ]; then
 	echo "SYNTAX ERROR IN LINE '$SERVER $PATTERNS'"
     fi
 done
-
-exit 0
============================================================
--- contrib/monotone-mirror-postaction-update.sh	be5a5e91c04a6d29ec50af69fe1d458bf00671cd
+++ contrib/monotone-mirror-postaction-update.sh	d6023cba208e7eabe7a787f328996bde064cb1ce
@@ -6,9 +6,14 @@
 #
 # and updates each directory with the data from said branch.
 #
-# This script relies on the environment DATABASE to point out what database
-# to use as source.
+# This script relies on the following environment variables:
 #
+#	DATABASE	points out what database to use as source.
+#	KEYDIROPT	has the form '--keydir=<KEYDIRECTORY>' it the top
+#			mirror script has a keydir setting.
+#	KEYIDOPT	has the form '--key=<KEYID>' it the top mirror
+#			script has a keyid setting.
+#
 # $1	specification file name.
 #	Default: /etc/monotone/update.rc