[Monotone-commits-diffs] net.venge.monotone.contrib.usher: 38107f35dfdfb90a8f8aaa118f205e8131cc31dc

[code]

revision:            38107f35dfdfb90a8f8aaa118f205e8131cc31dc
date:                2011-02-22T17:32:53
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.contrib.usher
changelog:
* utils/usherctl.in (init): Modify -a to mean the address for automate
  remote commands, and have -A signify the admin address.
* doc/usherctl.man: Document this.

manifest:
format_version "1"

new_manifest [ee91db3716ba72c671c305817371a23eb7add271]

old_revision [3705468dc6f86d9f6cd94f84efc0dd5c7bd25709]

patch "doc/usherctl.man"
 from [78a24145da68daabcaccaff0e7fddda742ad767c]
   to [bca3b4abfb1bd72fd0e13dcb6868f13e9578bc69]

patch "utils/usherctl.in"
 from [1a636c60f14a7d04b4aa24d0ea18082767b2e09d]
   to [007584ffbe37e97a04ffc96ff2ec13212c5d93d1]
============================================================
--- utils/usherctl.in	1a636c60f14a7d04b4aa24d0ea18082767b2e09d
+++ utils/usherctl.in	007584ffbe37e97a04ffc96ff2ec13212c5d93d1
@@ -726,13 +726,16 @@ case $1 in
 	adminpass=admin
 	listenaddr=0.0.0.0:4691
 	adminaddr=127.0.0.1:12345
-	TEMP=`POSIXLY_CORRECT=yes getopt -o a:l:u:p: -n "usherctl init" -- "$@"`
+	TEMP=`POSIXLY_CORRECT=yes getopt -o A:a:l:u:p: -n "usherctl init" -- "$@"`
 	eval set -- "$TEMP"
 	while true; do
 	    case "$1" in
-		-a )
+		-A )
 		    adminaddr="$2"; shift 2
 		    ;;
+		-a )
+		    automateaddr="$2"; shift 2
+		    ;;
 		-l )
 		    listenaddr="$2"; shift 2
 		    ;;
@@ -756,6 +759,7 @@ case $1 in
 	    -e "s|%adminuser%|$adminuser|g" \
 	    -e "s|%adminpass%|$adminpass|g" \
 	    -e "s|%listenaddr%|$listenaddr|g" \
+	    -e "s|%automateaddr%|$automateaddr|g" \
 	    -e "s|%adminaddr%|$adminaddr|g" \
 	    -e "s|%MTN%|$MTN|g" \
 	    -e "s|%USHER_LOGDIR%|$USHER_LOGDIR|g" \
@@ -948,11 +952,12 @@ exit
 #### The following is sample text used to create scripts
 
 # -----BEGIN globalconf-----
-#   userpass "%adminuser%" "%adminpass%"
-#   monotone "%MTN%"
-# listenaddr "%listenaddr%"
-#  adminaddr "%adminaddr%"
-#     logdir "%USHER_LOGDIR%"
+#     userpass "%adminuser%" "%adminpass%"
+#     monotone "%MTN%"
+#   listenaddr "%listenaddr%"
+# automateaddr "%adminaddr%"
+#    adminaddr "%adminaddr%"
+#       logdir "%USHER_LOGDIR%"
 # -----END globalconf-----
 
 # -----BEGIN init:both/monotonerc.in-----
============================================================
--- doc/usherctl.man	78a24145da68daabcaccaff0e7fddda742ad767c
+++ doc/usherctl.man	bca3b4abfb1bd72fd0e13dcb6868f13e9578bc69
@@ -57,7 +57,7 @@ configuration".
 configuration".
 .SH COMMANDS
 .TP
-\fBinit\fP [ \fB-a\fP \fIadminaddr\fP ] [ \fB-l\fP \fIlistenaddr\fP ] [ \fB-u\fP \fIadminuser\fP ] [ \fB-p\fP \fIadminpass\fP ]
+\fBinit\fP [ \fB-l\fP \fIlistenaddr\fP ] [ \fB-a\fP \fIautomateaddr\fP ] [ \fB-A\fP \fIadminaddr\fP ] [ \fB-u\fP \fIadminuser\fP ] [ \fB-p\fP \fIadminpass\fP ]
 This will simply initialise the usher configuration.  It creates the
 global infrastructure, including the global configuration file (if one
 doesn't already exist) and the skeleton scripts.