Merge lp:~derek-name/openvista-gtm-integration/replication into lp:openvista-gtm-integration

[Derek_]

[Derek_ (derek-name)]

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-08-22 16:52:24 +0000
@@ -0,0 +1,2 @@
+_diff.diff
+

=== modified file 'debuild.sh'
--- debuild.sh	2009-11-19 21:10:53 +0000
+++ debuild.sh	2011-08-22 16:52:24 +0000
@@ -56,6 +56,18 @@
 
             ( cd "/tmp/ubuntu/${package}-$version" && debuild -r sudo )
             ;;
+        lsyncd)
+            # download signed upstream sources
+            ( cd "/tmp/ubuntu" && wget http://archive.ubuntu.com/ubuntu/pool/universe/l/lsyncd/lsyncd_${version}-1.dsc )
+            ( cd "/tmp/ubuntu" && wget http://archive.ubuntu.com/ubuntu/pool/universe/l/lsyncd/lsyncd_${version}-1.debian.tar.gz )
+            ( cd "/tmp/ubuntu" && wget http://archive.ubuntu.com/ubuntu/pool/universe/l/lsyncd/lsyncd_${version}.orig.tar.gz )
+
+            # unpack source tarball
+            ( cd "/tmp/ubuntu" && tar -xzf "/tmp/ubuntu/lsyncd_${version}.orig.tar.gz" )
+            ( cd "/tmp/ubuntu/lsyncd-$version" && tar -xzf "/tmp/ubuntu/lsyncd_${version}-1.debian.tar.gz" )
+
+            ( cd "/tmp/ubuntu/lsyncd-$version" && debuild -i -uc -us -b )
+            ;;
     esac
 done
 

=== modified file 'docs/man1/openvista.1'
--- docs/man1/openvista.1	2010-09-23 21:43:57 +0000
+++ docs/man1/openvista.1	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-.TH openvista 1 "1 Dec 2009" Linux "User Manuals"
+.TH openvista 1 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 openvista \- wrapper around "mumps -dir" for programmers and admins
 .SH SYNOPSIS
@@ -26,11 +26,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== modified file 'docs/man1/ovbackup.1'
--- docs/man1/ovbackup.1	2010-09-23 21:43:57 +0000
+++ docs/man1/ovbackup.1	2011-08-22 16:52:24 +0000
@@ -1,9 +1,9 @@
-.TH ovbackup 1 "10 Dec 2009" Linux "User Manuals"
+.TH ovbackup 1 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovbackup \- back up routines and globals of an OpenVista instance
 .SH SYNOPSIS
 .B ovbackup
-[\fB-q\fR]
+[\fB-q\fR] [\fB-o\fR]
 .I instance_name
 .br
 .B ovbackup -h
@@ -64,6 +64,8 @@
 display version information and exit
 .IP -q
 quiet; suppress status messages
+.IP -o
+output the backup filename
 .SH FILES
 .I /opt/openvista/INSTANCE_NAME/etc/backups.conf
 .RS
@@ -74,11 +76,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied or other error
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== modified file 'docs/man1/ovcc.1'
--- docs/man1/ovcc.1	2010-09-23 21:43:57 +0000
+++ docs/man1/ovcc.1	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-.TH ovcc 1 "1 Dec 2009" Linux "User Manuals"
+.TH ovcc 1 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovcc \- wrapper around "mumps -run ^MSCOVCI" for OpenVista Classic Component
 .SH SYNOPSIS
@@ -31,11 +31,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== modified file 'docs/man1/ovcheckperms.1'
--- docs/man1/ovcheckperms.1	2010-09-23 21:43:57 +0000
+++ docs/man1/ovcheckperms.1	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-.TH ovcheckperms 1 "11 Dec 2009" Linux "User Manuals"
+.TH ovcheckperms 1 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovcheckperms \- verify permissions
 .SH SYNOPSIS
@@ -33,9 +33,11 @@
 .IP 0
 All permissions were correct
 .IP 1
-Files and/or directories with incorrect permissions were found
+Files and/or directories with incorrect permissions were found, or other error
 .IP 2
-Other error
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== modified file 'docs/man1/ovcompile.1'
--- docs/man1/ovcompile.1	2010-09-23 21:43:57 +0000
+++ docs/man1/ovcompile.1	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-.TH ovcompile 1 "9 Feb 2010" Linux "User Manuals"
+.TH ovcompile 1 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovcompile \- (re)compile routines in an OpenVista instance
 .SH SYNOPSIS
@@ -31,11 +31,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== modified file 'docs/man1/ovgetvar.1'
--- docs/man1/ovgetvar.1	2010-09-23 21:43:57 +0000
+++ docs/man1/ovgetvar.1	2011-08-22 16:52:24 +0000
@@ -1,25 +1,22 @@
-.TH ovgetvar 1 "11 Dec 2009" Linux "User Manuals"
+.TH ovgetvar 1 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovgetvar \- get GT.M environment variable
 .SH SYNOPSIS
 .B ovgetvar
 .I instance_name
-.I gtm_dist|gtm_path|gtmroutines|gtmgbldir
+.I variable_name
 .br
 .B ovgetvar -h
 .br
 .B ovgetvar -V
 .SH DESCRIPTION
-.B ovgetvar
-prints the effective values of 
-.I $gtm_dist
-,
-.I $gtmroutines
-, and
-.I $gtmgbldir
-for the specified OpenVista instance.  It works by calling set_gtm_env, the
-function that all of the OpenVista utilities use to set their environment, then
-printing out the value of the requested variable.
+\fBovgetvar\fR prints the effective value of \fIvariable_name\fR for the
+specified OpenVista instance, where \fIvariable_name\fR is gtm_dist, gtm_path,
+gtmroutines, gtmgbldir, gtm_repl_instance, gtm_repl_instname, or
+replication_mode.  It works by calling set_gtm_env, the function that all of the
+OpenVista utilities use to set their environment, then printing out the value of
+the requested variable.  For more information about these environment variables,
+see http://tinco.pair.com/bhaskar/gtm/doc/books/ao/UNIX_manual/ch03s02.html
 .PP
 If 
 .I gtm_path
@@ -29,9 +26,14 @@
 .B ovgetvar
 tries to follow the symlink and prints out the real path to GT.M.
 .PP
-The ZCD routine in OpenVista Server is the main user of this utility, although
-it can be used by an administrator to inspect an OpenVista instance's
-configuration.
+If 
+.I gtm_repl_instname
+is requested, the replication instance name is extracted from the replication
+instance file and returned.
+.PP
+The OpenVista replication utilities and the ZCD routine in OpenVista Server are
+the main users of this utility, although it can be used by an administrator to
+inspect an OpenVista instance's configuration.
 .PP
 .SH OPTIONS
 .IP -h
@@ -42,11 +44,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied or other error
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== modified file 'docs/man1/ovimport.1'
--- docs/man1/ovimport.1	2010-09-23 21:43:57 +0000
+++ docs/man1/ovimport.1	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-.TH ovimport 1 "10 Dec 2009" Linux "User Manuals"
+.TH ovimport 1 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovimport \- import routines and globals into an OpenVista instance
 .SH SYNOPSIS
@@ -106,11 +106,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied or other error
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== modified file 'docs/man1/ovpurgejournals.1'
--- docs/man1/ovpurgejournals.1	2010-09-23 21:43:57 +0000
+++ docs/man1/ovpurgejournals.1	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-.TH ovpurgejournals 1 "1 Dec 2009" Linux "User Manuals"
+.TH ovpurgejournals 1 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovpurgejournals \- delete old journal files
 .SH SYNOPSIS
@@ -47,11 +47,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied or other error
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== modified file 'docs/man1/ovswitchjournals.1'
--- docs/man1/ovswitchjournals.1	2010-09-23 21:43:57 +0000
+++ docs/man1/ovswitchjournals.1	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-.TH ovswitchjournals 1 "1 Dec 2009" Linux "User Manuals"
+.TH ovswitchjournals 1 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovswitchjournals \- force GT.M to switch to a new journal file
 .SH SYNOPSIS
@@ -34,11 +34,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied or other error
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== modified file 'docs/man1/ovtied.1'
--- docs/man1/ovtied.1	2010-09-23 21:43:57 +0000
+++ docs/man1/ovtied.1	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-.TH ovtied 1 "1 Dec 2009" Linux "User Manuals"
+.TH ovtied 1 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovtied \- wrapper around "mumps -run ^ZU" for end users
 .SH SYNOPSIS
@@ -29,11 +29,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== added file 'docs/man8/ovgenconfig.8'
--- docs/man8/ovgenconfig.8	1970-01-01 00:00:00 +0000
+++ docs/man8/ovgenconfig.8	2011-08-22 16:52:24 +0000
@@ -0,0 +1,123 @@
+.TH ovgenconfig 8 "27 Oct 2010" Linux "User Manuals"
+.SH NAME
+ovgenconfig \- script for generating a new OpenVista configuration file from a
+template or setting values in an existing OpenVista configuration file
+.SH SYNOPSIS
+.B ovgenconfig 
+.RB [ -e ]
+.RB [ -s
+.IR subdirectory ]
+.I instance_name
+.I conf_file
+.RI [ setting... ]
+.br
+.B ovgenconfig -h
+.br
+.B ovgenconfig -V
+.SH DESCRIPTION
+.PP
+.B ovgenconfig
+generates a configuration file for an OpenVista instance based on a template
+file.  Normally, if the template file contains placeholder strings in curly
+braces, e.g. "{REPLICATION_MODE}", then a \fIsetting\fR must be given for each
+such string, otherwise the curly-brace placeholder will remain in the new file.
+If the \fB-e\fR option is used, only the settings being changed need to be
+specified.
+.PP
+.B ovgenconfig
+is intended for use by other OpenVista scripts.  Generation and modification of
+OpenVista configuration files should generally be accomplished by other commands
+such as \fBovinstanceadd\fR and \fBovreplicate\fR.  Otherwise, it is better to
+edit the configuration files in a text editor, where you will see the settings
+explained in comments, than to run \fBovgenconfig\fR directly.
+.PP
+Running \fBovgenconfig\fR requires the user to be root and it will return an
+error otherwise.
+.SH ARGUMENTS
+.TP
+.I instance_name
+the name of an existing OpenVista instance
+.TP
+.I conf_file
+the filename (without path) of a configuration template file in
+/usr/share/openvista/
+.TP
+.I setting
+an assignment in the form of "PLACEHOLDER_NAME=value", where
+"{PLACEHOLDER_NAME}" is the string occuring in the template file, and "value" is
+what should replace it in the resulting file.  See examples below.
+.SH OPTIONS
+.TP
+.B -e
+set values in an existing file rather than creating a new one.
+This is only supported for replication.conf.
+.TP
+.B -s
+subdirectory of the OpenVista instance directory where the new file will be
+written, "etc" by default
+.TP
+.B -h
+display help text and exit
+.TP
+.B -V
+display version information and exit
+.SH EXAMPLES
+.PP
+This command generates a new replication.conf file in the 'etc' subdirectory of
+the 'open' OpenVista instance:
+.IP
+$ ovgenconfig open replication.conf \\
+.br
+>   "REPLICATION_MODE=primary" \\
+.br
+>   "REPLICATION_IP=vm2" \\
+.br
+>   "BIND_ADDRESS=vm1" \\
+.br
+>   "OTHER_INSTANCE=open" \\
+.br
+>   "MUPIP_PORT=7301" \\
+.br
+>   "INSTSECONDARY=open_Fz5e" \\
+.br
+>   "RSYNC_PORT=7401"
+.PP
+This command uses the \fB-e\fR option to set a new value for replication_ip in
+the existing replication.conf file for the 'open' OpenVista instance:
+.IP
+$ ovgenconfig -e open replication.conf "REPLICATION_IP=vm3"
+.PP
+This command generates a new rsyncd.conf file and uses the \fB-s\fR option to
+place it in the 'replication' subdirectory of the 'open' OpenVista instance:
+.IP
+$ ovgenconfig -s replication open rsyncd.conf \\
+.br
+>   "ROOT=$root" \\
+.br
+>   "INSTANCE=$instance" \\
+.br
+>   "RSYNC_PORT=$rsync_port" \\
+.br
+>   "BIND_ADDRESS=$bind_address" \\
+.br
+>   "USER=$user" \\
+.br
+>   "DOCROOT=$docroot" \\
+.br
+>   "APACHE_USER=$apache_user"
+.SH "EXIT VALUES"
+.IP 0
+Success
+.IP 1
+Unspecified error
+.IP 2
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
+.SH "REPORTING BUGS"
+Please report any bugs you encounter at
+.PP
+https://bugs.launchpad.net/openvista-gtm-integration
+.SH AUTHOR
+Derek Veit <[e-mail]>
+

=== modified file 'docs/man8/ovinstanceadd.8'
--- docs/man8/ovinstanceadd.8	2010-09-24 18:32:54 +0000
+++ docs/man8/ovinstanceadd.8	2011-08-22 16:52:24 +0000
@@ -1,9 +1,10 @@
-.TH ovinstanceadd 8 "22 Sep 2010" Linux "User Manuals"
+.TH ovinstanceadd 8 "18 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovinstanceadd \- create a new OpenVista instance
 .SH SYNOPSIS
 .B ovinstanceadd
 [\fB-p\fR \fIpath\fR]
+[\fB-r\fR \fIgtm_repl_instname\fR]
 .I instance_name
 .br
 .B ovinstanceadd -h
@@ -14,10 +15,11 @@
 creates a new OpenVista instance.  It ensures that the 
 .I openvista
 tied account exists, creates the directory structure for the instance, ensures
-that permissions are set correctly, creates a global directory file and empty
-database files, creates default configuration files, generates an SSH key for
-the instance, sets up an ssh forced command to run ^ZU in the instance, and
-creates the webdav root for the instance.
+that permissions are set correctly, creates the global directory file, creates
+empty database files, creates the replication instance file, creates default
+configuration files, generates an SSH key for the instance, sets up an ssh
+forced command to run ^ZU in the instance, and creates the webdav root for the
+instance.
 .PP
 By default, ovinstanceadd sets up the new instance to use the latest version of
 GT.M installed on the system.  You can specify an alternate path to a GT.M
@@ -25,7 +27,16 @@
 0.8.10.
 .SH OPTIONS
 .IP -p
-path; value of $gtm_dist for this instance
+path; value of $gtm_dist for this instance.  This can be set for an older
+installed version of GT.M.
+.IP -r
+GT.M replication instance name; value to use for $gtm_repl_instname for this
+instance.  This should normally be set automatically, but this option can be
+used when it is necessary to re-use a name that the other server in replication
+is already configured with.  For example, if a secondary server is being
+re-created and the primary server is already configured to replicate with a
+secondary instance having the replication instance name "dev_aS12", then this
+option could be used to avoid reconfiguring the primary server.
 .IP -h
 display help text and exit
 .IP -V
@@ -34,11 +45,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied or other error
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .IP 9
 Instance already exists
 .SH "REPORTING BUGS"

=== modified file 'docs/man8/ovinstancedel.8'
--- docs/man8/ovinstancedel.8	2010-09-23 21:43:57 +0000
+++ docs/man8/ovinstancedel.8	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-.TH ovinstancedel 8 "1 Dec 2009" Linux "User Manuals"
+.TH ovinstancedel 8 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovinstancedel \- delete an OpenVista instance
 .SH SYNOPSIS
@@ -28,11 +28,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied or other error
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== added file 'docs/man8/ovinstancerepl.8'
--- docs/man8/ovinstancerepl.8	1970-01-01 00:00:00 +0000
+++ docs/man8/ovinstancerepl.8	2011-08-22 16:52:24 +0000
@@ -0,0 +1,168 @@
+.TH ovinstancerepl 8 "3 Dec 2010" Linux "User Manuals"
+.SH NAME
+ovinstancerepl \- script for configuring an OpenVista instance for replication.
+.SH SYNOPSIS
+.HP
+.B ovinstancerepl 
+.BI "-a " primary_ip
+.BI "-b " secondary_ip
+.BI "-m " mupip_port
+.BI "-r " rsync_port
+.RB [ -w
+.IR other_instance ]
+.RB [ -f
+.IR backup_file ]
+.RB [ -i
+.IR instsecondary ]
+.RB [ -k
+.IR keys_directory ]
+.BR primary | secondary
+.I instance_name
+.PP
+.B ovinstancerepl
+.RB [ -s ]
+.BR status | list
+.I instance_name
+.PP
+.B ovinstancerepl 
+.BR test | stop | start
+.I instance_name
+.PP
+.B ovinstancerepl 
+.RB [ -f
+.IR backup_file ]
+.BR resync
+.I instance_name
+.PP
+.B ovinstancerepl -h
+.PP
+.B ovinstancerepl -V
+.SH DESCRIPTION
+.B ovinstancerepl
+configures a single OpenVista instance for replication, either as the primary
+(source) or as the secondary (receiver).  The instance is prepared for
+replication of the GT.M globals database, the GT.M routines files, and the image
+files in the WebDAV folder. \fBovinstancerepl\fR only does a part of the work in
+setting up replication for OpenVista Server. \fBovinstancerepl\fR does not
+configure anything on the remote server, configure replication of the MySQL
+database, or manage failover or switchover.  For setting up or managing
+OpenVista Server replication generally, use \fBovreplicate\fR instead.
+.PP
+.B ovinstancerepl
+requires the user to be root and it will return an error otherwise.
+.PP
+.SH ACTIONS
+.TP
+.B primary
+set up the instance for replication as the primary
+.TP
+.B secondary
+set up the instance for replication as the secondary
+.TP
+.B status
+show local replication status of the instance
+.TP
+.B list
+show the configuration parameters of the instance
+.TP
+.B test
+test replication with the remote instance
+.TP
+.B stop
+disable replication for the instance
+.TP
+.B start
+re-enable replication for the instance if it has been stopped
+.TP
+.B resync
+resync a secondary instance with its primary.  This is normally necessary if the
+GT.M database on the primary has been overwritten by \fBovrestore\fR or has
+experienced recovery, e.g. following a hard shutdown and restart.
+.SH OPTIONS
+.TP
+.B -h
+display help text and exit
+.TP
+.B -V
+display version information and exit
+.TP
+.BI "-a " primary_ip
+IP address or host name of the primary server.
+.TP
+.BI "-b " secondary_ip
+IP address or host name of the secondary server
+.TP
+.BI "-f " backup_file
+for secondary, full path to a backup file of the primary instance (generated by
+ovbackup).  Without this option, ovinstancerepl will automatically generate and
+retrieve a new backup of the primary.  To skip using a backup altogether, use -f
+"SKIP".  Skipping the backup is not recommended if the primary instance contains
+a large amount of data that is not already on the secondary.
+.TP
+.BI "-i " instsecondary
+the GT.M "replication instance name" of the remote instance.
+\fBovinstancerepl\fR will normally retrieve this value automatically, but this
+option can be used if the remote server is not currently available.
+.br
+The replication instance name is composed of the OpenVista instance name, e.g.
+"dev", plus an underscore and four random alphanumeric characters, and it is
+normally generated by \fBovinstanceadd\fR when the instance is created.  A
+secondary instance has a different replication instance name than its primary.
+The value can be read using \fBovgetvar\fR.
+.TP
+.BI "-k " keys_directory
+for secondary, the directory from which to copy SSH keys and the WebDAV password
+file. ovinstancerepl will normally retrieve these from the etc subdirectory of
+the remote instance automatically, but this option can be used if the remote
+server is not currently available
+.TP
+.BI "-m " mupip_port
+port number for use by the GT.M replication daemons
+.TP
+.BI "-r " rsync_port
+port number for use by the file replication daemons
+.TP
+.B -s
+format the output for scripted use
+.TP
+.BI "-w " other_instance
+the name of the OpenVista instance being replicated to or from.  The
+default is for the primary and secondary instances to have the same name.
+However, if both instances are on the same server, the primary instance and the
+secondary instance must each have a different name, so this option must be used.
+.SH "EXAMPLES"
+.PP
+This command would be run on "host1" to set up the 'open' instance for
+replication as primary with the secondary instance on "host2".  Port 7301 would
+be used for replication of the GT.M database and port 7401 would be used for
+file replication:
+.IP
+$ ovinstancerepl -a host1 -b host2 -m 7301 -r 7401 primary open
+.PP
+This command will show a table describing the current state of replication for
+the instance on the local server:
+.IP
+$ ovinstancerepl status open
+.PP
+This command will stop replication processes of the 'open' instance.  It will
+only stop the local, primary or secondary, side of replication:
+.IP
+$ ovinstancerepl stop open
+.SH "EXIT VALUES"
+.IP 0
+Success
+.IP 1
+Unspecified error.  The \fBtest\fR action will return 1 if the test fails.
+.IP 2
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
+.SH "REPORTING BUGS"
+Please report any bugs you encounter at
+.PP
+https://bugs.launchpad.net/openvista-gtm-integration
+.SH AUTHOR
+Derek Veit <[e-mail]>
+.SH "SEE ALSO"
+.BR ovreplication (8)
+.BR ovgetvar (1)

=== added file 'docs/man8/ovmysqlrepl.8'
--- docs/man8/ovmysqlrepl.8	1970-01-01 00:00:00 +0000
+++ docs/man8/ovmysqlrepl.8	2011-08-22 16:52:24 +0000
@@ -0,0 +1,132 @@
+.TH ovmysqlrepl 8 "11 Nov 2010" Linux "User Manuals"
+.SH NAME
+ovmysqlrepl \- script to set up replication of the MySQL databases for OpenVista
+.SH SYNOPSIS
+.B ovmysqlrepl
+.RB [ -q ]
+.RB [ -p
+.IR mysql_password ]
+.BI "-a " primary_ip
+.BI "-b " secondary_ip
+.B primary
+.br
+.B ovmysqlrepl
+.RB [ -fqw ]
+.RB [ -p
+.IR mysql_password ]
+.BI "-a " primary_ip
+.BI "-b " secondary_ip
+.B secondary
+.br
+.B ovmysqlrepl
+.RB [ -s ]
+.RB [ -p
+.IR mysql_password ]
+.B status
+.br
+.B ovmysqlrepl
+.RB [ -p
+.IR mysql_password ]
+.BR test | mode | ip | backlog | stop | start
+.br
+.B ovmysqlrepl -h
+.br
+.B ovmysqlrepl -V
+.SH DESCRIPTION
+.B ovmysqlrepl
+configures MySQL replication, as used for OpenVista replication, on a single
+server.  To set up MySQL replication between two servers,
+.B ovmysqlrepl
+must be run first on the primary server and then on the secondary server.
+.PP
+.B ovreplicate
+calls
+.B ovmysqlrepl
+when configuring replication of OpenVista instances with a remote server, so
+when using
+.B ovreplicate
+it is \fInot\fR necessary to also run
+.B ovmysqlrepl
+manually.
+Running
+.B ovmysqlrepl
+requires the user to be root and it will return an error otherwise.
+.PP
+If the MySQL root account has a password, it must be provided with the \fB-p\fR
+option.
+.SH ACTIONS
+.TP
+.B primary
+prepare this server as the primary (i.e. master or source) in MySQL replication
+.TP
+.B secondary
+prepare this server as the secondary (i.e. slave or target) in MySQL
+replication.  To do this, \fBovmysqlrepl\fR needs to call \fBmysqldump\fR on the
+primary server.  It calls \fBovsshkey\fR to set up SSH key authentication for
+this, and it will require the user to enter the root password of that server
+unless the OpenVista replication SSH keys have already been configured.
+.TP
+.B status
+show information about this MySQL server and its binary log positions
+.TP
+.B list
+show the configuration parameters of MySQL replication
+.TP
+.B mode
+print the current replication mode of this MySQL server, primary or secondary
+.TP
+.B ip
+print the address of the remote server
+.TP
+.B backlog
+on the secondary: show binary log positions and backlog
+.TP
+.BR stop | start
+disable or enable replication on this server 'start' requires that replication
+has been configured using 'primary' or 'secondary' but has been stopped
+.SH OPTIONS
+.TP
+.B -h
+display help text and exit
+.TP
+.B -V
+display version information and exit
+.TP
+.BI "-a " primary_ip
+IP address or host name of the primary server.
+.TP
+.BI "-b " secondary_ip
+IP address or host name of the secondary server
+.TP
+.B -f
+drop the databases of the secondary without first prompting for confirmation.
+This is intended for use by a script, e.g. ovreplicate, which would handle the
+appropriate user confirmation separately.
+.TP
+.B -q
+minimize non-error output
+.TP
+.B -s
+format the output for scripted use
+.TP
+.B -w
+skip copying master data (for use in switchover only)
+.SH "EXIT VALUES"
+.IP 0
+Success
+.IP 1
+Unspecified error.  The \fBtest\fR action will return 1 if the test fails.
+.IP 2
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
+.SH "REPORTING BUGS"
+Please report any bugs you encounter at
+.PP
+https://bugs.launchpad.net/openvista-gtm-integration
+.SH AUTHOR
+Derek Veit <[e-mail]>
+.SH "SEE ALSO"
+.BR ovreplicate (8),
+.BR ovsshkey (8)
+

=== added file 'docs/man8/ovreplicate.8'
--- docs/man8/ovreplicate.8	1970-01-01 00:00:00 +0000
+++ docs/man8/ovreplicate.8	2011-08-22 16:52:24 +0000
@@ -0,0 +1,149 @@
+.TH ovreplicate 8 "19 Nov 2010" Linux "User Manuals"
+.SH NAME
+ovreplicate \- script for configuring replication of OpenVista Server.
+.SH SYNOPSIS
+.B ovreplicate 
+.RB [ -e
+.IR instance_name ]
+.RB [ -p
+.IR mysql_password ]
+.BR setup | switchover | promote | demote | stop | start
+.br
+.B ovreplicate 
+.RB [ -s ]
+.BR status | list
+.RI [ instance_name... ]
+.br
+.B ovreplicate 
+.BR test
+.RI [ instance_name... ]
+.br
+.B ovreplicate -h
+.br
+.B ovreplicate -V
+.SH DESCRIPTION
+.B ovreplicate
+is the main user utility for configuring replication of OpenVista Server.  Both
+the primary server and the secondary server can be configured at once from
+either location.  Replication is configured for three types of data: the GT.M
+globals database, files (GT.M routines and also image files in the WebDAV
+folder), and the MySQL database.
+.PP
+Replication copies one or more OpenVista instances on one server, the
+primary, to instances with the same names on another server, the secondary.
+.PP
+.B ovreplicate
+requires the user to be root and it will return an error otherwise.
+.PP
+To allow configuration of the remote server, \fBovreplicate\fR calls
+\fBovsshkey\fR to set up SSH key authentication between the servers.  This will
+require the user to enter the root password of that server unless the OpenVista
+replication SSH keys have already been configured.
+.SH ACTIONS
+.TP
+.B setup
+set up replication with this server as the primary
+.TP
+.B switchover
+run on the secondary, while replication is running, to swap primary and
+secondary roles.  The local server will be the new primary.  The
+\fBswitchover\fR option is only for a controlled switchover when both servers
+are available and replication is active and successful.  Otherwise, the
+\fBsetup\fR, \fBpromote\fR, or \fBdemote\fR action may be used to reconfigure a
+server from one role to the other, but depending on circumstances, other steps
+may be necessary to ensure that data is not lost.
+.TP
+.B promote
+run on the secondary to make it the primary.  The old primary must no longer be
+serving to clients.  When possible, use \fBswitchover\fR instead.
+.TP
+.B demote
+run on the primary to make it the secondary.  When possible, use
+\fBswitchover\fR instead.
+.TP
+.B stop
+disable OpenVista replication
+.TP
+.B start
+re-enable OpenVista replication if it has been stopped
+.TP
+.B status
+show the current configuration and status of all OpenVista replication
+components for the primary and secondary of each OpenVista instance
+.TP
+.B list
+show the configuration parameters of each local OpenVista instance
+.TP
+.B test
+test replication by writing values on the primary server and reading them on the
+secondary server
+.SH OPTIONS
+.TP
+.B -h
+display help text and exit
+.TP
+.B -V
+display version information and exit
+.TP
+.BI "-e " instance
+exclude the instance from the action. "mysql" can be specified to exclude MySQL
+from the action.  Multiple names may be specified within quotes.
+.TP
+.BI "-p " mysql_password
+must be the MySQL root password if one is set
+.TP
+.B -s
+format the output for scripted use
+.SH "EXAMPLES"
+.PP
+This command would be run on an OpenVista server to set it up for replication
+with another OpenVista server.  The server on which the command is run will be
+the primary and the other server will be the secondary:
+.IP
+$ ovreplicate setup
+.PP
+This would be run on a running secondary server to cause it to trade places with
+its primary, so that the secondary would become the primary and the primary
+would become the secondary:
+.IP
+$ ovreplicate switchover
+.PP
+This command will show a table describing the current state of replication, on
+both the local server and the remote server for each local OpenVista instance
+and for MySQL:
+.IP
+$ ovreplicate status
+.PP
+This command would be run on a secondary to stop replication on that server:
+.IP
+$ ovreplicate stop
+.SH "EXIT VALUES"
+.IP 0
+Success
+.IP 1
+Unspecified error
+.IP 2
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
+.PP
+For the 'test' action, the following codes may be combined to describe the type
+of replication that failed the test.  For example, a return code of 48 would
+indicate that file replication failed for both the GT.M routines directory and
+the WebDAV directory:
+.IP 8
+Test of GT.M globals replication failed
+.IP 16
+Test of GT.M routines file replication failed
+.IP 32
+Test of WebDAV file replication failed
+.IP 64
+Test of MySQL replication failed
+.SH "REPORTING BUGS"
+Please report any bugs you encounter at
+.PP
+https://bugs.launchpad.net/openvista-gtm-integration
+.SH AUTHOR
+Derek Veit <[e-mail]>
+.SH "SEE ALSO"
+.BR ovinstancerepl (8), ovmysqlrepl (8), ovinstanceadd (8), ovinstancedel (8)

=== modified file 'docs/man8/ovrestore.8'
--- docs/man8/ovrestore.8	2010-09-23 21:43:57 +0000
+++ docs/man8/ovrestore.8	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-.TH ovrestore 8 "10 Dec 2009" Linux "User Manuals"
+.TH ovrestore 8 "11 Oct 2010" Linux "User Manuals"
 .SH NAME
 ovrestore \- restores a backup file into an OpenVista instance
 .SH SYNOPSIS
@@ -61,6 +61,11 @@
 flag can only be used when restoring a backup into the instance that originally
 created the backup.
 .PP
+If the target instance has a replication instance file, it is re-created at the
+end of the restore process.  This resets the history of replicated transaction
+sequence numbers; the sequence numbers in the old database likely do not match
+the sequence numbers in the restored database.
+.PP
 Depending on the size of the backup file and the speed of the hardware,
 .B ovrestore
 may take several hours to complete.  By default, dated status messages are
@@ -84,11 +89,11 @@
 .IP 0
 Success
 .IP 1
-Permission denied or other error
+Unspecified error
 .IP 2
-Invalid command syntax
-.IP 3
-Invalid argument to option
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
 .SH "REPORTING BUGS"
 Please report any bugs you encounter at
 .PP

=== added file 'docs/man8/ovsshkey.8'
--- docs/man8/ovsshkey.8	1970-01-01 00:00:00 +0000
+++ docs/man8/ovsshkey.8	2011-08-22 16:52:24 +0000
@@ -0,0 +1,84 @@
+.TH ovsshkey 8 "30 Nov 2010" Linux "User Manuals"
+.SH NAME
+ovsshkey \- script for setting up ssh key exchange with another server
+.SH SYNOPSIS
+.B ovsshkey
+.RB [ -p
+.IR password_prompt ]
+.RB [ -q ]
+.RB [ -s
+.IR instance_name ]
+.RB [ -t ]
+.I remote_host
+.br
+.B ovsshkey -h
+.br
+.B ovsshkey -V
+.br
+.B ovsshkey
+.RB [ -k
+.IR caller ]
+.br
+.B ovsshkey -n
+.SH DESCRIPTION
+.B ovsshkey
+creates and copies SSH keys as necessary to establish bidirectional
+key-authorized access between the local server and a remote server.  This is
+used by OpenVista utility scripts to coordinate replication activities.
+.PP
+The key names specific to OpenVista are used so as not to conflict with any
+other key usage on the two servers.
+.SH OPTIONS
+.TP
+.B -h
+display help text and exit
+.TP
+.B -V
+display version information and exit
+.TP
+.BI "-k " caller
+just generate the local ssh key files.  This is used by \fBovsshkey\fR when
+calling itself on the remote server.  The \fIcaller\fR argument is used by
+\fBovsshkey\fR to log what host is calling it remotely.
+.TP
+.B -n
+print the name used for the key file
+.TP
+.BI "-p " password_prompt
+if the user must enter the remote root password, print \fIpassword_prompt\fR
+just before the prompt.  This will appear even if the -q option is set.
+.TP
+.B -q
+quiet mode, minimize non-error output to console.  When used with the -t option
+error messages are also suppressed.
+.TP
+.BI "-s " instance_name
+for setting up a secondary server for replication, copy the SSH host keys of
+\fIremote_host\fR (the primary server) to the local host (the secondary server)
+so that after a switchover, SSH clients will trust the former secondary server
+as the new primary server.  This can only be invoked on the secondary server.
+\fIinstance_name\fR is used only to verify that the local host is the secondary
+server, and it can be the name of any configured secondary OpenVista instance on
+the server.
+.TP
+.B -t
+test only, exit 0 if key exchange has already been set up with this server using
+\fBovsshkey\fR and it is successful, otherwise exit 1.  This will also output
+success or failure messages unless the -q option is specified.
+.SH "EXIT VALUES"
+.IP 0
+Success
+.IP 1
+Unspecified error
+.IP 2
+Invalid or excess argument(s)
+.IP 4
+User had insufficient privilege
+.SH "REPORTING BUGS"
+Please report any bugs you encounter at
+.PP
+https://bugs.launchpad.net/openvista-gtm-integration
+.SH AUTHOR
+Derek Veit <[e-mail]>
+.SH "SEE ALSO"
+.BR ovreplicate (8)

=== modified file 'packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/control'
--- packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/control	2010-11-12 23:05:47 +0000
+++ packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/control	2011-08-22 16:52:24 +0000
@@ -8,7 +8,7 @@
 
 Package: openvista-utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, rsync, pbzip2 (>= 1.0.5) | bzip2, cron, openssh-client, apache2.2-common, ssl-cert, openvista-libs-5.4000a | openvista-libs
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, rsync, pbzip2 (>= 1.0.5) | bzip2, cron, openssh-client, apache2.2-common, ssl-cert, mysql-server, openvista-libs-5.4000a | openvista-libs
 Recommends: openssh-server, apache2
 Suggests: putty-tools, bash-completion, pbzip2 (>= 1.0.5)
 Description: Utilities for configuring and managing OpenVista

=== modified file 'packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/openvista-utils.dirs'
--- packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/openvista-utils.dirs	2010-01-16 22:24:12 +0000
+++ packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/openvista-utils.dirs	2011-08-22 16:52:24 +0000
@@ -1,5 +1,8 @@
 etc/apache2/conf.d
 etc/bash_completion.d
+etc/openvista
+etc/openvista/primary.d
+etc/openvista/secondary.d
 opt/openvista
 sbin
 usr/bin

=== modified file 'packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/openvista-utils.manpages'
--- packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/openvista-utils.manpages	2010-02-09 23:36:06 +0000
+++ packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/openvista-utils.manpages	2011-08-22 16:52:24 +0000
@@ -1,15 +1,20 @@
+docs/man1/openvista.1
+docs/man1/ovbackup.1
+docs/man1/ovcc.1
+docs/man1/ovcheckperms.1
+docs/man1/ovcompile.1
+docs/man1/ovgetvar.1
+docs/man1/ovimport.1
+docs/man1/ovpurgejournals.1
+docs/man1/ovswitchjournals.1
+docs/man1/ovtied.1
 docs/man8/gtmsignal.8
+docs/man8/ovauth.8
+docs/man8/ovgenconfig.8
 docs/man8/ovinstanceadd.8
 docs/man8/ovinstancedel.8
+docs/man8/ovinstancerepl.8
+docs/man8/ovmysqlrepl.8
+docs/man8/ovreplicate.8
 docs/man8/ovrestore.8
-docs/man8/ovauth.8
-docs/man1/openvista.1
-docs/man1/ovtied.1
-docs/man1/ovcc.1
-docs/man1/ovbackup.1
-docs/man1/ovpurgejournals.1
-docs/man1/ovswitchjournals.1
-docs/man1/ovimport.1
-docs/man1/ovcheckperms.1
-docs/man1/ovgetvar.1
-docs/man1/ovcompile.1
+docs/man8/ovsshkey.8

=== modified file 'packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/openvista-utils.postinst'
--- packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/openvista-utils.postinst	2010-01-16 22:24:12 +0000
+++ packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/openvista-utils.postinst	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # postinst script for openvista-utils
 #
 # see: dh_installdeb(1)
@@ -55,6 +55,50 @@
                 /etc/init.d/apache2 restart
             fi
         fi
+
+        # add replication support to existing instances if upgrading
+        if [ -n "$2" ] && dpkg --compare-versions "$2" lt 0.9-1; then
+            echo "Adding replication support to existing instances..."
+            . /usr/lib/openvista/functions
+            for instname in $(list_openvista_instances); do
+                # skip the instance if it has already been prepared for replication
+                instance=$(get_ov_root)/${instname}
+                if [ -e "${instance}/replication" ]; then
+                    echo "Instance ${instname} already supports replication"
+                    continue
+                fi
+
+                # create replication directory
+                install -o root -g openvista -m 2770 -d "${instance}/replication"
+
+                # create replication.conf
+                /usr/sbin/ovgenconfig "${instname}" "replication.conf" \
+                     "REPLICATION_MODE=" \
+                     "REPLICATION_IP=" \
+                     "BIND_ADDRESS=" \
+                     "OTHER_INSTANCE=" \
+                     "MUPIP_PORT=" \
+                     "INSTSECONDARY=" \
+                     "RSYNC_PORT="
+
+                # generate the replication instance name
+                random_suffix=$(tr -dc 'A-Za-z0-9' < /dev/urandom | head -c4)
+                gtm_repl_instname="${instname:0:8}_${random_suffix}"
+
+                # create replication instance file
+                gtm_dist=${instance}/gtm gtmgbldir=${instance}/globals/mumps.gld gtm_repl_instance=${instance}/replication/repl_instance "${instance}/gtm/mupip" replicate -instance_create -name="${gtm_repl_instname}" 2>&1 \
+                  | logger -p user.info
+                chmod 660 "${instance}/replication/repl_instance"
+
+                echo "Support for replication added to ${instname}"
+            done
+
+        fi
+
+        # on install or upgrade
+        if dpkg --compare-versions "$2" lt 0.9-1; then
+            ln -s /etc/rc.d/init.d/openvista /etc/openvista/primary.d/openvista
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

=== modified file 'packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/rules'
--- packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/rules	2010-11-12 23:05:47 +0000
+++ packages/deb/Ubuntu/10.04/openvista-gtm-integration/debian/rules	2011-08-22 16:52:24 +0000
@@ -72,7 +72,9 @@
 
 	# openvista-utils
 	rm -f debian/openvista-utils.openvista-databases.init
+	rm -f debian/openvista-utils.openvista-replication.init
 	rm -f debian/openvista-utils.openvista.init
+	rm -f debian/openvista-utils.openvista-init.init
 	rm -f debian/openvista-utils.openvista.cron.d
 	rm -f debian/openvista-utils.openvista.cron.daily
 	rm -f src/ovauth/ovauth
@@ -87,9 +89,9 @@
 	dh_installdirs -i
 
 	install -m 644 scripts/etc/munin/plugin-conf.d/openvista debian/openvista-munin-plugins/etc/munin/plugin-conf.d/
-	install scripts/usr/share/munin/plugins/openvista_databases_ debian/openvista-munin-plugins/usr/share/munin/plugins/
-	install scripts/usr/share/munin/plugins/openvista_locks_ debian/openvista-munin-plugins/usr/share/munin/plugins/
-	install scripts/usr/share/munin/plugins/openvista_processes_ debian/openvista-munin-plugins/usr/share/munin/plugins/
+	for plugin in scripts/usr/share/munin/plugins/*; do \
+		install $$plugin debian/openvista-munin-plugins/usr/share/munin/plugins/ ;\
+	done
 
 	dh_install -i
 
@@ -122,14 +124,24 @@
 		install $$script debian/openvista-utils/usr/bin/ ;\
 	done
 
+	for script in scripts/etc/openvista/primary.d/*; do \
+		install $$script debian/openvista-utils/etc/openvista/primary.d/ ;\
+	done
+
 	install scripts/etc/init.d/openvista-databases debian/openvista-utils.openvista-databases.init
+	install scripts/etc/init.d/openvista-replication debian/openvista-utils.openvista-replication.init
 	install scripts/etc/init.d/openvista debian/openvista-utils.openvista.init
+	install scripts/etc/init.d/openvista-init debian/openvista-utils.openvista-init.init
 
 	install -m 644 scripts/etc/bash_completion.d/openvista debian/openvista-utils/etc/bash_completion.d/
 
 	install scripts/etc/cron.d/openvista debian/openvista-utils.openvista.cron.d
 	install scripts/etc/cron.daily/openvista debian/openvista-utils.openvista.cron.daily
 
+	install -m 644 scripts/etc/openvista/lsyncd-routines.exclude debian/openvista-utils/etc/openvista/
+	install -m 644 scripts/etc/openvista/mysqlusers debian/openvista-utils/etc/openvista/
+	install -m 644 scripts/etc/openvista/network-interface debian/openvista-utils/etc/openvista/
+
 	install -m 644 debian/webdav.conf debian/openvista-utils/etc/apache2/conf.d/
 
 	touch debian/openvista-utils/etc/apache2/webdav.htpasswd
@@ -154,7 +166,9 @@
 #	dh_installmime
 #	dh_python
 	dh_installinit -r --no-start --name=openvista-databases -- defaults 28 10
+	dh_installinit -r --no-start --name=openvista-replication -- defaults 29 11
 	dh_installinit -r --no-start --name=openvista -- defaults 98 01
+	dh_installinit -r --no-start --name=openvista-init -- defaults 98 01
 	dh_installcron --name=openvista
 #	dh_installinfo
 	dh_installman

=== modified file 'packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/control'
--- packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/control	2010-11-12 23:05:47 +0000
+++ packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/control	2011-08-22 16:52:24 +0000
@@ -8,7 +8,7 @@
 
 Package: openvista-utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, rsync, pbzip2 (>= 1.0.5) | bzip2, cron, openssh-client, apache2.2-common, ssl-cert, openvista-libs-5.4000a | openvista-libs
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, rsync, pbzip2 (>= 1.0.5) | bzip2, cron, openssh-client, apache2.2-common, ssl-cert, mysql-server, openvista-libs-5.4000a | openvista-libs
 Recommends: openssh-server, apache2
 Suggests: putty-tools, bash-completion, pbzip2 (>= 1.0.5)
 Description: Utilities for configuring and managing OpenVista

=== modified file 'packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/openvista-utils.dirs'
--- packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/openvista-utils.dirs	2010-09-23 17:53:44 +0000
+++ packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/openvista-utils.dirs	2011-08-22 16:52:24 +0000
@@ -1,5 +1,8 @@
 etc/apache2/conf.d
 etc/bash_completion.d
+etc/openvista
+etc/openvista/primary.d
+etc/openvista/secondary.d
 opt/openvista
 sbin
 usr/bin

=== modified file 'packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/openvista-utils.manpages'
--- packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/openvista-utils.manpages	2010-09-23 17:53:44 +0000
+++ packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/openvista-utils.manpages	2011-08-22 16:52:24 +0000
@@ -1,15 +1,20 @@
+docs/man1/openvista.1
+docs/man1/ovbackup.1
+docs/man1/ovcc.1
+docs/man1/ovcheckperms.1
+docs/man1/ovcompile.1
+docs/man1/ovgetvar.1
+docs/man1/ovimport.1
+docs/man1/ovpurgejournals.1
+docs/man1/ovswitchjournals.1
+docs/man1/ovtied.1
 docs/man8/gtmsignal.8
+docs/man8/ovauth.8
+docs/man8/ovgenconfig.8
 docs/man8/ovinstanceadd.8
 docs/man8/ovinstancedel.8
+docs/man8/ovinstancerepl.8
+docs/man8/ovmysqlrepl.8
+docs/man8/ovreplicate.8
 docs/man8/ovrestore.8
-docs/man8/ovauth.8
-docs/man1/openvista.1
-docs/man1/ovtied.1
-docs/man1/ovcc.1
-docs/man1/ovbackup.1
-docs/man1/ovpurgejournals.1
-docs/man1/ovswitchjournals.1
-docs/man1/ovimport.1
-docs/man1/ovcheckperms.1
-docs/man1/ovgetvar.1
-docs/man1/ovcompile.1
+docs/man8/ovsshkey.8

=== modified file 'packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/openvista-utils.postinst'
--- packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/openvista-utils.postinst	2010-09-23 17:53:44 +0000
+++ packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/openvista-utils.postinst	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # postinst script for openvista-utils
 #
 # see: dh_installdeb(1)
@@ -55,6 +55,50 @@
                 /etc/init.d/apache2 restart
             fi
         fi
+
+        # add replication support to existing instances if upgrading
+        if [ -n "$2" ] && dpkg --compare-versions "$2" lt 0.9-1; then
+            echo "Adding replication support to existing instances..."
+            . /usr/lib/openvista/functions
+            for instname in $(list_openvista_instances); do
+                # skip the instance if it has already been prepared for replication
+                instance=$(get_ov_root)/${instname}
+                if [ -e "${instance}/replication" ]; then
+                    echo "Instance ${instname} already supports replication"
+                    continue
+                fi
+
+                # create replication directory
+                install -o root -g openvista -m 2770 -d "${instance}/replication"
+
+                # create replication.conf
+                /usr/sbin/ovgenconfig "${instname}" "replication.conf" \
+                     "REPLICATION_MODE=" \
+                     "REPLICATION_IP=" \
+                     "BIND_ADDRESS=" \
+                     "OTHER_INSTANCE=" \
+                     "MUPIP_PORT=" \
+                     "INSTSECONDARY=" \
+                     "RSYNC_PORT="
+
+                # generate the replication instance name
+                random_suffix=$(tr -dc 'A-Za-z0-9' < /dev/urandom | head -c4)
+                gtm_repl_instname="${instname:0:8}_${random_suffix}"
+
+                # create replication instance file
+                gtm_dist=${instance}/gtm gtmgbldir=${instance}/globals/mumps.gld gtm_repl_instance=${instance}/replication/repl_instance "${instance}/gtm/mupip" replicate -instance_create -name="${gtm_repl_instname}" 2>&1 \
+                  | logger -p user.info
+                chmod 660 "${instance}/replication/repl_instance"
+
+                echo "Support for replication added to ${instname}"
+            done
+
+        fi
+
+        # on install or upgrade
+        if dpkg --compare-versions "$2" lt 0.9-1; then
+            ln -s /etc/rc.d/init.d/openvista /etc/openvista/primary.d/openvista
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

=== modified file 'packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/rules'
--- packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/rules	2010-11-12 23:05:47 +0000
+++ packages/deb/Ubuntu/10.10/openvista-gtm-integration/debian/rules	2011-08-22 16:52:24 +0000
@@ -72,7 +72,9 @@
 
 	# openvista-utils
 	rm -f debian/openvista-utils.openvista-databases.init
+	rm -f debian/openvista-utils.openvista-replication.init
 	rm -f debian/openvista-utils.openvista.init
+	rm -f debian/openvista-utils.openvista-init.init
 	rm -f debian/openvista-utils.openvista.cron.d
 	rm -f debian/openvista-utils.openvista.cron.daily
 	rm -f src/ovauth/ovauth
@@ -87,9 +89,9 @@
 	dh_installdirs -i
 
 	install -m 644 scripts/etc/munin/plugin-conf.d/openvista debian/openvista-munin-plugins/etc/munin/plugin-conf.d/
-	install scripts/usr/share/munin/plugins/openvista_databases_ debian/openvista-munin-plugins/usr/share/munin/plugins/
-	install scripts/usr/share/munin/plugins/openvista_locks_ debian/openvista-munin-plugins/usr/share/munin/plugins/
-	install scripts/usr/share/munin/plugins/openvista_processes_ debian/openvista-munin-plugins/usr/share/munin/plugins/
+	for plugin in scripts/usr/share/munin/plugins/*; do \
+		install $$plugin debian/openvista-munin-plugins/usr/share/munin/plugins/ ;\
+	done
 
 	dh_install -i
 
@@ -122,14 +124,24 @@
 		install $$script debian/openvista-utils/usr/bin/ ;\
 	done
 
+	for script in scripts/etc/openvista/primary.d/*; do \
+		install $$script debian/openvista-utils/etc/openvista/primary.d/ ;\
+	done
+
 	install scripts/etc/init.d/openvista-databases debian/openvista-utils.openvista-databases.init
+	install scripts/etc/init.d/openvista-replication debian/openvista-utils.openvista-replication.init
 	install scripts/etc/init.d/openvista debian/openvista-utils.openvista.init
+	install scripts/etc/init.d/openvista-init debian/openvista-utils.openvista-init.init
 
 	install -m 644 scripts/etc/bash_completion.d/openvista debian/openvista-utils/etc/bash_completion.d/
 
 	install scripts/etc/cron.d/openvista debian/openvista-utils.openvista.cron.d
 	install scripts/etc/cron.daily/openvista debian/openvista-utils.openvista.cron.daily
 
+	install -m 644 scripts/etc/openvista/lsyncd-routines.exclude debian/openvista-utils/etc/openvista/
+	install -m 644 scripts/etc/openvista/mysqlusers debian/openvista-utils/etc/openvista/
+	install -m 644 scripts/etc/openvista/network-interface debian/openvista-utils/etc/openvista/
+
 	install -m 644 debian/webdav.conf debian/openvista-utils/etc/apache2/conf.d/
 
 	touch debian/openvista-utils/etc/apache2/webdav.htpasswd
@@ -154,7 +166,9 @@
 #	dh_installmime
 #	dh_python
 	dh_installinit -r --no-start --name=openvista-databases -- defaults 28 10
+	dh_installinit -r --no-start --name=openvista-replication -- defaults 29 11
 	dh_installinit -r --no-start --name=openvista -- defaults 98 01
+	dh_installinit -r --no-start --name=openvista-init -- defaults 98 01
 	dh_installcron --name=openvista
 #	dh_installinfo
 	dh_installman

=== modified file 'packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/control'
--- packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/control	2010-11-12 23:05:47 +0000
+++ packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/control	2011-08-22 16:52:24 +0000
@@ -8,7 +8,7 @@
 
 Package: openvista-utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, rsync, pbzip2 (>= 1.0.5) | bzip2, cron, openssh-client, apache2.2-common, ssl-cert, openvista-libs-5.4000a | openvista-libs
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, rsync, pbzip2 (>= 1.0.5) | bzip2, cron, openssh-client, apache2.2-common, ssl-cert, mysql-server, openvista-libs-5.4000a | openvista-libs
 Recommends: openssh-server, apache2
 Suggests: putty-tools, bash-completion, pbzip2 (>= 1.0.5)
 Description: Utilities for configuring and managing OpenVista

=== modified file 'packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/openvista-utils.dirs'
--- packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/openvista-utils.dirs	2009-12-17 00:39:25 +0000
+++ packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/openvista-utils.dirs	2011-08-22 16:52:24 +0000
@@ -1,5 +1,8 @@
 etc/apache2/conf.d
 etc/bash_completion.d
+etc/openvista
+etc/openvista/primary.d
+etc/openvista/secondary.d
 opt/openvista
 sbin
 usr/bin

=== modified file 'packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/openvista-utils.manpages'
--- packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/openvista-utils.manpages	2010-02-09 23:36:06 +0000
+++ packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/openvista-utils.manpages	2011-08-22 16:52:24 +0000
@@ -1,15 +1,20 @@
+docs/man1/openvista.1
+docs/man1/ovbackup.1
+docs/man1/ovcc.1
+docs/man1/ovcheckperms.1
+docs/man1/ovcompile.1
+docs/man1/ovgetvar.1
+docs/man1/ovimport.1
+docs/man1/ovpurgejournals.1
+docs/man1/ovswitchjournals.1
+docs/man1/ovtied.1
 docs/man8/gtmsignal.8
+docs/man8/ovauth.8
+docs/man8/ovgenconfig.8
 docs/man8/ovinstanceadd.8
 docs/man8/ovinstancedel.8
+docs/man8/ovinstancerepl.8
+docs/man8/ovmysqlrepl.8
+docs/man8/ovreplicate.8
 docs/man8/ovrestore.8
-docs/man8/ovauth.8
-docs/man1/openvista.1
-docs/man1/ovtied.1
-docs/man1/ovcc.1
-docs/man1/ovbackup.1
-docs/man1/ovpurgejournals.1
-docs/man1/ovswitchjournals.1
-docs/man1/ovimport.1
-docs/man1/ovcheckperms.1
-docs/man1/ovgetvar.1
-docs/man1/ovcompile.1
+docs/man8/ovsshkey.8

=== modified file 'packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/openvista-utils.postinst'
--- packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/openvista-utils.postinst	2009-11-19 21:19:51 +0000
+++ packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/openvista-utils.postinst	2011-08-22 16:52:24 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # postinst script for openvista-utils
 #
 # see: dh_installdeb(1)
@@ -55,6 +55,50 @@
                 /etc/init.d/apache2 restart
             fi
         fi
+
+        # add replication support to existing instances if upgrading
+        if [ -n "$2" ] && dpkg --compare-versions "$2" lt 0.9-1; then
+            echo "Adding replication support to existing instances..."
+            . /usr/lib/openvista/functions
+            for instname in $(list_openvista_instances); do
+                # skip the instance if it has already been prepared for replication
+                instance=$(get_ov_root)/${instname}
+                if [ -e "${instance}/replication" ]; then
+                    echo "Instance ${instname} already supports replication"
+                    continue
+                fi
+
+                # create replication directory
+                install -o root -g openvista -m 2770 -d "${instance}/replication"
+
+                # create replication.conf
+                /usr/sbin/ovgenconfig "${instname}" "replication.conf" \
+                     "REPLICATION_MODE=" \
+                     "REPLICATION_IP=" \
+                     "BIND_ADDRESS=" \
+                     "OTHER_INSTANCE=" \
+                     "MUPIP_PORT=" \
+                     "INSTSECONDARY=" \
+                     "RSYNC_PORT="
+
+                # generate the replication instance name
+                random_suffix=$(tr -dc 'A-Za-z0-9' < /dev/urandom | head -c4)
+                gtm_repl_instname="${instname:0:8}_${random_suffix}"
+
+                # create replication instance file
+                gtm_dist=${instance}/gtm gtmgbldir=${instance}/globals/mumps.gld gtm_repl_instance=${instance}/replication/repl_instance "${instance}/gtm/mupip" replicate -instance_create -name="${gtm_repl_instname}" 2>&1 \
+                  | logger -p user.info
+                chmod 660 "${instance}/replication/repl_instance"
+
+                echo "Support for replication added to ${instname}"
+            done
+
+        fi
+
+        # on install or upgrade
+        if dpkg --compare-versions "$2" lt 0.9-1; then
+            ln -s /etc/rc.d/init.d/openvista /etc/openvista/primary.d/openvista
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

=== modified file 'packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/rules'
--- packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/rules	2010-11-12 23:05:47 +0000
+++ packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/rules	2011-08-22 16:52:24 +0000
@@ -72,7 +72,9 @@
 
 	# openvista-utils
 	rm -f debian/openvista-utils.openvista-databases.init
+	rm -f debian/openvista-utils.openvista-replication.init
 	rm -f debian/openvista-utils.openvista.init
+	rm -f debian/openvista-utils.openvista-init.init
 	rm -f debian/openvista-utils.openvista.cron.d
 	rm -f debian/openvista-utils.openvista.cron.daily
 	rm -f src/ovauth/ovauth
@@ -87,9 +89,9 @@
 	dh_installdirs -i
 
 	install -m 644 scripts/etc/munin/plugin-conf.d/openvista debian/openvista-munin-plugins/etc/munin/plugin-conf.d/
-	install scripts/usr/share/munin/plugins/openvista_databases_ debian/openvista-munin-plugins/usr/share/munin/plugins/
-	install scripts/usr/share/munin/plugins/openvista_locks_ debian/openvista-munin-plugins/usr/share/munin/plugins/
-	install scripts/usr/share/munin/plugins/openvista_processes_ debian/openvista-munin-plugins/usr/share/munin/plugins/
+	for plugin in scripts/usr/share/munin/plugins/*; do \
+		install $$plugin debian/openvista-munin-plugins/usr/share/munin/plugins/ ;\
+	done
 
 	dh_install -i
 
@@ -122,14 +124,24 @@
 		install $$script debian/openvista-utils/usr/bin/ ;\
 	done
 
+	for script in scripts/etc/openvista/primary.d/*; do \
+		install $$script debian/openvista-utils/etc/openvista/primary.d/ ;\
+	done
+
 	install scripts/etc/init.d/openvista-databases debian/openvista-utils.openvista-databases.init
+	install scripts/etc/init.d/openvista-replication debian/openvista-utils.openvista-replication.init
 	install scripts/etc/init.d/openvista debian/openvista-utils.openvista.init
+	install scripts/etc/init.d/openvista-init debian/openvista-utils.openvista-init.init
 
 	install -m 644 scripts/etc/bash_completion.d/openvista debian/openvista-utils/etc/bash_completion.d/
 
 	install scripts/etc/cron.d/openvista debian/openvista-utils.openvista.cron.d
 	install scripts/etc/cron.daily/openvista debian/openvista-utils.openvista.cron.daily
 
+	install -m 644 scripts/etc/openvista/lsyncd-routines.exclude debian/openvista-utils/etc/openvista/
+	install -m 644 scripts/etc/openvista/mysqlusers debian/openvista-utils/etc/openvista/
+	install -m 644 scripts/etc/openvista/network-interface debian/openvista-utils/etc/openvista/
+
 	install -m 644 debian/webdav.conf debian/openvista-utils/etc/apache2/conf.d/
 
 	touch debian/openvista-utils/etc/apache2/webdav.htpasswd
@@ -154,7 +166,9 @@
 #	dh_installmime
 #	dh_python
 	dh_installinit -r --no-start --name=openvista-databases -- defaults 28 10
+	dh_installinit -r --no-start --name=openvista-replication -- defaults 29 11
 	dh_installinit -r --no-start --name=openvista -- defaults 98 01
+	dh_installinit -r --no-start --name=openvista-init -- defaults 98 01
 	dh_installcron --name=openvista
 #	dh_installinfo
 	dh_installman

=== added file 'packages/rpm/CentOS/5/lsyncd.spec'
--- packages/rpm/CentOS/5/lsyncd.spec	1970-01-01 00:00:00 +0000
+++ packages/rpm/CentOS/5/lsyncd.spec	2011-08-22 16:52:24 +0000
@@ -0,0 +1,45 @@
+Name:		lsyncd
+Version:	1.34
+Release:	1
+Summary:	Live Syncing Daemon
+License:	GPLv2+
+URL:		http://code.google.com/p/lsyncd/
+Group:		Applications/Internet
+Packager:	Jonathan Tai <[e-mail]>
+
+Source:		lsyncd-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-root
+
+Requires:	/usr/bin/rsync, libxml2
+BuildRequires:	libxml2-devel
+
+%description
+Lsyncd uses rsync to synchronize local directories with a remote machine
+running rsyncd. Lsyncd watches multiple directories trees through inotify. The
+first step after adding the watches is to rsync all directories with the remote
+host, and then sync single file by collecting the inotify events. So lsyncd is
+a light-weight live mirror solution that should be easy to install and use
+while blending well with your system. See lsyncd --help for detailed command
+line options.
+
+%prep
+%setup
+
+%build
+./configure --prefix=/usr
+make
+
+%install
+rm -rf %{buildroot}
+
+make DESTDIR=%{buildroot} install
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+%doc %{_mandir}/man1/lsyncd.1*
+%doc %{_mandir}/man5/lsyncd.conf.xml.5*
+%{_bindir}/lsyncd

=== modified file 'packages/rpm/CentOS/5/openvista-gtm-integration.spec'
--- packages/rpm/CentOS/5/openvista-gtm-integration.spec	2010-12-07 00:31:07 +0000
+++ packages/rpm/CentOS/5/openvista-gtm-integration.spec	2011-08-22 16:52:24 +0000
@@ -7,7 +7,7 @@
 %endif
 
 Name:		openvista-gtm-integration
-Version:	0.8.11
+Version:	0.9
 Release:	1
 Summary:	Utilities for configuring and managing OpenVista
 License:	AGPL
@@ -94,11 +94,24 @@
 
 install -d %{buildroot}%{_sysconfdir}/rc.d/init.d/
 install scripts/etc/init.d/openvista-databases %{buildroot}%{_sysconfdir}/rc.d/init.d/
+install scripts/etc/init.d/openvista-replication %{buildroot}%{_sysconfdir}/rc.d/init.d/
 install scripts/etc/init.d/openvista %{buildroot}%{_sysconfdir}/rc.d/init.d/
+install scripts/etc/init.d/openvista-init %{buildroot}%{_sysconfdir}/rc.d/init.d/
 
 install -d %{buildroot}%{_sysconfdir}/bash_completion.d/
 install -m 644 scripts/etc/bash_completion.d/openvista %{buildroot}%{_sysconfdir}/bash_completion.d/
 
+install -d %{buildroot}%{_sysconfdir}/openvista/
+install -m 644 scripts/etc/openvista/lsyncd-routines.exclude %{buildroot}%{_sysconfdir}/openvista/
+install -m 644 scripts/etc/openvista/mysqlusers %{buildroot}%{_sysconfdir}/openvista/
+install -m 644 scripts/etc/openvista/network-interface %{buildroot}%{_sysconfdir}/openvista/
+
+install -d %{buildroot}%{_sysconfdir}/openvista/primary.d/
+for script in scripts/etc/openvista/primary.d/*; do
+    install $script %{buildroot}%{_sysconfdir}/openvista/primary.d/
+done
+install -d %{buildroot}%{_sysconfdir}/openvista/secondary.d
+
 install -d %{buildroot}%{_sysconfdir}/cron.d/
 install -m 644 scripts/etc/cron.d/openvista %{buildroot}%{_sysconfdir}/cron.d/
 
@@ -434,6 +447,7 @@
 Requires:	/bin/bash, coreutils, openssh, /usr/bin/logger, /usr/bin/rsync, /bin/tar, /usr/bin/bzip2, /usr/bin/find, vixie-cron
 Requires:	openvista-libs
 Requires:	httpd, mod_ssl, pam
+Requires:	lsyncd, mysql-server
 BuildRequires:	pam-devel
 
 # RPM should have a suggests tag...
@@ -462,8 +476,15 @@
 %{_mandir}/man8/*
 %{_mandir}/man1/*
 %{_sysconfdir}/rc.d/init.d/openvista-databases
+%{_sysconfdir}/rc.d/init.d/openvista-replication
 %{_sysconfdir}/rc.d/init.d/openvista
+%{_sysconfdir}/rc.d/init.d/openvista-init
 %{_sysconfdir}/bash_completion.d/openvista
+%{_sysconfdir}/openvista/lsyncd-routines.exclude
+%{_sysconfdir}/openvista/mysqlusers
+%{_sysconfdir}/openvista/network-interface
+%{_sysconfdir}/openvista/primary.d
+%{_sysconfdir}/openvista/secondary.d
 %config(noreplace) %{_sysconfdir}/cron.d/openvista
 %{_sysconfdir}/cron.daily/openvista
 %attr(2750,root,openvista) %dir /opt/openvista
@@ -478,7 +499,7 @@
 /usr/sbin/useradd -g openvista -G gtm openvista 2> /dev/null || :
 
 # update lock space in existing databases if upgrading
-%triggerun -n openvista-utils -- openvista-utils <= 0.8.3-2
+%triggerun -n openvista-utils -- openvista-utils < 0.8.3-3
 echo "Increasing lock space of existing databases..."
 for instance in /opt/openvista/*; do
     # update global directory
@@ -510,10 +531,21 @@
     fi
 done
 
+# add replication support to existing instances if upgrading
+%triggerun -n openvista-utils -- openvista-utils < 0.9
+# add replication support to existing instances
+/usr/sbin/ovaddrepl || :
+
+ln -s /etc/rc.d/init.d/openvista /etc/openvista/primary.d/openvista || :
+
 %post -n openvista-utils
 if [ $1 = 1 ]; then
     /sbin/chkconfig --add openvista-databases
+    /sbin/chkconfig --add openvista-replication
     /sbin/chkconfig --add openvista
+    /sbin/chkconfig --add openvista-init
+
+    ln -s /etc/rc.d/init.d/openvista /etc/openvista/primary.d/openvista
 fi
 
 /sbin/service httpd reload > /dev/null 2>&1 || :
@@ -521,7 +553,10 @@
 %preun -n openvista-utils
 if [ $1 = 0 ]; then
     /sbin/chkconfig --del openvista-databases
+    /sbin/chkconfig --del openvista-replication
     /sbin/chkconfig --del openvista
+    /sbin/chkconfig --del openvista-init
+    rm -f /etc/openvista/primary.d/openvista
 fi
 
 %postun -n openvista-utils

=== modified file 'packages/rpm/CentOS/5/openvista-gtm-integration_chkconfig.patch'
--- packages/rpm/CentOS/5/openvista-gtm-integration_chkconfig.patch	2010-04-01 03:46:21 +0000
+++ packages/rpm/CentOS/5/openvista-gtm-integration_chkconfig.patch	2011-08-22 16:52:24 +0000
@@ -1,28 +1,26 @@
---- scripts/etc/init.d/openvista	2010-03-31 20:13:12.465666412 -0700
-+++ scripts/etc/init.d/openvista.new	2010-03-31 20:43:59.215582465 -0700
-@@ -19,15 +19,6 @@
- #
+--- scripts/etc/init.d/openvista	2010-12-20 11:39:45.000000000 -0800
++++ scripts/etc/init.d/openvista.new	2010-12-22 18:08:40.000000000 -0800
+@@ -20,14 +20,6 @@
  # chkconfig: - 98 01
  # description: Application-level startup/shutdown script for OpenVista Server
--#
+ #
 -### BEGIN INIT INFO
 -# Provides:          openvista
--# Required-Start:    $all openvista-databases
--# Required-Stop:     $all openvista-databases
+-# Required-Start:    $all openvista-databases openvista-replication
+-# Required-Stop:     $all openvista-databases openvista-replication
 -# Default-Start:     2 3 4 5
 -# Default-Stop:      0 1 6
 -# Short-Description: Application-level startup/shutdown script for OpenVista Server
 -### END INIT INFO
  
  
- # Copyright (C) 2009 Medsphere Systems Corporation
---- scripts/etc/init.d/openvista-databases	2010-03-31 20:13:18.255601866 -0700
-+++ scripts/etc/init.d/openvista-databases.new	2010-03-31 20:43:47.785582841 -0700
-@@ -26,15 +26,6 @@
- #
+ # Copyright (C) 2009-2010 Medsphere Systems Corporation
+--- scripts/etc/init.d/openvista-databases	2010-12-21 21:28:59.000000000 -0800
++++ scripts/etc/init.d/openvista-databases.new	2010-12-22 17:34:15.000000000 -0800
+@@ -27,14 +27,6 @@
  # chkconfig: - 50 30
  # description: Database-level startup/shutdown script for OpenVista Server
--#
+ #
 -### BEGIN INIT INFO
 -# Provides:          openvista-databases
 -# Required-Start:    $local_fs $syslog $time
@@ -33,4 +31,38 @@
 -### END INIT INFO
  
  
- # Copyright (C) 2009 Medsphere Systems Corporation
+ # Copyright (C) 2009-2010 Medsphere Systems Corporation
+--- scripts/etc/init.d/openvista-replication	2010-12-21 15:10:16.000000000 -0800
++++ scripts/etc/init.d/openvista-replication.new	2010-12-22 17:34:31.000000000 -0800
+@@ -5,14 +5,6 @@
+ # chkconfig: - 56 31
+ # description: Replication startup/shutdown script for OpenVista Server
+ #
+-### BEGIN INIT INFO
+-# Provides:          openvista-replication
+-# Required-Start:    openvista-databases sshd
+-# Required-Stop:
+-# Default-Start:     2 3 4 5
+-# Default-Stop:      0 1 6
+-# Short-Description: Replication startup/shutdown script for OpenVista Server
+-### END INIT INFO
+ 
+ 
+ # Copyright (C) 2010 Medsphere Systems Corporation
+--- scripts/etc/init.d/openvista-init	2010-12-19 21:34:22.000000000 -0800
++++ scripts/etc/init.d/openvista-init.new	2010-12-22 18:06:15.000000000 -0800
+@@ -5,14 +5,6 @@
+ # chkconfig: - 98 01
+ # description: Replication startup/shutdown script for OpenVista Server
+ #
+-### BEGIN INIT INFO
+-# Provides:          openvista-init
+-# Required-Start:    openvista-databases openvista-replication
+-# Required-Stop:     openvista-databases openvista-replication
+-# Default-Start:     2 3 4 5
+-# Default-Stop:      0 1 6
+-# Short-Description: Replication startup/shutdown script for OpenVista Server
+-### END INIT INFO
+ 
+ 
+ # Copyright (C) 2010 Medsphere Systems Corporation

=== modified file 'rpmbuild.sh'
--- rpmbuild.sh	2009-11-23 21:23:06 +0000
+++ rpmbuild.sh	2011-08-22 16:52:24 +0000
@@ -62,7 +62,7 @@
             # this package must be built as root; assume sudo does not require a password
             ( cd "$topdir/SPECS" && sudo rpmbuild -ba "$package.spec" )
             ;;
-        putty-tools)
+        putty-tools|lsyncd)
             # assume sources are already present
 
             ( cd "$topdir/SPECS" && rpmbuild -ba "$package.spec" )

=== modified file 'scripts/etc/bash_completion.d/openvista'
--- scripts/etc/bash_completion.d/openvista	2010-09-24 19:19:29 +0000
+++ scripts/etc/bash_completion.d/openvista	2011-08-22 16:52:24 +0000
@@ -4,48 +4,50 @@
 # Copyright (C) 2009-2010 Medsphere Systems Corporation
 #
 # This program is free software; you can redistribute it and/or modify it solely
-# under the terms of the GNU Affero General Public License version 3 as published
-# by the Free Software Foundation.
+# under the terms of the GNU Affero General Public License version 3 as
+# published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
-# for more details.
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
 #
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses>.
+# You should have received a copy of the GNU Affero General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses>.
 #
 # You can contact Medsphere Systems Corporation headquarters at 1917 Palomar
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
+# Setting extglob enables several extended pattern matching operators, including
+# @(pattern-list), which is used by _valid_actions().  See Pathname Expansion in
+# the bash man page for more details.
+shopt -s extglob
 
 # common functions
 . /usr/lib/openvista/functions
 
 _ov()
 {
+
     COMPREPLY=()
 
-    for i in `seq $COMP_CWORD`; do
-        # we've run out of the allowed number of non-option arguments; perform
-        # no further completion
-        if [ $allowed_nonopt_words -eq 0 ]; then
-            return
-        fi
+    for i in $(seq $COMP_CWORD); do
+        # we've run out of the allowed number of non-option arguments;
+        # perform no further completion
+        [[ "$allowed_nonopt_words" == 0 ]] && return
 
         case ${COMP_WORDS[i]} in
+            -*h*|-*V*)
+                # perform no further completion
+                # If we just return here, -h won't complete the space afterward.
+                allowed_nonopt_words=0
+                ;;
             -*)
-                # if one of the arguments so far is -h or -V, perform no further completion
-                if [ x"${COMP_WORDS[i]}" = x"-h" ] || [ x"${COMP_WORDS[i]}" = x"-V" ]; then
-                    # if we just return here, -h won't complete the space
-                    # afterward; use a hack to exit on the next iteration of
-                    # the loop
-                    allowed_nonopt_words=0
-                fi
+                # any other option
+                :
                 ;;
-
             *)
-                allowed_nonopt_words=`expr $allowed_nonopt_words - 1`
+                allowed_nonopt_words=$(( $allowed_nonopt_words - 1 ))
                 ;;
         esac
     done
@@ -57,8 +59,9 @@
             COMPREPLY=( $(compgen -W "$opts" -- $cur) )
             ;;
         *)
-            if [ $allowed_nonopt_words -eq 0 ]; then
-                COMPREPLY=( $(compgen -W "$(list_openvista_instances)" -- $cur) )
+            if [[ "$allowed_nonopt_words" == 0 ]]; then
+                COMPREPLY=( \
+                  $(compgen -W "$(list_openvista_instances)" -- $cur) )
             else
                 _filedir
             fi
@@ -82,10 +85,10 @@
 complete -F _openvista ovcheckperms
 complete -F _openvista ovcompile
 
-# ovbackup [-h] [-V] [-q] INSTANCE_NAME
+# ovbackup [-h] [-V] [-q] [-o] INSTANCE_NAME
 _ovbackup()
 {
-    opts='-h -V -q'
+    opts='-h -V -q -o'
     allowed_nonopt_words=1
     _ov
 }
@@ -112,10 +115,10 @@
 
 complete -F _ovrestore $filenames ovrestore
 
-# ovinstanceadd [-h] [-V] [-p path] NEW_INSTANCE_NAME
+# ovinstanceadd [-h] [-V] [-p PATH] [-r GTM_REPL_INSTNAME] NEW_INSTANCE_NAME
 _ovinstanceadd()
 {
-    opts='-h -V -p'
+    opts='-h -V -p -r'
     allowed_nonopt_words=1
 
     COMPREPLY=()
@@ -123,13 +126,14 @@
     for i in $(seq $COMP_CWORD); do
         [[ "$allowed_nonopt_words" == 0 ]] && return
         case ${COMP_WORDS[i]} in
+            -*h*|-*V*)
+                allowed_nonopt_words=0
+                ;;
+            -*p|-*r)
+                allowed_nonopt_words=$(( $allowed_nonopt_words + 1 ))
+                ;;
             -*)
-                if [[ "${COMP_WORDS[i]}" == "-h" ]] \
-                  || [[ "${COMP_WORDS[i]}" == "-V" ]]; then
-                    allowed_nonopt_words=0
-                elif [[ "${COMP_WORDS[i]}" == "-p" ]]; then
-                    allowed_nonopt_words=$(( $allowed_nonopt_words + 1 ))
-                fi
+                :
                 ;;
             *)
                 allowed_nonopt_words=$(( $allowed_nonopt_words - 1 ))
@@ -145,16 +149,16 @@
             COMPREPLY=( $(compgen -W "$opts" -- $cur) )
             ;;
         *)
-            if [[ "$prev" == "-p" ]]; then
-                _filedir
-            fi
+            [[ "$prev" == "-p" ]] && _filedir
+            # There is no useful way to complete gtm_repl_instname.
             ;;
     esac
 }
 
 complete -F _ovinstanceadd $filenames ovinstanceadd
 
-# ovimport [-h] [-V] [-q] [-f] [-t target] [-c imported|all|none] [-r] ROUTINES [-g] GLOBALS INSTANCE_NAME
+# ovimport [-h] [-V] [-q] [-f] [-t target] [-c imported|all|none]
+#          [-r] ROUTINES [-g] GLOBALS INSTANCE_NAME
 _ovimport()
 {
     opts='-h -V -q -f -t -c -r -g'
@@ -162,28 +166,24 @@
 
     COMPREPLY=()
 
-    for i in `seq $COMP_CWORD`; do
-        # we've run out of the allowed number of non-option arguments; perform
-        # no further completion
-        if [ $allowed_nonopt_words -eq 0 ]; then
-            return
-        fi
+    for i in $(seq $COMP_CWORD); do
+        # we've run out of the allowed number of non-option arguments;
+        # perform no further completion
+        [[ "$allowed_nonopt_words" == 0 ]] && return
 
         case ${COMP_WORDS[i]} in
+            -*h*|-*V*)
+                # perform no further completion
+                allowed_nonopt_words=0
+                ;;
+            -*t|-*c|-*r|-*g)
+                allowed_nonopt_words=$(( $allowed_nonopt_words + 1 ))
+                ;;
             -*)
-                # if one of the arguments so far is -h or -V, perform no further completion
-                if [ x"${COMP_WORDS[i]}" = x"-h" ] || [ x"${COMP_WORDS[i]}" = x"-V" ]; then
-                    # if we just return here, -h won't complete the space
-                    # afterward; use a hack to exit on the next iteration of
-                    # the loop
-                    allowed_nonopt_words=0
-                elif [ x"${COMP_WORDS[i]}" = x"-t" ] || [ x"${COMP_WORDS[i]}" = x"-c" ] || [ x"${COMP_WORDS[i]}" = x"-r" ] || [ x"${COMP_WORDS[i]}" = x"-g" ]; then
-                    allowed_nonopt_words=`expr $allowed_nonopt_words + 1`
-                fi
+                :
                 ;;
-
             *)
-                allowed_nonopt_words=`expr $allowed_nonopt_words - 1`
+                allowed_nonopt_words=$(( $allowed_nonopt_words - 1 ))
                 ;;
         esac
     done
@@ -196,14 +196,21 @@
             COMPREPLY=( $(compgen -W "$opts" -- $cur) )
             ;;
         *)
-            if [ $allowed_nonopt_words -eq 0 ]; then
-                COMPREPLY=( $(compgen -W "$(list_openvista_instances)" -- $cur) )
-            elif [ x"$prev" = x"-t" ]; then
-                _filedir -d
-            elif [ x"$prev" = x"-c" ]; then
-                COMPREPLY=( $(compgen -W "imported all none" -- $cur) )
-            elif [ x"$prev" = x"-r" ] || [ x"$prev" = x"-g" ]; then
-                _filedir
+            if [[ "$allowed_nonopt_words" == 0 ]]; then
+                COMPREPLY=( \
+                  $(compgen -W "$(list_openvista_instances)" -- $cur) )
+            else
+                case $prev in
+                    -*t)
+                        _filedir -d
+                        ;;
+                    -*c)
+                        COMPREPLY=( $(compgen -W "imported all none" -- $cur) )
+                        ;;
+                    -*r|-*g)
+                        _filedir
+                        ;;
+                esac
             fi
             ;;
     esac
@@ -211,34 +218,31 @@
 
 complete -F _ovimport $filenames ovimport
 
-# ovgetvar [-h] [-V] INSTANCE_NAME gtm_dist|gtm_path|gtmroutines|gtmgbldir
+# ovgetvar [-h] [-V] INSTANCE_NAME VARIABLE_NAME
 _ovgetvar()
 {
     opts='-h -V'
     allowed_nonopt_words=2
+    variable_names="gtm_dist gtm_path gtmroutines gtmgbldir"
+    variable_names+=" gtm_repl_instance gtm_repl_instname replication_mode"
 
     COMPREPLY=()
 
-    for i in `seq $COMP_CWORD`; do
-        # we've run out of the allowed number of non-option arguments; perform
-        # no further completion
-        if [ $allowed_nonopt_words -eq 0 ]; then
-            return
-        fi
+    for i in $(seq $COMP_CWORD); do
+        # we've run out of the allowed number of non-option arguments;
+        # perform no further completion
+        [[ "$allowed_nonopt_words" == 0 ]] && return
 
         case ${COMP_WORDS[i]} in
+            -*h*|-*V*)
+                # perform no further completion
+                allowed_nonopt_words=0
+                ;;
             -*)
-                # if one of the arguments so far is -h or -V, perform no further completion
-                if [ x"${COMP_WORDS[i]}" = x"-h" ] || [ x"${COMP_WORDS[i]}" = x"-V" ]; then
-                    # if we just return here, -h won't complete the space
-                    # afterward; use a hack to exit on the next iteration of
-                    # the loop
-                    allowed_nonopt_words=0
-                fi
+                :
                 ;;
-
             *)
-                allowed_nonopt_words=`expr $allowed_nonopt_words - 1`
+                allowed_nonopt_words=$(( $allowed_nonopt_words - 1 ))
                 ;;
         esac
     done
@@ -250,13 +254,443 @@
             COMPREPLY=( $(compgen -W "$opts" -- $cur) )
             ;;
         *)
-            if [ $allowed_nonopt_words -eq 0 ]; then
-                COMPREPLY=( $(compgen -W "gtm_dist gtm_path gtmroutines gtmgbldir" -- $cur) )
+            if [[ "$allowed_nonopt_words" == 0 ]]; then
+                COMPREPLY=( $(compgen -W "$variable_names" -- $cur) )
             else
-                COMPREPLY=( $(compgen -W "$(list_openvista_instances)" -- $cur) )
+                COMPREPLY=( \
+                  $(compgen -W "$(list_openvista_instances)" -- $cur) )
             fi
             ;;
     esac
 }
 
 complete -F _ovgetvar ovgetvar
+
+#     ovinstancerepl -a PRIMARY_IP -b SECONDARY_IP -m MUPIP_PORT -r RSYNC_PORT
+#                    [-w OTHER_INSTANCE] [-f BACKUP_FILE] [-i INSTSECONDARY]
+#                    [-k KEYS_DIRECTORY] primary|secondary INSTANCE_NAME
+# or  ovinstancerepl [-s] status|list INSTANCE_NAME
+# or  ovinstancerepl test|stop|start INSTANCE_NAME
+# or  ovinstancerepl [-f BACKUP_FILE] resync INSTANCE_NAME
+# or  ovinstancerepl -h
+# or  ovinstancerepl -V
+_ovinstancerepl()
+{
+    local opts='-h -V -a -b -f -i -k -m -r -s -w '
+    typeset -i allowed_nonopt_words=2
+
+    COMPREPLY=()
+
+    for i in $(seq $COMP_CWORD); do
+        # we've run out of the allowed number of non-option arguments;
+        # perform no further completion
+        (( $allowed_nonopt_words == 0 )) && return
+
+        case ${COMP_WORDS[i]} in
+            -*h*|-*V*)
+                # perform no further completion
+                allowed_nonopt_words=0
+                ;;
+            -*a|-*b|-*m|-*r|-*w|-*f|-*i|-*k)
+                (( allowed_nonopt_words++ ))
+                ;;
+            -*)
+                :
+                ;;
+            *)
+                (( allowed_nonopt_words-- ))
+                ;;
+        esac
+    done
+
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    case $cur in
+        -*)
+            COMPREPLY=( $(compgen -W "$opts" -- $cur) )
+            ;;
+        *)
+            case $prev in
+                -*a|-*b)
+                    _known_hosts_real -a "$cur"
+                    ;;
+                -*f)
+                    _filedir
+                    ;;
+                -*i|-*m|-*r)
+                    # no useful completion
+                    :
+                    ;;
+                -*k)
+                    _filedir -d
+                    ;;
+                -*w)
+                    local other_instances
+                    other_instances=$(_list_other_instances)
+                    [[ "$other_instances" ]] \
+                      || other_instances=$(list_openvista_instances)
+                    COMPREPLY=( \
+                      $(compgen -W "$other_instances" -- $cur) )
+                    ;;
+                *)
+                    if (( $allowed_nonopt_words == 0 )); then
+                        # In all cases, an instance name is the last argument.
+                        COMPREPLY=( \
+                          $(compgen -W "$(list_openvista_instances)" -- $cur) )
+                    else
+                        actions=$(_valid_actions \
+                            "primary|secondary=a b m r|w f i k" \
+                            "status|list=|s" \
+                            "test|stop|start=" \
+                            "resync=|f" \
+                            )
+                        COMPREPLY=( $(compgen -W "${actions[*]}" -- $cur) )
+                    fi
+                    ;;
+            esac
+            ;;
+    esac
+}
+
+complete -F _ovinstancerepl ovinstancerepl
+
+_list_other_instances()
+{
+    # List the instances on the other server (if possible).
+    local a_flag_i primary_ip b_flag_i secondary_ip
+    if a_flag_i=$(array_index_re "-[a-z]*a" "${COMP_WORDS[@]}") \
+         && primary_ip=${COMP_WORDS[a_flag_i+1]} \
+         && ! is_local_ip "$primary_ip" ; then
+        replication_ip=$primary_ip
+    elif b_flag_i=$(array_index_re "-[a-z]*b" "${COMP_WORDS[@]}") \
+         && secondary_ip=${COMP_WORDS[b_flag_i+1]} \
+         && ! is_local_ip "$secondary_ip" ; then
+        replication_ip=$secondary_ip
+    else
+        return 1
+    fi
+    /usr/sbin/ovsshkey -qt "$replication_ip" || return 1
+    sshk -d "$replication_ip" \
+          ". /usr/lib/openvista/functions; list_openvista_instances"
+}
+
+_valid_actions()
+{
+    # Return the actions that are valid, based on options used so far.
+    # Usage:
+    #   _valid_actions \
+    #       ACTION[|ACTION...]=REQD_FLAGS[|OPT_FLAGS]
+    # See _ovinstancerepl() for example.
+    local rules=( "$@" )
+    local used_flags rule actions rule all_flags req_flags action
+    used_flags=$(printf "%s\n" "${COMP_WORDS[@]}" \
+                   | sed -nr "s/^-(.)$/\1/p" \
+                   | tr '\n' ' ')
+    for rule in "${rules[@]}"; do
+        actions=${rule%%=*}
+        all_flags=${rule#*=}
+        req_flags=${all_flags%%|*}
+        for action in ${actions//|/ }; do
+            # all req_flags must be in used_flags
+            used_flags=${used_flags// /|}
+            [[ "${req_flags//@($used_flags| )}" ]] && continue
+            # all used_flags must be in all_flags
+            all_flags=${all_flags// /|}
+            [[ "${used_flags//@($all_flags| )}" ]] && continue
+            echo -n "$action "
+        done
+    done
+}
+
+#    ovmysqlrepl [-q] [-p MYSQL_PASSWORD] -a PRIMARY_IP -b SECONDARY_IP
+#                primary
+# or ovmysqlrepl [-fqw] [-p MYSQL_PASSWORD] -a PRIMARY_IP -b SECONDARY_IP
+#                secondary
+# or ovmysqlrepl [-s] [-p MYSQL_PASSWORD] status
+# or ovmysqlrepl [-s] list
+# or ovmysqlrepl [-p MYSQL_PASSWORD] test|mode|ip|backlog|stop|start
+# or ovmysqlrepl -h
+# or ovmysqlrepl -V
+_ovmysqlrepl()
+{
+    local opts='-h -V -a -b -f -p -q -s -w '
+    typeset -i allowed_nonopt_words=1
+
+    COMPREPLY=()
+
+    for i in $(seq $COMP_CWORD); do
+        # we've run out of the allowed number of non-option arguments;
+        # perform no further completion
+        (( $allowed_nonopt_words == 0 )) && return
+
+        case ${COMP_WORDS[i]} in
+            -*h*|-*V*)
+                # perform no further completion
+                allowed_nonopt_words=0
+                ;;
+            -*a|-*b|-*p)
+                (( allowed_nonopt_words++ ))
+                ;;
+            -*)
+                :
+                ;;
+            *)
+                (( allowed_nonopt_words-- ))
+                ;;
+        esac
+    done
+
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    case $cur in
+        -*)
+            COMPREPLY=( $(compgen -W "$opts" -- $cur) )
+            ;;
+        *)
+            case $prev in
+                -*a|-*b)
+                    _known_hosts_real -a "$cur"
+                    ;;
+                -*p)
+                    # no useful completion
+                    :
+                    ;;
+                *)
+                    actions=$(_valid_actions \
+                        "primary=a b|q p" \
+                        "secondary=a b|f q p w" \
+                        "status=|p s" \
+                        "list=|s" \
+                        "test|mode|ip|backlog|stop|start=|p" \
+                        )
+                    COMPREPLY=( $(compgen -W "${actions[*]}" -- $cur) )
+                    ;;
+            esac
+            ;;
+    esac
+}
+
+complete -F _ovmysqlrepl ovmysqlrepl
+
+#     ovreplicate [-e INSTANCE_NAME] [-p MYSQL_PASSWORD]
+#                 setup|switchover|promote|demote|stop|start
+# or  ovreplicate [-s] status|list [INSTANCE_NAME...]
+# or  ovreplicate test [INSTANCE_NAME...]
+# or  ovreplicate -h
+# or  ovreplicate -V
+_ovreplicate()
+{
+    local opts='-h -V -e -p -s'
+    typeset -i allowed_nonopt_words=1
+
+    COMPREPLY=()
+
+    for i in $(seq $COMP_CWORD); do
+        # we've run out of the allowed number of non-option arguments;
+        # perform no further completion
+        (( $allowed_nonopt_words == 0 )) && return
+
+        case ${COMP_WORDS[i]} in
+            -*h*|-*V*)
+                # perform no further completion
+                allowed_nonopt_words=0
+                ;;
+            -*e|-*p)
+                (( allowed_nonopt_words++ ))
+                ;;
+            -*|status|list|test)
+                :
+                ;;
+            *)
+                (( allowed_nonopt_words-- ))
+                ;;
+        esac
+    done
+
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    case $cur in
+        -*)
+            COMPREPLY=( $(compgen -W "$opts" -- $cur) )
+            ;;
+        *)
+            case $prev in
+                -*e)
+                    COMPREPLY=( \
+                      $(compgen -W "$(list_openvista_instances)" -- $cur) )
+                    ;;
+                -*p)
+                    # no useful completion
+                    :
+                    ;;
+                status|list|test)
+                    COMPREPLY=( \
+                      $(compgen -W "$(list_openvista_instances)" -- $cur) )
+                    ;;
+                *)
+                    actions=$(_valid_actions \
+                        "setup|switchover|promote|demote|stop|start=|e p" \
+                        "status|list=|s" \
+                        "test=|" \
+                        )
+                    COMPREPLY=( $(compgen -W "${actions[*]}" -- $cur) )
+                    ;;
+            esac
+            ;;
+    esac
+}
+
+complete -F _ovreplicate ovreplicate
+
+#     ovsshkey [-p PASSWORD_PROMPT] [-q] [-s INSTANCE_NAME] [-t] REMOTE_HOST
+# or  ovsshkey -h
+# or  ovsshkey -V
+# or  ovsshkey -k CALLER
+# or  ovsshkey -n
+_ovsshkey()
+{
+    local opts='-h -V -k -n -p -q -s -t '
+    typeset -i allowed_nonopt_words=1
+
+    COMPREPLY=()
+
+    for i in $(seq $COMP_CWORD); do
+        # we've run out of the allowed number of non-option arguments;
+        # perform no further completion
+        (( $allowed_nonopt_words == 0 )) && return
+
+        case ${COMP_WORDS[i]} in
+            -*h*|-*V*|-*n*)
+                # perform no further completion
+                allowed_nonopt_words=0
+                ;;
+            -*p|-*s)
+                (( allowed_nonopt_words++ ))
+                ;;
+            -*)
+                :
+                ;;
+            *)
+                (( allowed_nonopt_words-- ))
+                ;;
+        esac
+    done
+
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    case $cur in
+        -*)
+            COMPREPLY=( $(compgen -W "$opts" -- $cur) )
+            ;;
+        *)
+            case $prev in
+                -*p|-*k)
+                    # no useful completion
+                    :
+                    ;;
+                -*s)
+                    COMPREPLY=( \
+                      $(compgen -W "$(list_openvista_instances)" -- $cur) )
+                    ;;
+                *)
+                    _known_hosts_real -a "$cur"
+                    ;;
+            esac
+            ;;
+    esac
+}
+
+complete -F _ovsshkey ovsshkey
+
+#    ovgenconfig [-e] [-s SUBDIRECTORY] INSTANCE_NAME CONF_FILE [SETTING...]
+# or ovgenconfig -h
+# or ovgenconfig -V
+_ovgenconfig()
+{
+    local opts='-h -V -e -s '
+    # The ovgenconfig command allows more than these two non-option words, but
+    # we have no basis on which to provide completion of the settings arguments,
+    # so completion only allows for the two words.
+    typeset -i allowed_nonopt_words=2
+
+    COMPREPLY=()
+
+    for i in $(seq $COMP_CWORD); do
+        # we've run out of the allowed number of non-option arguments;
+        # perform no further completion
+        (( $allowed_nonopt_words == 0 )) && return
+
+        case ${COMP_WORDS[i]} in
+            -*h*|-*V*)
+                # perform no further completion
+                allowed_nonopt_words=0
+                ;;
+            -*s)
+                (( allowed_nonopt_words++ ))
+                ;;
+            -*)
+                :
+                ;;
+            *)
+                (( allowed_nonopt_words-- ))
+                ;;
+        esac
+    done
+
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    case $cur in
+        -*)
+            COMPREPLY=( $(compgen -W "$opts" -- $cur) )
+            ;;
+        *)
+            case $prev in
+                -*s)
+                    # We don't have the instance name at this point from which
+                    # to get the directories list, but only two of the standard
+                    # subdirectories make sense anyway.
+                    COMPREPLY=( \
+                      $(compgen -W "etc replication" -- $cur) )
+                    ;;
+                *)
+                    if [[ "$allowed_nonopt_words" == 1 ]]; then
+                        # instance name
+                        COMPREPLY=( \
+                          $(compgen -W "$(list_openvista_instances)" -- $cur) )
+                    elif [[ "$allowed_nonopt_words" == 0 ]]; then
+                        # configuration file name (basename + extension)
+                        local s_flag_i subdirectory
+                        if s_flag_i=$(array_index_re "-[a-z]*s" \
+                                        "${COMP_WORDS[@]}"); then
+                            subdirectory=${COMP_WORDS[s_flag_i+1]}
+                        else
+                            subdirectory=etc
+                        fi
+                        case $subdirectory in
+                            etc)
+                                COMPREPLY=( $(compgen -W "$(echo \
+                                    backups.conf \
+                                    journals.conf \
+                                    replication.conf \
+                                    )" -- $cur) )
+                                ;;
+                            replication)
+                                COMPREPLY=( $(compgen -W "$(echo \
+                                    lsyncd.conf.xml \
+                                    rsyncd.conf \
+                                    )" -- $cur) )
+                                ;;
+                        esac
+                    fi
+                    ;;
+            esac
+            ;;
+    esac
+}
+
+complete -F _ovgenconfig ovgenconfig

=== modified file 'scripts/etc/init.d/openvista'
--- scripts/etc/init.d/openvista	2010-04-01 03:46:09 +0000
+++ scripts/etc/init.d/openvista	2011-08-22 16:52:24 +0000
@@ -22,29 +22,29 @@
 #
 ### BEGIN INIT INFO
 # Provides:          openvista
-# Required-Start:    $all openvista-databases
-# Required-Stop:     $all openvista-databases
+# Required-Start:    $all openvista-databases openvista-replication
+# Required-Stop:     $all openvista-databases openvista-replication
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Application-level startup/shutdown script for OpenVista Server
 ### END INIT INFO
 
 
-# Copyright (C) 2009 Medsphere Systems Corporation
+# Copyright (C) 2009-2010 Medsphere Systems Corporation
 #
 # This program is free software; you can redistribute it and/or modify it solely
 # under the terms of the GNU Affero General Public License version 3 as published
 # by the Free Software Foundation.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses>.
-# 
-# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar 
+#
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
 
@@ -57,14 +57,27 @@
 # here, so we have to pick one.
 [ -f /usr/lib/openvista/functions ] || exit 0
 
-# Source function library.
-[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
-[ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions
+# source function libraries
+# CentOS/RHEL, provides action(), status()
+[[ -f /etc/rc.d/init.d/functions ]] && . /etc/rc.d/init.d/functions
+# Ubuntu/Debian, provides log_daemon_msg(), status_of_proc()
+[[ -f /lib/lsb/init-functions ]] && . /lib/lsb/init-functions
+# OpenVista
 . /usr/lib/openvista/functions
 
+log_command_usage "$@"
+
+usage()
+{
+    # Display usage information.
+    cat <<EOF
+Usage: openvista {start|stop|restart|force-reload} [INSTANCE_NAME]
+EOF
+}
+
 run_hook()
 {
-    set_gtm_env "$1" || return 1
+    set_gtm_env -v "$1" || return $?
 
     umask 007
 
@@ -72,23 +85,38 @@
 
     routine="$2"
 
-    logger -p user.info -t "openvista[$$]" -- Running $routine in $instance
-
-    if [ `id -u` -eq 0 ]; then
+    # See comments in the openvista-databases script for explanation of the
+    # clean flag.  It is normally removed by openvista-databases and should not
+    # be found at this point, but it will also be removed here just in case the
+    # scripts are run out of order.
+    clean_flag_file="/etc/openvista/clean_shutdown_$instance"
+    if [[ "$routine" == "ZSTART" ]] && [[ -e "$clean_flag_file" ]]; then
+        if rm -f "$clean_flag_file"; then
+            log -l "Removed the clean shutdown flag for $instance database"
+        else
+            log -l \
+              "Failed to remove the clean shutdown flag for $instance database"
+        fi
+    fi
+
+    log -l "Running $routine in $instance"
+
+    if [ $(id -u) -eq 0 ]; then
         su -m -c "echo HALT | mumps -run \"^$routine\"" "$user" 2>&1 \
           | grep -v '^$' \
-          | logger -p user.info -t "openvista[$$]"
+          | log -lp
         retval=${PIPESTATUS[0]}
     else
         echo HALT | mumps -run "^$routine" 2>&1 \
           | grep -v '^$' \
-          | logger -p user.info -t "openvista[$$]"
+          | log -lp
         retval=${PIPESTATUS[1]}
     fi
 
     # mumps returns 253 if the routine does not exist
     if [ $retval -eq 253 ]; then
-        logger -p user.info -t "openvista[$$]" -- No routine named $routine was found in $instance, skipping $instance
+        log -lc "No routine named $routine was found in $instance," \
+                "skipping $instance"
 
         # fake success
         retval=0
@@ -99,91 +127,64 @@
     return 0
 }
 
-# check permissions
-in_groups || {
-    echo "openvista: permission denied" >&2
-    exit 4 # LSB: user had insufficient privilege
-}
-
-# check for for valid arguments (requires correct permissions to do; must happen after permission checks)
-if [ -n "$2" ]; then
-    set_gtm_env "$2" || {
-        echo "openvista: $instance: Not an OpenVista instance" >&2
-        exit 2 # LSB: invalid or excess argument(s)
-    }
+# check for for valid arguments
+instance=$2
+if [[ "$instance" ]]; then
+    is_openvista_instance "$instance" || exit_command 2 "$ov_error"
 fi
 
 case $1 in
+    # For 'start' and 'stop', the ov_init_action calls provide the exit value
+    # for the script.  The CentOS/RHEL subsys lock is set and cleared
+    # independently of the return code, because a partial failure of one action
+    # should not cause the other to be skipped.  The lock is only set or cleared
+    # when being called without an instance name argument.  Any error from
+    # touching or removing the lock file is hidden from the console so that the
+    # script can be run without an instance name by a non-root admin without
+    # printing confusing error messages.
     start)
-        if [ -z "$2" ]; then
-            if function_exists "action"; then
-                echo "Starting OpenVista..."
-            elif function_exists "log_daemon_msg"; then
-                log_daemon_msg "Running startup hooks for OpenVista databases"
-            fi
-
-            for instance in `list_openvista_instances`; do
-                if function_exists "action"; then
-                    action $"  Running startup hooks for $instance: " run_hook "$instance" ZSTART
-                elif function_exists "log_daemon_msg"; then
-                    log_progress_msg "$instance"
-                    run_hook "$instance" ZSTART || end_msg=1
-                else
-                    run_hook "$instance" ZSTART
-                fi
-            done
-
-            if function_exists "log_daemon_msg"; then
-                log_end_msg ${end_msg:-0}
-            fi
+        run_start_hook() { run_hook "$1" ZSTART; }
+        instance_function=run_start_hook
+        if function_exists "action"; then
+            # CentOS/RHEL
+            touch /var/lock/subsys/openvista \
+              2>&1 | log -lp
+            ov_init_action_rhel "$instance_function" \
+              "Starting OpenVista" \
+              "Running startup hooks for {instance} database" \
+              "$instance"
+        elif function_exists "log_daemon_msg"; then
+            # Ubuntu/Debian
+            ov_init_action_debian "$instance_function" \
+              "Running startup hooks for OpenVista databases" \
+              "Running startup hooks for OpenVista database" \
+              "$instance"
         else
-            if function_exists "action"; then
-                action $"Running startup hooks for $instance: " run_hook "$instance" ZSTART
-            elif function_exists "log_daemon_msg"; then
-                log_daemon_msg "Running startup hooks for OpenVista databases" "$instance"
-                run_hook "$instance" ZSTART
-                log_end_msg $?
-            else
-                run_hook "$instance" ZSTART
-            fi
+            # other
+            ov_init_action_other "$instance_function" "$instance"
         fi
         ;;
     stop)
-        if [ -z "$2" ]; then
-            if function_exists "action"; then
-                echo "Stopping OpenVista..."
-            elif function_exists "log_daemon_msg"; then
-                log_daemon_msg "Running shutdown hooks for OpenVista databases"
-            fi
-
-            for instance in `list_openvista_instances`; do
-                if function_exists "action"; then
-                    action $"  Running shutdown hooks for $instance: " run_hook "$instance" ZSTOP
-                elif function_exists "log_daemon_msg"; then
-                    log_progress_msg "$instance"
-                    run_hook "$instance" ZSTOP || end_msg=1
-                else
-                    run_hook "$instance" ZSTOP
-                fi
-            done
-
-            if function_exists "log_daemon_msg"; then
-                log_end_msg ${end_msg:-0}
-            fi
+        run_stop_hook() { run_hook "$1" ZSTOP; }
+        instance_function=run_stop_hook
+        if function_exists "action"; then
+            # CentOS/RHEL
+            [[ "$instance" ]] || rm -f /var/lock/subsys/openvista \
+              2>&1 | log -lp
+            ov_init_action_rhel "$instance_function" \
+              "Running shutdown hooks for OpenVista databases" \
+              "Running shutdown hooks for {instance} database" \
+              "$instance"
+        elif function_exists "log_daemon_msg"; then
+            # Ubuntu/Debian
+            ov_init_action_debian "$instance_function" \
+              "Running shutdown hooks for OpenVista databases" \
+              "Running shutdown hooks for OpenVista database" \
+              "$instance"
         else
-            if function_exists "action"; then
-                action $"Running shutdown hooks for $instance: " run_hook "$instance" ZSTOP
-            elif function_exists "log_daemon_msg"; then
-                log_daemon_msg "Running shutdown hooks for OpenVista databases" "$instance"
-                run_hook "$instance" ZSTOP
-                log_end_msg $?
-            else
-                run_hook "$instance" ZSTOP
-            fi
+            # other
+            ov_init_action_other "$instance_function" "$instance"
         fi
-
-        # give background jobs (e.g., TaskMan) some time to wake up and realize they've been asked to shut down
-        sleep 5
         ;;
     restart|force-reload)
         $0 stop $2
@@ -191,12 +192,11 @@
         ;;
     status)
         # print usage info for humans, but fake success for RHCS
-        echo "Usage: openvista {start|stop|restart|force-reload} [INSTANCE_NAME]"
+        usage
         exit 0 # LSB: program is running or service is OK
         ;;
     *)
-        echo "Usage: openvista {start|stop|restart|force-reload} [INSTANCE_NAME]" >&2
+        usage >&2
         exit 2 # LSB: invalid or excess argument(s)
         ;;
 esac
-

=== modified file 'scripts/etc/init.d/openvista-databases'
--- scripts/etc/init.d/openvista-databases	2010-04-01 03:46:09 +0000
+++ scripts/etc/init.d/openvista-databases	2011-08-22 16:52:24 +0000
@@ -37,21 +37,21 @@
 ### END INIT INFO
 
 
-# Copyright (C) 2009 Medsphere Systems Corporation
+# Copyright (C) 2009-2010 Medsphere Systems Corporation
 #
 # This program is free software; you can redistribute it and/or modify it solely
 # under the terms of the GNU Affero General Public License version 3 as published
 # by the Free Software Foundation.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses>.
-# 
-# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar 
+#
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
 
@@ -62,177 +62,363 @@
 #
 # Note that exiting 0 here is against LSB, but Debian policy and LSB conflict
 # here, so we have to pick one.
-[ -f /usr/lib/openvista/functions ] || exit 0
+[[ -f /usr/lib/openvista/functions ]] || exit 0
 
-# Source function library.
-[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
-[ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions
+# source function libraries
+# CentOS/RHEL, provides action(), status()
+[[ -f /etc/rc.d/init.d/functions ]] && . /etc/rc.d/init.d/functions
+# Ubuntu/Debian, provides log_daemon_msg(), status_of_proc()
+[[ -f /lib/lsb/init-functions ]] && . /lib/lsb/init-functions
+# OpenVista
 . /usr/lib/openvista/functions
 
+log_command_usage "$@"
+
+usage()
+{
+    # Display usage information.
+    cat <<EOF
+Usage: openvista-databases {start|stop|restart|force-reload} [INSTANCE_NAME]
+EOF
+}
+
 recover_backward()
 {
-    set_gtm_env "$1" || return 1
+    instance=$1
+    set_gtm_env -v "$instance" || return $?
 
     umask 007
 
-    logger -p user.info -t "openvista-databases[$$]" -- Performing recovery on $instance database
-
-    mupip journal -recover -backward '*' 2>&1 \
-      | grep -v '^$' \
-      | logger -p user.info -t "openvista-databases[$$]"
-    retval=${PIPESTATUS[0]}
-    [ $retval -eq 0 ] || return 1
+    # A recovery is performed only following a non-clean shutdown.
+    #
+    # When terminate_processes() stops mumps processes, it checks that they
+    # have, in fact, exited.  If they have, it writes a 'clean' flag to
+    # /etc/openvista/clean_shutdown_[instance].
+    #
+    # Here, that flag is checked and removed.  The recovery is only performed if
+    # the shutdown was not clean.  Otherwise, rolling back the journal on a
+    # primary replicating server could prevent the secondary from getting the
+    # transactions that were backlogged at the time of the primary's shutdown,
+    # and so the secondary instance(s) would need to be resynced with a complete
+    # backup and restore (using `ovinstancerepl resync [instance]`) in order to
+    # restart replication.
+    #
+    # The clean flag should normally be removed here, but the openvista init
+    # script will also make sure that the flag is removed just before it runs
+    # the ZSTART routine on an instance.
+    if clean_flag get "$instance"; then
+        log -l "Found the clean shutdown flag for $instance database"
+        clean_flag set "$instance" false
+    else
+        log -l "Did not find the clean shutdown flag for $instance database"
+        log -l "Performing recovery on $instance database"
+        mupip journal -recover -backward '*' 2>&1 \
+          | grep -v '^$' \
+          | log -lp
+        (( "${PIPESTATUS[0]}" == 0 )) || return 1
+    fi
 
     # According to Bhaskar, database files should not need to be run down after
     # a successful recovery.  However, we've observed GT.M complaining about
     # databases requring rundown after a system crash, even after successful
-    # journal recovery, on both our own OpenVista appliance and the WorldVistA 
-    # VOE "four-slice toaster" appliance.  An easy (and somewhat reliable) way to
-    # trigger the not-rundown effect is to connect with CIS, then halt the machine 
-    # by killing qemu.  Upon the next boot, the journal recovery will run, but 
-    # attempts to access the database will result in not-rundown errors.  Adding 
-    # a call to mupip rundown here seems to fix the issue.
+    # journal recovery, on both our own OpenVista appliance and the WorldVistA
+    # VOE "four-slice toaster" appliance.  An easy (and somewhat reliable) way
+    # to trigger the not-rundown effect is to connect with CIS, then halt the
+    # machine by killing qemu.  Upon the next boot, the journal recovery will
+    # run, but attempts to access the database will result in not-rundown
+    # errors.  Adding a call to mupip rundown here seems to fix the issue.
     mupip rundown -region DEFAULT 2>&1 \
       | grep -v '^$' \
-      | logger -p user.info -t "openvista-databases[$$]"
-    retval=${PIPESTATUS[0]}
-    [ $retval -eq 0 ] || return 1
-
-    # Re-enable journaling
-    mupip set -journal="ENABLE,ON,BEFORE_IMAGES" -region DEFAULT 2>&1 \
-      | grep -v '^$' \
-      | logger -p user.info -t "openvista-databases[$$]"
-    retval=${PIPESTATUS[0]}
-    [ $retval -eq 0 ] || return 1
+      | log -lp
+    (( "${PIPESTATUS[0]}" == 0 )) || return 1
+
+    # Re-enable journaling and, if configured, replication
+    case $replication_mode in
+        primary|secondary)
+            log -lc "Re-enabling journaling and replication on $instance" \
+                    "database"
+
+            # Turning on replication automatically enables journaling.
+            mupip set -replication=ON \
+                      -region DEFAULT 2>&1 \
+              | grep -v '^$' \
+              | log -lp
+            (( "${PIPESTATUS[0]}" == 0 )) || return 1
+            ;;
+        *)
+            log -l "Re-enabling journaling on $instance database"
+
+            mupip set -journal="ENABLE,ON,BEFORE_IMAGES" \
+                      -replication=OFF \
+                      -region DEFAULT 2>&1 \
+              | grep -v '^$' \
+              | log -lp
+            (( "${PIPESTATUS[0]}" == 0 )) || return 1
+            ;;
+    esac
+
+    log -l "Creating new physical segment for SCRATCH on $instance database"
 
     # Back up scratch.dat - we're going to create a new one.  The previous
     # backup will be overwritten.
-    mv -f "$root/$instance/globals/scratch.dat" "$root/$instance/globals/scratch.dat~"
-    retval=$?
-    [ $retval -eq 0 ] || return 1
+    mv -f "$root/$instance/globals/scratch.dat" \
+          "$root/$instance/globals/scratch.dat~" \
+      || return 1
 
     mupip create -region=SCRATCH 2>&1 \
       | grep -v '^$' \
-      | logger -p user.info -t "openvista-databases[$$]"
-    retval=${PIPESTATUS[0]}
-    [ $retval -eq 0 ] || return 1
+      | log -lp
+    (( "${PIPESTATUS[0]}" == 0 )) || return 1
 
-    logger -p user.info -t "openvista-databases[$$]" -- Database recovery complete, $instance database is ready for use
+    log -l "Database $instance is ready for use"
 
     return 0
 }
 
 terminate_processes()
 {
-    set_gtm_env "$1" || return 1
-
-    logger -p user.info -t "openvista-databases[$$]" -- Terminating mumps processes in $instance
-
-    # find all processes using this database and kill them
-    for pid in `ls /proc`; do
-        [ -L "/proc/$pid/cwd" ] || continue
-        cwd=`readlink "/proc/$pid/cwd"`
-        [ "$root/$instance/tmp" = "$cwd" ] || continue
-
-        [ -L "/proc/$pid/exe" ] || continue
-        exe=`readlink "/proc/$pid/exe"`
-        exe_base=`basename "$exe"`
-        [ "mumps" = "$exe_base" ] || continue
-
-        mupip stop "$pid" 2>&1 \
-          | grep -v '^$' \
-          | logger -p user.info -t "openvista-databases[$$]"
+    # Make sure all mumps processes using the database are stopped.
+    #   Early in the shutdown sequence the /etc/init.d/openvista script calls
+    #   the ZSTOP routine on the instance to stop OpenVista mumps processes.
+    #   This function first allows some time for the processes to stop
+    #   themselves in response to that routine, and then it calls `mupip stop`
+    #   to more forcefully stop them.  It then waits again for the processes to
+    #   be stopped.  Both wait loops check each second to see if the processes
+    #   are stopped, so the function will not wait any longer than the time it
+    #   actually takes for the processes to stop.  There are at least three
+    #   reasons to wait:
+    #       1)  To allow applications to complete whatever task they are in the
+    #           middle of and stop at a point that makes sense in the context of
+    #           the application.
+    #       2)  To keep the system from shutting down while a process is writing
+    #           data, which might corrupt the database.
+    #       3)  To allow openvista-databases to write a 'clean' flag
+    #           (representing that the problem of #2 was avoided) so that on
+    #           system startup, openvista-databases will know that a database
+    #           recovery won't be necessary.
+
+    instance=$1
+    set_gtm_env -v "$instance" || return $?
+
+    log -l "Terminating OpenVista processes in $instance"
+
+    local mumps_pids
+
+    # allow time for ZSTOP, called by openvista, to succeed in stopping tasks
+    #   The %ZISTCPS routine listens on the RPC broker port for 30 seconds at a
+    #   time and will only respond to ZSTOP after its current listen period is
+    #   up.  So we will wait up to 35 seconds.
+    local max_wait=35
+    for (( i=0; i!=$max_wait; i++ )); do
+        mumps_pids=( $(get_mumps_pids "$instance") )
+        (( "${#mumps_pids[@]}" == 0 )) && break
+        sleep 1
     done
-
-    # wait for processes to die
-    sleep 1
+    log -l "Waited $i seconds for all processes to die from ZSTOP"
+
+    # kill any processes that are still using this database
+    #   Generally, they should have already been stopped by ZSTOP.
+    mumps_pids=( $(get_mumps_pids "$instance") )
+    mumps_process_count=${#mumps_pids[@]}
+    if (( "$mumps_process_count" != 0 )); then
+        log -l "$mumps_process_count mumps processes remain after ZSTOP"
+        local num
+        for pid in "${mumps_pids[@]}"; do
+            num=$(( $(array_index "$pid" "${mumps_pids[@]}") + 1 ))
+            log -lc "Calling MUPIP STOP on process $pid" \
+                    "($num of $mumps_process_count)"
+            mupip stop "$pid" 2>&1 \
+              | grep -v '^$' \
+              | log -lp
+        done
+    fi
+
+    # wait for any mumps processes to stop, and set the clean flag
+    #   The clean flag is used by recover_backward() to determine whether to run
+    #   backward recovery on the database.  If all mumps processes for the
+    #   database were successfully stopped before shutdown, then the database
+    #   should not require recovery, but if mumps processes were still running
+    #   when the server was shut down, either because they failed to stop or
+    #   because the shutdown was irregular, e.g. in the case of power failure,
+    #   then the database potentially requires recovery.
+    if wait_for_mumps_to_stop "$instance"; then
+        clean_flag set "$instance" true
+        # This would be a good place to perform RUNDOWN on the database, except
+        # that the replication source server is still using the database file.
+        # So openvista-replication takes care of the database rundown.
+    else
+        clean_flag set "$instance" false
+    fi
 
     return 0
 }
 
+wait_for_mumps_to_stop()
+{
+    # Allow time for all mumps processes to stop.
+    local instance=$1
+
+    # how many times to give more time if mumps process count is reduced
+    local allowed_tries=6
+    # seconds to wait for mumps process count to be zero
+    local allowed_delay=20
+
+    local try
+    local time_left
+    local mumps_pids
+    local initial_mumps_process_count
+    local mumps_process_count
+    for (( try=0; try!=$allowed_tries; try++ )); do
+        mumps_pids=( $(get_mumps_pids "$instance") )
+        initial_mumps_process_count=${#mumps_pids[@]}
+        [[ "$initial_mumps_process_count" == 0 ]] || log -srlc \
+          "$initial_mumps_process_count mumps processes still running," \
+          "will wait up to $allowed_delay seconds for them to stop"
+        for (( time_left=$allowed_delay; time_left!=0; time_left-- )); do
+            mumps_pids=( $(get_mumps_pids "$instance") )
+            mumps_process_count=${#mumps_pids[@]}
+            [[ "$mumps_process_count" == "0" ]] && break
+            sleep 1
+        done
+        if [[ "$mumps_process_count" == "0" ]]; then
+            log -l "There are no mumps processes running"
+            break
+        elif (( "$mumps_process_count" >= \
+                "$initial_mumps_process_count" )); then
+            log -srlc \
+              "$mumps_process_count mumps processes are still running," \
+              "but the allowed time of $allowed_delay seconds is exceeded"
+            log -srlc \
+              "Remaining mumps processes:" ${mumps_pids[@]}
+            break
+        else
+            log -srlc \
+              "The number of mumps processes was reduced in the past" \
+              "$allowed_delay seconds, so another $allowed_delay seconds" \
+              "will be allowed for remaining mumps processes to exit"
+            log -srlc \
+              "Remaining mumps processes:" ${mumps_pids[@]}
+        fi
+    done
+
+    (( "$mumps_process_count" == 0 ))
+}
+
+clean_flag()
+{
+    # Set the clean flag for openvista-databases to find on startup.
+    local action=$1
+    local instance=$2
+    local is_clean=$3
+
+    root=$(get_ov_root)
+    clean_flag_file="$root/$instance/etc/clean_shutdown"
+
+    case $action in
+        "get")
+            [[ -e "$clean_flag_file" ]]
+            return $?
+            ;;
+        "set")
+            if $is_clean; then
+                # write the clean flag
+                echo "openvista-databases completed a clean shutdown of" \
+                     "$instance database at $(date --rfc-3339=ns)" \
+                     >"$clean_flag_file"
+                if [[ -e "$clean_flag_file" ]]; then
+                    log -lc \
+                      "Wrote the clean shutdown flag for $instance database"
+                else
+                    log -lc \
+                      "Shutdown was clean for $instance database, but failed" \
+                      "to write the clean shutdown flag"
+                fi
+            else
+                # erase the clean flag
+                if [[ -e "$clean_flag_file" ]]; then
+                    if rm -f "$clean_flag_file"; then
+                        log -lc \
+                          "Removed the clean shutdown flag for $instance" \
+                          "database"
+                    else
+                        log -lc \
+                          "Failed to remove the clean shutdown flag for" \
+                          "$instance database"
+
+                    fi
+                fi
+            fi
+            ;;
+        *)
+            exit_command 1 "Error: clean_flag() received invalid argument(s)"
+            ;;
+    esac
+}
+
 # While it would be possible to run the journal recovery and database
 # rundown as a normal user, root access is required to delete/re-create
 # scratch.dat.  Root access is also required to run mupip stop.
-if [ `id -u` -ne 0 ]; then
-    echo "openvista-databases: Must be run as root" >&2
+if [[ $(id -u) != 0 ]]; then
+    log -sr "openvista-databases: Must be run as root"
     exit 4 # LSB: user had insufficient privilege
 fi
 
-# check for for valid arguments (requires correct permissions to do; must happen after permission checks)
-if [ -n "$2" ]; then
-    set_gtm_env "$2" || {
-        echo "openvista-databases: $instance: Not an OpenVista instance" >&2
-        exit 2 # LSB: invalid or excess argument(s)
-    }
+# check for for valid arguments
+instance=$2
+if [[ "$instance" ]]; then
+    is_openvista_instance "$instance" || exit_command 2 "$ov_error"
 fi
 
+
 case $1 in
+    # For 'start' and 'stop', the ov_init_action calls provide the exit value
+    # for the script.  The CentOS/RHEL subsys lock is set and cleared
+    # independently of the return code, because a partial failure of one action
+    # should not cause the other to be skipped.  The lock is only set or cleared
+    # when being called without an instance name argument.  Any error from
+    # touching or removing the lock file is hidden from the console so that the
+    # script can be run without an instance name by a non-root admin without
+    # printing confusing error messages.
     start)
-        if [ -z "$2" ]; then
-            if function_exists "action"; then
-                echo "Performing backward journal recovery on OpenVista databases..."
-            elif function_exists "log_daemon_msg"; then
-                log_daemon_msg "Performing backward journal recovery on OpenVista databases"
-            fi
-
-            for instance in `list_openvista_instances`; do
-                if function_exists "action"; then
-                    action $"  Performing recovery on $instance database: " recover_backward "$instance"
-                elif function_exists "log_daemon_msg"; then
-                    log_progress_msg "$instance"
-                    recover_backward "$instance" || end_msg=1
-                else
-                    recover_backward "$instance"
-                fi
-            done
-
-            if function_exists "log_daemon_msg"; then
-                log_end_msg ${end_msg:-0}
-            fi
+        instance_function=recover_backward
+        if function_exists "action"; then
+            # CentOS/RHEL
+            touch /var/lock/subsys/openvista-databases \
+              2>&1 | log -lp
+            ov_init_action_rhel "$instance_function" \
+              "Performing recovery if needed on OpenVista databases" \
+              "Performing recovery if needed on {instance} database" \
+              "$instance"
+        elif function_exists "log_daemon_msg"; then
+            # Ubuntu/Debian
+            ov_init_action_debian "$instance_function" \
+              "Performing recovery if needed on OpenVista databases" \
+              "Performing recovery if needed on OpenVista database" \
+              "$instance"
         else
-            if function_exists "action"; then
-                action $"Performing recovery on $instance database: " recover_backward "$instance"
-            elif function_exists "log_daemon_msg"; then
-                log_daemon_msg "Performing backward journal recovery on OpenVista databases" "$instance"
-                recover_backward "$instance"
-                log_end_msg $?
-            else
-                recover_backward "$instance"
-            fi
+            # other
+            ov_init_action_other "$instance_function" "$instance"
         fi
         ;;
     stop)
-        if [ -z "$2" ]; then
-            if function_exists "action"; then
-                echo "Terminating remaining mumps processes..."
-            elif function_exists "log_daemon_msg"; then
-                log_daemon_msg "Terminating remaining mumps processes"
-            fi
-
-            for instance in `list_openvista_instances`; do
-                if function_exists "action"; then
-                    action $"  Terminating mumps processes in $instance: " terminate_processes "$instance"
-                elif function_exists "log_daemon_msg"; then
-                    log_progress_msg "$instance"
-                    terminate_processes "$instance" || end_msg=1
-                else
-                    terminate_processes "$instance"
-                fi
-            done
-
-            if function_exists "log_daemon_msg"; then
-                log_end_msg ${end_msg:-0}
-            fi
+        instance_function=terminate_processes
+        if function_exists "action"; then
+            # CentOS/RHEL
+            [[ "$instance" ]] || rm -f /var/lock/subsys/openvista-databases \
+              2>&1 | log -lp
+            ov_init_action_rhel "$instance_function" \
+              "Terminating remaining OpenVista processes" \
+              "Terminating OpenVista processes in {instance}" \
+              "$instance"
+        elif function_exists "log_daemon_msg"; then
+            # Ubuntu/Debian
+            ov_init_action_debian "$instance_function" \
+              "Terminating remaining OpenVista processes" \
+              "Terminating remaining OpenVista processes" \
+              "$instance"
         else
-            if function_exists "action"; then
-                action $"Terminating mumps processes in $instance: " terminate_processes "$instance"
-            elif function_exists "log_daemon_msg"; then
-                log_daemon_msg "Terminating remaining mumps processes" "$instance"
-                terminate_processes "$instance"
-                log_end_msg $?
-            else
-                terminate_processes "$instance"
-            fi
+            # other
+            ov_init_action_other "$instance_function" "$instance"
         fi
         ;;
     restart|force-reload)
@@ -241,12 +427,11 @@
         ;;
     status)
         # print usage info for humans, but fake success for RHCS
-        echo "Usage: openvista-databases {start|stop|restart|force-reload} [INSTANCE_NAME]"
+        usage
         exit 0 # LSB: program is running or service is OK
         ;;
     *)
-        echo "Usage: openvista-databases {start|stop|restart|force-reload} [INSTANCE_NAME]" >&2
+        usage >&2
         exit 2 # LSB: invalid or excess argument(s)
         ;;
 esac
-

=== added file 'scripts/etc/init.d/openvista-init'
--- scripts/etc/init.d/openvista-init	1970-01-01 00:00:00 +0000
+++ scripts/etc/init.d/openvista-init	2011-08-22 16:52:24 +0000
@@ -0,0 +1,171 @@
+#!/bin/bash
+
+# Startup/shutdown script for OpenVista Server
+#
+# chkconfig: - 98 01
+# description: Replication startup/shutdown script for OpenVista Server
+#
+### BEGIN INIT INFO
+# Provides:          openvista-init
+# Required-Start:    openvista-databases openvista-replication
+# Required-Stop:     openvista-databases openvista-replication
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Replication startup/shutdown script for OpenVista Server
+### END INIT INFO
+
+
+# Copyright (C) 2010 Medsphere Systems Corporation
+#
+# This program is free software; you can redistribute it and/or modify it solely
+# under the terms of the GNU Affero General Public License version 3 as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses>.
+#
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar
+# Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
+
+
+# Check the package is still installed.  Traditionally, the test is for a
+# program that is executed later in this script, but it's not trivial to find
+# the location of the mupip binary because multiple verisons could be
+# installed, so look for the functions script instead.
+#
+# Note that exiting 0 here is against LSB, but Debian policy and LSB conflict
+# here, so we have to pick one.
+[[ -f /usr/lib/openvista/functions ]] || exit 0
+
+# source function libraries
+# CentOS/RHEL, provides action(), status()
+[[ -f /etc/rc.d/init.d/functions ]] && . /etc/rc.d/init.d/functions
+# Ubuntu/Debian, provides log_daemon_msg(), status_of_proc()
+[[ -f /lib/lsb/init-functions ]] && . /lib/lsb/init-functions
+# OpenVista
+. /usr/lib/openvista/functions
+
+log_command_usage "$@"
+
+usage()
+{
+    # Display usage information.
+    cat <<EOF
+Usage: openvista-init {start|stop|restart|force-reload}
+EOF
+}
+
+call_scripts()
+{
+    # Call all of the scripts for the replication mode
+    local action=$1
+    local replication_mode=$2
+    log -l "replication mode is '$replication_mode'"
+    if ! is_in_array "$replication_mode" primary secondary; then
+        log -srlc \
+          "Replication mode is not exclusively primary or secondary, so" \
+          "neither set of startup scripts will be run"
+        return 1
+    fi
+    local script_dir=/etc/openvista/${replication_mode}.d
+    # If support for dependency is added, this is where it should be added.
+    # The loop below can be replaced with a single call to a command that
+    # recursively calls itself on each script as the dependencies are satisfied.
+    local old_IFS=$IFS
+    IFS=$'\n'
+    local files=( $(find -L \
+                         "$script_dir" \
+                         -maxdepth 1 \
+                         -type f \
+                         ! -name \.\* \
+                         ! -name *~) )
+    IFS=$old_IFS
+    local file
+    for file in "${files[@]}"; do
+        if ! [[ -x "$file" ]]; then
+            log -l "file '$file' is not executable"
+            continue
+        fi
+        # check for a lock file as used with CentOS/RHEL
+        if [[ -d /var/lock/subsys ]]; then
+            local script=$(basename "$file")
+            local lock_file=/var/lock/subsys/"$script"
+            if [[ "$action" == "start" ]] && [[ -f "$lock_file" ]]; then
+                log -l "$script is already started"
+                continue
+            elif [[ "$action" == "stop" ]] && ! [[ -f "$lock_file" ]]; then
+                log -l "$script is already stopped"
+                continue
+            fi
+        fi
+        log -l "Executing '$file' $action"
+        "$file" "$action" | sed '' &
+    done
+
+    log -l "Finished calling $replication_mode scripts with '$action'"
+
+    # wait for the backgrounded scripts to complete
+    wait
+    log -sn "...all OpenVista $replication_mode scripts have completed."
+
+    log -l "$replication_mode scripts completed"
+
+    return 0
+}
+
+# check that user is root
+[[ $(id -u) == 0 ]] || exit_command 4 "Must be run as root"
+replication_mode=$(get_server_mode)
+
+case $1 in
+    start|stop)
+        action=$1
+        message="Calling OpenVista $replication_mode scripts with '$action'"
+        message+="..."$'\n'
+        cmd_args=( call_scripts "$action" "$replication_mode")
+        if function_exists "action"; then
+            # CentOS/RHEL
+            # The CentOS/RHEL subsys lock is set and cleared independently of
+            # the return code, because a partial failure of one action should
+            # not cause the other to be skipped.
+            case $action in
+                start)
+                    touch /var/lock/subsys/openvista-init \
+                      2>&1 | log -lp
+                    ;;
+                stop)
+                    rm -f /var/lock/subsys/openvista-init \
+                      2>&1 | log -lp
+                    ;;
+            esac
+            action "$message" "${cmd_args[@]}"
+        elif function_exists "log_daemon_msg"; then
+            # Ubuntu/Debian
+            log_daemon_msg "$message"
+            "${cmd_args[@]}"
+            retval=$?
+            log_end_msg "$retval"
+            exit "$retval"
+        else
+            # other
+            "${cmd_args[@]}"
+        fi
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        ;;
+    status)
+        usage
+        exit 0
+        ;;
+    *)
+        usage >&2
+        exit 2 # LSB: invalid or excess argument(s)
+        ;;
+esac

=== added file 'scripts/etc/init.d/openvista-replication'
--- scripts/etc/init.d/openvista-replication	1970-01-01 00:00:00 +0000
+++ scripts/etc/init.d/openvista-replication	2011-08-22 16:52:24 +0000
@@ -0,0 +1,850 @@
+#!/bin/bash
+
+# Replication startup/shutdown script for OpenVista Server
+#
+# chkconfig: - 56 31
+# description: Replication startup/shutdown script for OpenVista Server
+#
+### BEGIN INIT INFO
+# Provides:          openvista-replication
+# Required-Start:    openvista-databases sshd
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Replication startup/shutdown script for OpenVista Server
+### END INIT INFO
+
+
+# Copyright (C) 2010 Medsphere Systems Corporation
+#
+# This program is free software; you can redistribute it and/or modify it solely
+# under the terms of the GNU Affero General Public License version 3 as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses>.
+#
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar
+# Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
+
+
+# Check the package is still installed.  Traditionally, the test is for a
+# program that is executed later in this script, but it's not trivial to find
+# the location of the mupip binary because multiple verisons could be
+# installed, so look for the functions script instead.
+#
+# Note that exiting 0 here is against LSB, but Debian policy and LSB conflict
+# here, so we have to pick one.
+[[ -f /usr/lib/openvista/functions ]] || exit 0
+
+# source function libraries
+# CentOS/RHEL, provides action(), status()
+[[ -f /etc/rc.d/init.d/functions ]] && . /etc/rc.d/init.d/functions
+# Ubuntu/Debian, provides log_daemon_msg(), status_of_proc()
+[[ -f /lib/lsb/init-functions ]] && . /lib/lsb/init-functions
+# OpenVista
+. /usr/lib/openvista/functions
+
+log_command_usage "$@"
+
+usage()
+{
+    # Display usage information.
+    cat <<EOF
+Usage: openvista-replication {start|stop|restart|force-reload} [INSTANCE_NAME]
+   or  openvista-replication {status} [INSTANCE_NAME [DAEMON_NAME]]
+EOF
+}
+
+start_servers()
+{
+    set_gtm_env -v "$1" || return $?
+
+    umask 007
+
+    log -l "Starting replication for $instance"
+
+    case $replication_mode in
+        primary)
+            # source the replication configuration file for
+            # replication_ip, mupip_port, instsecondary
+            . "$root/$instance/etc/replication.conf"
+
+            log -l "Replication mode is '$replication_mode'"
+
+            ## globals
+            log -lc "Starting active source server for $instance connecting" \
+                    "to secondary $replication_ip:$mupip_port" \
+                    "[$instsecondary]"
+
+            # run mupip as the openvista user
+            # redirect stdin from /dev/null to avoid ssh hanging on remote calls
+            mupip_output=$( \
+                su -m -c "mupip replicate -source -start \
+                  -secondary=$replication_ip:$mupip_port \
+                  -log=\"$root/$instance/replication/source-active.log\" \
+                  -buffsize=1 -instsecondary=$instsecondary" "$user" \
+                  < /dev/null 2>&1 \
+                  | grep -v "^$" \
+                  | log -slp \
+                )
+            retval=${PIPESTATUS[0]}
+
+            # if received error:
+            #   %GTM-E-REPLREQRUNDOWN, Error accessing replication instance
+            #   opt/openvista/open/replication/repl_instance.  Must be rundown
+            #   on cluster node vm1.
+            #   %SYSTEM-E-ENO22, Invalid argument
+            if echo "$mupip_output" \
+                 | grep "GTM-E-REPLREQRUNDOWN" >/dev/null; then
+
+                log -lc "While starting primary active source server for" \
+                          "\"$instance\" openvista-replication received" \
+                          "GTM-E-REPLREQRUNDOWN from mupip, so it will" \
+                          "rundown \"$instance\", perform a journal rollback," \
+                          "and then start the source server"
+
+                log -l "Running mupip rundown on \"$instance\""
+                mupip rundown -region "*" \
+                  < /dev/null 2>&1 \
+                  | grep -v "^$" \
+                  | log -lp
+
+                # after mupip rundown, will still give error:
+                #   %GTM-E-REPLREQROLLBACK, Replication instance file
+                #   opt/openvista/open/replication/repl_instance indicates
+                #   abnormal shutdown.  Run MUPIP JOURNAL ROLLBACK first
+                log -l "Running mupip journal rollback on \"$instance\""
+                mupip journal -rollback -backward "*" \
+                  < /dev/null 2>&1 \
+                  | grep -v "^$" \
+                  | log -lp
+
+                log -lc "Starting active source server for $instance" \
+                        "connecting to secondary $replication_ip:$mupip_port" \
+                        "[$instsecondary]"
+                su -m -c "mupip replicate -source -start \
+                  -secondary=$replication_ip:$mupip_port \
+                  -log=\"$root/$instance/replication/source-active.log\" \
+                  -buffsize=1 -instsecondary=$instsecondary" "$user" \
+                  < /dev/null 2>&1 \
+                  | grep -v "^$" \
+                  | log -lp
+                # this updates the retval set above in the original call
+                retval=${PIPESTATUS[0]}
+            fi
+
+            server_status=$({ mupip replic -source -checkhealth 1>/dev/null; } \
+                              2>&1 | grep PID)
+            : ${server_status:="Source server is not started"}
+            log -l "OpenVista instance $instance: $server_status"
+
+            pid=$(echo "$server_status" \
+                    | sed -rn "s/^PID ([0-9]+) Source.*alive.*ACTIVE.*$/\1/p")
+            if [[ "$pid" ]]; then
+                # write PID file for the source server
+                echo "$pid" > "$root/$instance/replication/source-active.pid"
+
+                # restart the remote receiver if it is alive but not connecting
+                #   If the primary server is powered off without the normal
+                #   shutdown of the mupip processes and is then rebooted, the
+                #   receiver server can still hold the old connection and will
+                #   then refuse the new connection from the source server.
+                #   If this happens, both source and receiver will both show as
+                #   running, but will never connect, and replication will fail.
+                old_IFS=$IFS
+                IFS=$'\n'
+                remote_status=( \
+                    $(sshk "$replication_ip" \
+                           /usr/sbin/ovinstancerepl -s status \
+                                                    "$other_instance") )
+                IFS=$old_IFS
+                if array_lookup -d '=' "GT.M receiver server" \
+                                "${remote_status[@]}" \
+                     | grep "PID" >/dev/null; then
+                    log -lc "instance $instance:" \
+                            "the receiver server is running on the secondary"
+                    # The receiver server is running on the secondary, so
+                    # the primary source server should be able to connect.
+                    unset mupip_connected
+                    allowed_delay=5
+                    for (( time_left=$allowed_delay; \
+                           time_left!=0; time_left-- )); do
+                        if lsof -c mupip -i :"$mupip_port" -a \
+                             | grep "ESTABLISHED" >/dev/null; then
+                            # The source server has connected.
+                            mupip_connected=true
+                            log -lc "instance $instance: the source server" \
+                                    "has connected to the receiver server"
+                            break
+                        fi
+                        sleep 1
+                    done
+                    : ${mupip_connected:=false}
+
+                    if ! $mupip_connected; then
+                        log -lc "instance $instance: the source server" \
+                                "has failed to connect to the receiver server"
+                        # The primary source server has failed to connect even
+                        # though the receiver server is running, so the receiver
+                        # server is probably holding on to an old connection and
+                        # needs to be restarted for it to listen for a new one.
+                        log -lc "instance $instance: restarting the remote" \
+                                "receiver server"
+                        sshk "$replication_ip" \
+                             /etc/init.d/openvista-replication \
+                               restart "$other_instance" || retval=1
+                        # The secondary instance may still need to be resynced
+                        # (by a system administrator) using `ovinstancerepl
+                        # resync` to re-establish replication.
+                        #TODO: check if the restart fixed it and log the result
+                    fi
+                else
+                    log -lc "instance $instance: the receiver server is not" \
+                            "running on the secondary"
+                fi
+            fi
+
+            ## routines and WebDAV
+
+            # Stop lsyncd if it is already running.
+            stop_lsyncd
+
+            set_apache_vars
+            /usr/sbin/ovgenconfig -s "replication" $instance "lsyncd.conf.xml" \
+              "ROOT=$root" \
+              "INSTANCE=$instance" \
+              "REPLICATION_IP=$replication_ip" \
+              "RSYNC_PORT=$rsync_port" \
+              "DOCROOT=$docroot" \
+              2>&1 | log -lp
+            if [[ "${PIPESTATUS[0]}" == 0 ]]; then
+                start_lsyncd || retval=1
+            else
+                log -l "Unable to configure lsyncd for $instance"
+                retval=1
+            fi
+
+            return "$retval"
+            ;;
+        secondary)
+            # source the replication configuration file for
+            # mupip_port, instsecondary
+            . "$root/$instance/etc/replication.conf"
+
+            log -l "Replication mode is '$replication_mode'"
+
+            ## globals
+            log -lc "Attempting journal fetchresync for $instance on port" \
+                    "$mupip_port"
+
+            # The 'fetchresync' option is primarily for the case of the
+            # secondary being brought up for the first time after having being
+            # switched over from being the primary.
+            # If the secondary is a former primary, it may have transactions
+            # from prior to failover that were never replicated.  The
+            # fetchresync option will rollback to the last replicated
+            # transaction and write the unreplicated transactions to the
+            # fetchresync_[timestamp].lost file.
+            # See http://mirrors.medsphere.org/pub/tinco.pair.com/bhaskar/gtm/doc/books/ao/UNIX_manual/ch07s03.html#rollback_db_after_sys_fail
+            #     http://mirrors.medsphere.org/pub/tinco.pair.com/bhaskar/gtm/doc/articles/GTM_Multi_Site_Replication.html#id881700
+            #     http://mirrors.medsphere.org/pub/tinco.pair.com/bhaskar/gtm/doc/articles/GTM_Multi_Site_Replication.html#id882869
+            #       "Any instance coming up as secondary must do a mupip journal
+            #       –rollback –fetchresync with the current primary,
+            #       regardless of whether it was previously a secondary or
+            #       primary.  Not doing this could cause errors (secondary ahead
+            #       of primary etc.) during receiver server startup."
+            # For processing the lost transactions file, see
+            #     http://mirrors.medsphere.org/pub/tinco.pair.com/bhaskar/gtm/doc/articles/GTM_Multi_Site_Replication.html#id882796
+            # Since this script does not know whether the secondary is a former
+            # primary, it will try the fetchresync just in case.
+            # If the secondary is not a former primary, the fetchresync may
+            # fail, harmlessly.  So the script does not exit on this error.
+            timestamp=$(date +%Y%m%d-%H%M%S)
+            filename="fetchresync_$timestamp.lost"
+            mupip journal -rollback -fetchresync=$mupip_port \
+              -losttrans="$root/$instance/replication/$filename" \
+              -backward '*' 2>&1 \
+              | grep -v '^$' \
+              | log -lp
+            retval=${PIPESTATUS[0]}
+            [[ "$retval" == 0 ]] \
+              || log -lc "Journal fetchresync for $instance failed, but this" \
+                         "is normal unless this secondary instance is a" \
+                         "former primary that is now starting as a secondary" \
+                         "for the first time"
+
+            log -lc "Starting passive source server for $instance" \
+                    "connecting to primary $replication_ip:$mupip_port" \
+                    "[$instsecondary]"
+
+            # run mupip as the openvista user
+            # redirect stdin from /dev/null to avoid ssh hanging on remote calls
+            mupip_output=$( \
+                su -m -c "mupip replicate -source -start -passive \
+                  -log=\"$root/$instance/replication/source-passive.log\" \
+                  -buffsize=1 -instsecondary=$instsecondary" "$user" \
+                  < /dev/null 2>&1 \
+                  | grep -v '^$' \
+                  | log -slp \
+                )
+            retval=${PIPESTATUS[0]}
+
+            if echo "$mupip_output" \
+                 | grep "GTM-E-REPLREQROLLBACK" >/dev/null; then
+                # "%GTM-E-REPLREQROLLBACK, Replication instance file
+                # /opt/openvista/[instance]/replication/repl_instance indicates
+                # abnormal shutdown.  Run MUPIP JOURNAL ROLLBACK first"
+
+                log -lc "While starting secondary passive source server for" \
+                          "\"$instance\" openvista-replication received" \
+                          "GTM-E-REPLREQROLLBACK from mupip, so it will" \
+                          "perform a journal rollback on \"$instance\"," \
+                          "and then start the source server"
+
+                log -l "Running mupip journal rollback on \"$instance\""
+                mupip journal -rollback -backward "*" \
+                  < /dev/null 2>&1 \
+                  | grep -v "^$" \
+                  | log -lp
+
+                log -lc "Starting secondary source server for $instance" \
+                        "connecting to primary $replication_ip:$mupip_port" \
+                        "[$instsecondary]"
+                su -m -c "mupip replicate -source -start -passive \
+                  -log=\"$root/$instance/replication/source-passive.log\" \
+                  -buffsize=1 -instsecondary=$instsecondary" "$user" \
+                  < /dev/null 2>&1 \
+                  | grep -v "^$" \
+                  | log -lp
+                # this updates the retval set above in the original call
+                retval=${PIPESTATUS[0]}
+            elif echo "$mupip_output" \
+                   | grep "GTM-E-SRCSRVEXISTS" >/dev/null; then
+                # "%GTM-E-SRCSRVEXISTS, Source server for secondary instance ___
+                # is already running with pid ___"
+                retval=0
+            fi
+
+            mupip_health=$({ mupip replicate -source -checkhealth \
+                           1>/dev/null; } 2>&1)
+
+            server_status=$(echo "$mupip_health" | grep "Source server")
+            : ${server_status:="Source server is not started"}
+            log -l "OpenVista instance $instance: $server_status"
+
+            # write PID file for the source server
+            pid=$(echo "$server_status" \
+                    | sed -rn "s/^PID ([0-9]+) Source.*alive.*PASSIVE.*$/\1/p")
+            if [[ "$pid" ]]; then
+                echo "$pid" > "$root/$instance/replication/source-passive.pid"
+            fi
+
+            [[ "$retval" == 0 ]] || return 1
+
+            log -l "Starting receiver server for $instance on port $mupip_port"
+
+            # run mupip as the openvista user
+            # redirect stdin from /dev/null to avoid ssh hanging on remote calls
+            su -m -c "mupip replicate -receiver -start -listenport=$mupip_port \
+              -log=\"$root/$instance/replication/receiver.log\" \
+              -buffsize=1 -updateresync" "$user" < /dev/null 2>&1 \
+              | grep -v '^$' \
+              | log -slp
+            retval=${PIPESTATUS[0]}
+
+            mupip_health=$({ mupip replicate -receiver -checkhealth \
+                           1>/dev/null; } 2>&1)
+
+            server_status=$(echo "$mupip_health" | grep "Receiver server")
+            : ${server_status:="Receiver server is not started"}
+            log -l "OpenVista instance $instance: $server_status"
+
+            # write PID file for the receiver server
+            pid=$(echo "$server_status" \
+                    | sed -rn "s/^PID ([0-9]+) Receiver.*alive.*$/\1/p")
+            if [[ "$pid" ]]; then
+                echo "$pid" > "$root/$instance/replication/receiver.pid"
+            fi
+
+            server_status=$(echo "$mupip_health"  | grep "Update process")
+            : ${server_status:="Update process is not started"}
+            log -l "OpenVista instance $instance: $server_status"
+
+            # write PID file for the update process
+            pid=$(echo "$server_status" \
+                    | sed -rn "s/^PID ([0-9]+) Update.*alive.*$/\1/p")
+            if [[ "$pid" ]]; then
+                echo "$pid" > "$root/$instance/replication/update.pid"
+            fi
+
+            ## routines and WebDAV
+            log -lc "Starting daemon for replication of routines and WebDAV" \
+                    "for $instance"
+
+            # Stop rsyncd if it is already running.
+            if ! stop_rsyncd; then
+                log -l "instance $instance: failed to stop rsyncd"
+                retval=1
+            fi
+
+            set_apache_vars
+            /usr/sbin/ovgenconfig -s "replication" $instance "rsyncd.conf" \
+              "ROOT=$root" \
+              "INSTANCE=$instance" \
+              "RSYNC_PORT=$rsync_port" \
+              "BIND_ADDRESS=$bind_address" \
+              "USER=$user" \
+              "DOCROOT=$docroot" \
+              "APACHE_USER=$apache_user" \
+              2>&1 | log -lp
+            if [[ "${PIPESTATUS[0]}" == 0 ]]; then
+                if ! start_rsyncd; then
+                    log -l "instance $instance: failed to start rsyncd"
+                    retval=1
+                fi
+                log -l \
+                  "Restarting lsyncd on primary server at $replication_ip"
+                sshk $replication_ip /etc/init.d/openvista-replication \
+                      restart_lsyncd $other_instance || retval=1
+            else
+                log -l "Unable to configure rsyncd for $instance"
+                retval=1
+            fi
+            ;;
+        *)
+            log -lc "Replication mode is neither 'primary' nor 'secondary'," \
+                    "skipping replication server startup"
+            ;;
+    esac
+
+    return "$retval"
+}
+
+stop_servers()
+{
+    set_gtm_env -v "$1" || return $?
+
+    # At this point, the replication.conf file may have been reconfigured since
+    # starting the servers, so this function just shuts down whatever GT.M
+    # replication processes are running for the instance without checking the
+    # replication mode.
+
+    # A -timeout parameter may be specified for the shutdowns:
+    # http://tinco.pair.com/bhaskar/gtm/doc/books/ao/UNIX_manual/ch07s03.html#cntrl_repl
+    #
+    # -timeout=<timeout in seconds>
+    #   Use this optional qualifier to specify the period of time the
+    #   server should wait before shutting down.  If you do not specify a
+    #   qualifier, the default timeout period is 30 seconds.  If you
+    #   specify -timeout=0 , shutdown occurs immediately.
+
+    # shut down receiver server if it is running
+    server_status=$(mupip replic -receiver -checkhealth 2>&1 1>/dev/null \
+                        | grep "PID")
+    if [[ "$server_status" ]]; then
+        log -l "For $instance instance: $server_status" \
+               "Shutting down receiver server for $instance"
+        mupip replicate -receiver -shutdown -timeout=5 2>&1 \
+          | grep -v '^$' \
+          | log -lp
+        rm -f "$root/$instance/replication/receiver.pid"
+        rm -f "$root/$instance/replication/update.pid"
+    else
+        log -l "No receiver server is running for $instance"
+    fi
+
+    # shut down source server if it is running
+    server_status=$(mupip replic -source -checkhealth 2>&1 1>/dev/null \
+                        | grep "PID")
+    if [[ "$server_status" ]]; then
+        # for a primary server, wait for any replication backlog to clear
+        if echo "$server_status" | grep "ACTIVE" >/dev/null; then
+            wait_for_gtm_backlog_to_clear "$instance"
+        fi
+
+        log -l "For $instance instance: $server_status" \
+               "Shutting down source server for $instance"
+        # This server may be active or passive
+        mupip replicate -source -shutdown -timeout=5 2>&1 \
+          | grep -v '^$' \
+          | log -lp
+        rm -f "$root/$instance/replication/source-active.pid"
+        rm -f "$root/$instance/replication/source-passive.pid"
+    else
+        log -l "No source server is running for $instance"
+    fi
+
+    log -l "Running down database for $instance"
+    # Database rundown is recommended by FIS documentation:
+    # http://tinco.pair.com/bhaskar/gtm/doc/articles/GTM_Multi_Site_Replication.html#shut_inst
+    mupip rundown -region DEFAULT 2>&1 \
+      | grep -v '^$' \
+      | log -lp
+
+    # Stop replication of routines and WebDAV
+    stop_lsyncd
+    stop_rsyncd
+
+    return 0
+}
+
+wait_for_gtm_backlog_to_clear()
+{
+    # Allow time for replication backlog to be cleared.
+    local instance=$1
+
+    # how many times to give more time if backlog is reduced
+    local allowed_tries=6
+    # seconds to wait for backlog to be zero
+    local allowed_delay=20
+
+    local tries_left
+    local time_left
+    local mupip_backlog
+    local initial_repl_backlog
+    local repl_backlog
+    local last_written_jnl_seqno
+    local last_sent_jnl_seqno
+    for (( tries_left=$allowed_tries; tries_left!=0; tries_left-- )); do
+        old_IFS=$IFS
+        IFS=$'\n'
+        mupip_backlog=( $(mupip_showbacklog "$instance") )
+        IFS=$old_IFS
+        initial_repl_backlog=${mupip_backlog[2]}
+        [[ "$initial_repl_backlog" == 0 ]] || log -srlc \
+          "There are $initial_repl_backlog journal entries not yet" \
+          "replicated to the secondary, will wait up to $allowed_delay" \
+          "seconds for them to be replicated"
+        for (( time_left=$allowed_delay; time_left!=0; time_left-- )); do
+            old_IFS=$IFS
+            IFS=$'\n'
+            mupip_backlog=( $(mupip_showbacklog "$instance") )
+            IFS=$old_IFS
+
+            last_written_jnl_seqno=${mupip_backlog[0]}
+            last_sent_jnl_seqno=${mupip_backlog[1]}
+            repl_backlog=${mupip_backlog[2]}
+
+            [[ "$repl_backlog" == "0" ]] && break
+            log -lc \
+              "$instance GT.M journal: last written: $last_written_jnl_seqno," \
+              "last sent: $last_sent_jnl_seqno, backlog: $initial_repl_backlog"
+            sleep 1
+        done
+        if [[ "$repl_backlog" == "0" ]]; then
+            log -l "The $instance database has no GT.M replication backlog"
+            break
+        elif (( "$repl_backlog" >= \
+                "$initial_repl_backlog" )); then
+            log -srlc \
+              "There are still $repl_backlog journal entries not yet" \
+              "replicated to the secondary, but the allowed time of" \
+              "$allowed_delay seconds is exceeded"
+            break
+        else
+            log -lc \
+              "replication backlog was reduced in the past $allowed_delay" \
+              "seconds, will wait another $allowed_delay seconds"
+        fi
+    done
+
+    local root=$(get_ov_root)
+    local backlog_file="$root/$instance/replication/backlog"
+    if (( "$repl_backlog" == 0 )); then
+        rm -f "$backlog_file"
+        return 0
+    else
+        echo "$last_written_jnl_seqno" \
+             "$last_sent_jnl_seqno" \
+             "$repl_backlog" > "$backlog_file"
+        return 1
+    fi
+}
+
+start_lsyncd()
+{
+    # lsyncd needs the permissions of both
+    # 'user' (mysql) and 'apache_user' (www-data) so we run it as root.
+    #
+    # lsyncd sends all output to its configured log file, rather than
+    # stdout/stderr, unless the --no-daemon flag is specified (and it is
+    # not), so we do not need to redirect output from it.
+    log -l "Starting lsyncd daemon for $instance"
+    local conf_file="$root/$instance/replication/lsyncd.conf.xml"
+    [[ -f "$conf_file" ]] \
+      || { log -slr "Error: File \"$conf_file\" is missing"
+           return 1; }
+    lsyncd --conf "$conf_file" \
+      || { log -slr "Error: Failed to start lsyncd"
+           return 1; }
+    return 0
+}
+
+stop_lsyncd()
+{
+    wait_for_lsyncd_to_be_caught_up "$instance"
+    lsyncd_pid_file="$root/$instance/replication/lsyncd.pid"
+    if pid=$(pidofproc -p "$lsyncd_pid_file" lsyncd); then
+        # the lsyncd process with that pid exists, kill it
+        log -l "Stopping lsyncd daemon (pid: $pid) for $instance"
+        kill_and_verify "$pid" || { log -slr "Error: Failed to stop lsyncd"
+                                    return 1; }
+        rm -f "$lsyncd_pid_file"
+    fi
+    return 0
+}
+
+wait_for_lsyncd_to_be_caught_up()
+{
+    # Wait, with timeout, for lsyncd replication to be caught up.
+    #   This function allows for a file replication backlog to exist that needs
+    #   time to clear, however, we do not have a reliable way to measure a
+    #   backlog of file replication or even to know truly whether it is
+    #   backlogged.  When lsyncd is caught up and waiting for further changes,
+    #   it writes "gone blocking" to its log file.  So this function simply
+    #   waits with a timeout for that message to appear at the end of the log.
+    local instance=$1
+
+    # seconds to wait for lsyncd to be caught up
+    local allowed_delay=20
+
+    local time_left
+    local caught_up=false
+    local root=$(get_ov_root)
+    local log_file=$root/$instance/replication/lsyncd.log
+
+    [[ -f "$log_file" ]] || return
+
+    for (( time_left=$allowed_delay; time_left!=0; time_left-- )); do
+        if tail -n1 "$log_file" \
+             | grep "gone blocking" > /dev/null; then
+            caught_up=true
+            break
+        fi
+        sleep 1
+    done
+
+    local backlog_file="$root/$instance/replication/lsyncd_not_caught_up"
+    if $caught_up; then
+        log -l "lsyncd for instance $instance is caught up"
+        rm -f "$backlog_file"
+        return 0
+    else
+        log -lc "lsyncd for instance $instance is not caught up after" \
+                "$allowed_delay seconds"
+        echo "tail $log_file" > "$backlog_file"
+        tail "$log_file" >> "$backlog_file"
+        return 1
+    fi
+}
+
+start_rsyncd()
+{
+    # rsync needs the permissions of both
+    # 'user' (mysql) and 'apache_user' (www-data) so we run it as root.
+    local conf_file="$root/$instance/replication/rsyncd.conf"
+    [[ -f "$conf_file" ]] \
+      || { log -slr "Error: File \"$conf_file\" is missing"
+           return 1; }
+    rsync --daemon --config "$conf_file" \
+      < /dev/null \
+      | grep -v '^$' \
+      | log -lp
+    (( "${PIPESTATUS[0]}" == 0 )) || { log -slr "Error: Failed to start rsync"
+                                       return 1; }
+    return 0
+}
+
+stop_rsyncd()
+{
+    rsyncd_pid_file="$root/$instance/replication/rsyncd.pid"
+    if pid=$(pidofproc -p "$rsyncd_pid_file" rsync); then
+        # the rsync process with that pid exists, kill it
+        log -l "Stopping rsync daemon (pid: $pid) for $instance"
+        kill_and_verify "$pid" || { log -slr "Error: Failed to stop rsyncd"
+                                    return 1; }
+        # rsyncd removes its PID file itself when it is killed
+    fi
+    return 0
+}
+
+is_new_repl_instance()
+{
+    # Return true (0) if the journal sequence number is 0.
+    label="HDR Journal Sequence Number"
+    jnl_seqno=$(mupip replicate -editinstance -show "$gtm_repl_instance" 2>&1 \
+                  | grep "^$label" | sed -r "s/\[.*//" | sed -r "s/[^0-9]//g")
+    [[ "$jnl_seqno" == 0 ]]
+}
+
+# check that user is root
+[[ $(id -u) == 0 ]] || exit_command 4 "Must be run as root"
+
+# check for valid arguments
+instance=$2
+if [[ "$instance" ]]; then
+    is_openvista_instance "$instance" || exit_command 2 "$ov_error"
+    instances=( "$instance" )
+    multiple=false
+else
+    instances=( $(list_openvista_instances --primaries_first) )
+    multiple=true
+fi
+
+case $1 in
+    # For 'start' and 'stop', the ov_init_action calls provide the exit value
+    # for the script.  The CentOS/RHEL subsys lock is set and cleared
+    # independently of the return code, because a partial failure of one action
+    # should not cause the other to be skipped.  The lock is only set or cleared
+    # when being called without an instance name argument.  Any error from
+    # touching or removing the lock file is hidden from the console so that the
+    # script can be run without an instance name by a non-root admin without
+    # printing confusing error messages.
+    start)
+        instance_function=start_servers
+        instance_filter="--primaries_first"
+        if function_exists "action"; then
+            # CentOS/RHEL
+            touch /var/lock/subsys/openvista-replication \
+              2>&1 | log -lp
+            ov_init_action_rhel "$instance_function" \
+              "Starting replication for OpenVista databases" \
+              "Starting replication for {instance} database" \
+              "$instance" "$instance_filter"
+        elif function_exists "log_daemon_msg"; then
+            # Ubuntu/Debian
+            ov_init_action_debian "$instance_function" \
+              "Starting replication for OpenVista databases" \
+              "Starting replication for OpenVista database" \
+              "$instance" "$instance_filter"
+        else
+            # other
+            ov_init_action_other "$instance_function" "$instance"
+        fi
+        ;;
+    stop)
+        instance_function=stop_servers
+        instance_filter="--primaries_first"
+        if function_exists "action"; then
+            # CentOS/RHEL
+            $multiple || rm -f /var/lock/subsys/openvista-replication \
+              2>&1 | log -lp
+            ov_init_action_rhel "$instance_function" \
+              "Stopping replication for OpenVista databases" \
+              "Stopping replication for {instance} database" \
+              "$instance" "$instance_filter"
+        elif function_exists "log_daemon_msg"; then
+            # Ubuntu/Debian
+            ov_init_action_debian "$instance_function" \
+              "Stopping replication for OpenVista databases" \
+              "Stopping replication for OpenVista database" \
+              "$instance" "$instance_filter"
+        else
+            # other
+            ov_init_action_other "$instance_function" "$instance"
+        fi
+        ;;
+    restart|force-reload)
+        $0 stop $2
+        $0 start $2
+        ;;
+    status)
+        # tell whether the replication daemons are running
+
+        daemon=$3
+        primary_daemon_names=(
+            source-active
+            lsyncd
+            )
+        secondary_daemon_names=(
+            source-passive
+            receiver
+            update
+            rsyncd
+            )
+        if [[ "$daemon" ]]; then
+            is_in_array "$daemon" "${primary_daemon_names[@]}" \
+                                  "${secondary_daemon_names[@]}" \
+              || exit_command 2 "Unrecognized daemon name: $daemon"
+        fi
+
+        # wrap the appropriate standard status function
+        if function_exists "status"; then
+            # CentOS/RHEL  /etc/rc.d/init.d/functions  status()
+            daemon_status()
+            {
+                local name=$2
+                [[ "$3" ]] && name=$3
+                status -p "$1" "$name"
+            }
+        elif function_exists "status_of_proc"; then
+            # Ubuntu/Debian  /lib/lsb/init-functions  status_of_proc()
+            daemon_status()
+            {
+                local pid
+                local name=$2
+                [[ "$3" ]] && name=$3
+                pid=$(pidofproc -p "$1" "$2") && name+=" (pid $pid)"
+                status_of_proc -p "$1" "$2" "$name"
+            }
+        fi
+
+        retval=0
+        root=$(get_ov_root)
+        for instance in "${instances[@]}"; do
+            replication_mode=""
+            conf_file=$root/$instance/etc/replication.conf
+            [[ -f "$conf_file" ]] && . "$conf_file"
+            case $replication_mode in
+                "primary" | "secondary")
+                    $multiple && echo
+                    $multiple && echo "instance \"$instance\" ($replication_mode):"
+                    if [[ "$daemon" ]]; then
+                        daemon_names=( "$daemon" )
+                    else
+                        if [[ "$replication_mode" == "primary" ]]; then
+                            daemon_names=( "${primary_daemon_names[@]}" )
+                        else
+                            daemon_names=( "${secondary_daemon_names[@]}" )
+                        fi
+                    fi
+                    for name in "${daemon_names[@]}"; do
+                        pid_file="$root/$instance/replication/$name.pid"
+                        $multiple && echo -en "\t"
+                        daemon_status "$pid_file" "$name" || retval=1
+                    done
+                    ;;
+                *)
+                    echo "instance \"$instance\" is not replicating"
+                    retval=1
+                    ;;
+            esac
+        done
+
+        exit $retval
+        ;;
+    restart_lsyncd)
+        # restart the lsyncd daemon
+        # This is called remotely from the secondary after it starts its
+        # rsyncd daemon so that lsyncd on the primary will connect with the
+        # new rsyncd daemon.
+        [[ "$instance" ]] || {
+            echo "openvista-replication: restart_lsyncd" \
+                 "requires an instance name" >&2
+            exit 2 # LSB: invalid or excess argument(s)
+        }
+        stop_lsyncd || exit 1
+        start_lsyncd || exit 1
+        exit 0
+        ;;
+    *)
+        usage >&2
+        exit 2 # LSB: invalid or excess argument(s)
+        ;;
+esac

=== modified file 'scripts/etc/munin/plugin-conf.d/openvista'
--- scripts/etc/munin/plugin-conf.d/openvista	2009-08-24 21:28:11 +0000
+++ scripts/etc/munin/plugin-conf.d/openvista	2011-08-22 16:52:24 +0000
@@ -1,2 +1,6 @@
 [openvista*]
 group openvista, gtm
+
+[openvista_repl_backlog_*]
+env.warning 100
+env.critical 1000

=== added directory 'scripts/etc/openvista'
=== added file 'scripts/etc/openvista/lsyncd-routines.exclude'
--- scripts/etc/openvista/lsyncd-routines.exclude	1970-01-01 00:00:00 +0000
+++ scripts/etc/openvista/lsyncd-routines.exclude	2011-08-22 16:52:24 +0000
@@ -0,0 +1,2 @@
+*.swx
+*.swp

=== added file 'scripts/etc/openvista/mysqlusers'
--- scripts/etc/openvista/mysqlusers	1970-01-01 00:00:00 +0000
+++ scripts/etc/openvista/mysqlusers	2011-08-22 16:52:24 +0000
@@ -0,0 +1,13 @@
+# MySQL users
+#   If these values are changed, they must be changed on both primary and
+#   secondary servers.  If MySQL replication has already been set up, then
+#   ovmysqlrepl must be re-run on each server to reconfigure MySQL replication
+#   so that the user accounts are updated.
+
+# MySQL user for replication threads of the mysql process
+MASTER_USER="mysqlrepl"
+MASTER_PASSWORD="0909"
+# MySQL user for testing replication
+TEST_USER="mysqltest"
+TEST_PASSWORD="ntawkrwar"
+

=== added file 'scripts/etc/openvista/network-interface'
--- scripts/etc/openvista/network-interface	1970-01-01 00:00:00 +0000
+++ scripts/etc/openvista/network-interface	2011-08-22 16:52:24 +0000
@@ -0,0 +1,15 @@
+# This file is sourced by /etc/openvista/primary.d/openvista-ip.
+#
+# DEVICE should be set to the network interface for the IP address used by
+# applications, e.g., DEVICE=eth0:0
+#
+# This interface should be configured, but not started, with the same IP address
+# on both the primary server and the secondary server.  Since openvista-ip runs
+# only for the primary server, the primary server will serve OpenVista on that
+# address, and when a switchover occurs, this script will bring the interface
+# down for the old primary and up for the new primary so that clients will
+# automatically find the new server at the same IP address.
+#
+# GT.M Replication Network Configuration
+# https://intranet.medsphere.com/docs/DOC-4164
+DEVICE=

=== added directory 'scripts/etc/openvista/primary.d'
=== added file 'scripts/etc/openvista/primary.d/openvista-ip'
--- scripts/etc/openvista/primary.d/openvista-ip	1970-01-01 00:00:00 +0000
+++ scripts/etc/openvista/primary.d/openvista-ip	2011-08-22 16:52:24 +0000
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+# openvista-ip
+# Script to bring up the network interface of the service IP address of the
+# primary OpenVista server.
+
+# Copyright (C) 2010 Medsphere Systems Corporation
+#
+# This program is free software; you can redistribute it and/or modify it
+# solely under the terms of the GNU Affero General Public License version 3
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses>.
+#
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar
+# Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
+
+
+# source function libraries
+# CentOS/RHEL, provides action(), status()
+[[ -f /etc/rc.d/init.d/functions ]] && . /etc/rc.d/init.d/functions
+# Ubuntu/Debian, provides log_daemon_msg(), status_of_proc()
+[[ -f /lib/lsb/init-functions ]] && . /lib/lsb/init-functions
+# OpenVista
+. /usr/lib/openvista/functions
+
+log_command_usage "$@"
+
+# read the name of the network adapter, e.g. eth1:0
+# See the comments within the file for details.
+config_file=/etc/openvista/network-interface
+. "$config_file"
+
+usage()
+{
+    # Display usage information.
+    cat <<EOF
+Usage: ip {start|stop|restart|force-reload|status}
+EOF
+}
+
+init_logged_call()
+{
+    message=$1
+    shift
+    cmd_args=( "$@" )
+    if function_exists "action"; then
+        # CentOS/RHEL
+        action "$message" "${cmd_args[@]}"
+    elif function_exists "log_daemon_msg"; then
+        # Ubuntu/Debian
+        log_daemon_msg "$message"
+        "${cmd_args[@]}"
+        retval=$?
+        log_end_msg "$retval"
+        return "$retval"
+    else
+        # other
+        "${cmd_args[@]}"
+    fi
+}
+
+# check that user is root
+[[ $(id -u) == 0 ]] || exit_command 4 "Must be run as root"
+
+# exit with an instructive error message if DEVICE is not set
+if ! [[ "$DEVICE" ]]; then
+    exit_command 1 \
+      "DEVICE is not set for the OpenVista service address. See '$config_file'"
+fi
+
+case $1 in
+    start)
+        message="Bringing up network adapter '$DEVICE' for OpenVista"
+        if init_logged_call "$message" /sbin/ifup "$DEVICE"; then
+            log -l "Network adapter '$DEVICE' brought up for OpenVista"
+            /sbin/ifconfig "$DEVICE" \
+              | grep inet \
+              | sed -nr 's/^\s*(.*)/\1/p' \
+              | log -lp
+            [[ -d /var/lock/subsys ]] && touch /var/lock/subsys/openvista-ip
+        fi
+        ;;
+    stop)
+        message="Bringing down network adapter '$DEVICE' for OpenVista"
+        if init_logged_call "$message" /sbin/ifdown "$DEVICE"; then
+            log -l "Network adapter '$DEVICE' brought down for OpenVista"
+            [[ -d /var/lock/subsys ]] && rm -f /var/lock/subsys/openvista-ip
+        fi
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        ;;
+    status)
+        /sbin/ifconfig "$DEVICE" \
+          | grep inet
+        ;;
+    address)
+        /sbin/ifconfig "$DEVICE" \
+          | grep inet \
+          | sed -nr "s/^.*inet addr:(([0-9]{1,3}\.){3}[0-9]{1,3}).*$/\1/p"
+        ;;
+    *)
+        usage >&2
+        exit 2 # LSB: invalid or excess argument(s)
+        ;;
+esac

=== added directory 'scripts/etc/openvista/secondary.d'
=== modified file 'scripts/usr/bin/openvista'
--- scripts/usr/bin/openvista	2010-12-07 00:31:07 +0000
+++ scripts/usr/bin/openvista	2011-08-22 16:52:24 +0000
@@ -11,22 +11,24 @@
 # This program is free software; you can redistribute it and/or modify it solely
 # under the terms of the GNU Affero General Public License version 3 as published
 # by the Free Software Foundation.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses>.
-# 
-# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar 
+#
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
 
 # common functions
 . /usr/lib/openvista/functions
 
+log_command_usage "$@"
+
 # parse arguments
 while getopts hV option; do
     case $option in
@@ -35,6 +37,7 @@
 Usage: openvista INSTANCE_NAME
    or  openvista -h
    or  openvista -V
+Access a MUMPS programmer prompt for the specified OpenVista instance.
 
   -h  display this help text and exit
   -V  display version information and exit
@@ -43,11 +46,11 @@
             ;;
         V)
             cat <<EOF
-openvista 0.8.11
+openvista 0.9
 Copyright (C) 2009 Medsphere Systems Corporation
 
-openvista is powered by Medsphere and part of a suite of open source 
-utilities licensed under the AGPL, available at http://medsphere.org.  
+openvista is powered by Medsphere and part of a suite of open source
+utilities licensed under the AGPL, available at http://medsphere.org.
 EOF
             exit 0
             ;;
@@ -62,17 +65,8 @@
     exit 2
 fi
 
-# check permissions
-in_groups || {
-    echo "openvista: permission denied" >&2 
-    exit 1
-}
-
-# check for for valid arguments (requires correct permissions to do; must happen after permission checks)
-set_gtm_env "$1" || {
-    echo "openvista: $instance: Not an OpenVista instance" >&2
-    exit 3
-}
+# check for for valid arguments
+set_gtm_env -e "$1"
 
 # log access to direct mode
 if [ -z "$SSH_CLIENT" ]; then
@@ -85,10 +79,10 @@
 umask 007
 
 # switch to temp directory so *.mj[eo] files are created there
-# because of the umask, even if two users job off the same routine, 
-# the second user will be able to overwrite the *.mj[eo] files and 
-# the JOB command will succeed, but the *.mj[eo] files will become 
-# garbled (both JOBs will write to them in no particular order) 
+# because of the umask, even if two users job off the same routine,
+# the second user will be able to overwrite the *.mj[eo] files and
+# the JOB command will succeed, but the *.mj[eo] files will become
+# garbled (both JOBs will write to them in no particular order)
 cd "$root/$instance/tmp"
 
 # enter direct mode
@@ -96,4 +90,3 @@
 
 # fix the terminal
 stty sane 2> /dev/null
-

=== modified file 'scripts/usr/bin/ovbackup'
--- scripts/usr/bin/ovbackup	2010-12-07 00:31:07 +0000
+++ scripts/usr/bin/ovbackup	2011-08-22 16:52:24 +0000
@@ -10,32 +10,36 @@
 # This program is free software; you can redistribute it and/or modify it solely
 # under the terms of the GNU Affero General Public License version 3 as published
 # by the Free Software Foundation.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses>.
-# 
-# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar 
+#
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
 
 # common functions
 . /usr/lib/openvista/functions
 
+log_command_usage "$@"
+
 # parse arguments
-while getopts hVq option; do
+while getopts hVqo option; do
     case $option in
         h)
             cat <<EOF
 Usage: ovbackup [-q] INSTANCE_NAME
    or  ovbackup -h
    or  ovbackup -V
+Back up routines and globals of the specified OpenVista instance.
 
   -q  quiet; suppress status messages
+  -o  output the backup filename
   -h  display this help text and exit
   -V  display version information and exit
 EOF
@@ -43,22 +47,26 @@
             ;;
         V)
             cat <<EOF
-ovbackup 0.8.11
-Copyright (C) 2009 Medsphere Systems Corporation
+ovbackup 0.9
+Copyright (C) 2009-2010 Medsphere Systems Corporation
 
-ovbackup is powered by Medsphere and part of a suite of open source 
-utilities licensed under the AGPL, available at http://medsphere.org.  
+ovbackup is powered by Medsphere and part of a suite of open source
+utilities licensed under the AGPL, available at http://medsphere.org.
 EOF
             exit 0
             ;;
         q)
             skip_status=true
             ;;
+        o)
+            output_filename=true
+            ;;
     esac
 done
 shift `expr $OPTIND - 1`
 
 : ${skip_status:=false}
+: ${output_filename:=false}
 
 # check command syntax
 if [ -z "$1" ]; then
@@ -67,17 +75,8 @@
     exit 2
 fi
 
-# check permissions
-in_groups || {
-    echo "ovbackup: permission denied" >&2
-    exit 1
-}
-
-# check for for valid arguments (requires correct permissions to do; must happen after permission checks)
-set_gtm_env "$1" || {
-    echo "ovbackup: $instance: Not an OpenVista instance" >&2
-    exit 3
-}
+# check for for valid arguments
+set_gtm_env -e "$1"
 
 if [ -e "$root/$instance/etc/backups.conf" ]; then
     . "$root/$instance/etc/backups.conf"
@@ -94,7 +93,7 @@
 print_status "ovbackup" "Options:" "true"
 print_status "ovbackup" "  -q (quiet) = $skip_status" "true"
 
-tempdir=`mktemp -d -p "$root/$instance/backups" .ovbackup.XXXXXXXXXX` || 
+tempdir=`mktemp -d -p "$root/$instance/backups" .ovbackup.XXXXXXXXXX` ||
 exit_with_error "ovbackup" "Unable to create temporary directory"
 
 # the EXIT handler may or may not run if we're interrupted or killed depending
@@ -113,12 +112,12 @@
 
 print_status "ovbackup" "Copying configuration files" "$skip_status"
 
-install -m 2750 -d "$tempdir/etc" || 
+install -m 2750 -d "$tempdir/etc" ||
 exit_with_error "ovbackup" "Unable to copy configuration files"
 
 # copy env file if it exists
 if [ -f "$root/$instance/etc/env" ]; then
-    cp -p "$root/$instance/etc/env" "$tempdir/etc/" || 
+    cp -p "$root/$instance/etc/env" "$tempdir/etc/" ||
     exit_with_error "ovbackup" "Unable to copy env configuration file"
 fi
 
@@ -128,7 +127,7 @@
 # not the symlink itself).  this allows administrators to reference routines
 # outside the OpenVista instance's routines directory and still have them
 # backed up (e.g., to share routines between OpenVista instances)
-cp -RLp "$root/$instance/routines" "$tempdir" || 
+cp -RLp "$root/$instance/routines" "$tempdir" ||
 exit_with_error "ovbackup" "Unable to copy routines"
 
 print_status "ovbackup" "Copying database files" "$skip_status"
@@ -200,9 +199,11 @@
 
 print_status "ovbackup" "Compressing backup" "$skip_status"
 
+backup_name="${instance}-$timestamp.tar.bz2"
+
 (
     umask 007
-    tar -c --remove-files `choose_bzip2` -f "$tempdir/${instance}-$timestamp.tar.bz2" -C "$tempdir" gtm_version etc routines globals
+    tar -c --remove-files `choose_bzip2` -f "$tempdir/${backup_name}" -C "$tempdir" gtm_version etc routines globals
 ) || exit_with_error "ovbackup" "Unable to compress temporary backup directory"
 
 # since redirection is not safe (it follows symlinks), create the file in the
@@ -210,14 +211,18 @@
 # md5sum fails, ignore the error.
 (
     umask 007 &&
-    md5sum < "$tempdir/${instance}-$timestamp.tar.bz2" | sed 's/-$/'"${instance}-$timestamp.tar.bz2"'/' > "$tempdir/${instance}-$timestamp.tar.bz2.md5"
-    mv "$tempdir/${instance}-$timestamp.tar.bz2.md5" "$root/$instance/backups/${instance}-$timestamp.tar.bz2.md5"
+    md5sum < "$tempdir/${backup_name}" | sed 's/-$/'"${backup_name}"'/' > "$tempdir/${backup_name}.md5"
+    mv "$tempdir/${backup_name}.md5" "$root/$instance/backups/${backup_name}.md5"
 )
 
-mv "$tempdir/${instance}-$timestamp.tar.bz2" "$root/$instance/backups/${instance}-$timestamp.tar.bz2" || 
+backup_filename="$root/$instance/backups/${backup_name}"
+
+mv "$tempdir/${backup_name}" "$backup_filename" ||
 exit_with_error "ovbackup" "Unable to rename backup file"
 
-print_status "ovbackup" "Backup of $instance written to $root/$instance/backups/${instance}-$timestamp.tar.bz2" "$skip_status"
+print_status "ovbackup" "Backup of $instance written to $backup_filename" "$skip_status"
+
+$output_filename && log -s "$backup_filename"
 
 # remove the oldest backup file until there are only $num_backups remaining
 until [ `find "$root/$instance/backups/" -type f -name "*.tar.bz2" | wc -l` -le $num_backups ]; do

=== modified file 'scripts/usr/bin/ovcc'
--- scripts/usr/bin/ovcc	2010-12-07 00:31:07 +0000
+++ scripts/usr/bin/ovcc	2011-08-22 16:52:24 +0000
@@ -11,22 +11,24 @@
 # This program is free software; you can redistribute it and/or modify it solely
 # under the terms of the GNU Affero General Public License version 3 as published
 # by the Free Software Foundation.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses>.
-# 
-# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar 
+#
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
 
 # common functions
 . /usr/lib/openvista/functions
 
+log_command_usage "$@"
+
 # parse arguments
 while getopts hV option; do