Merge lp:~jontai/openvista-gtm-integration/bug336166 into lp:openvista-gtm-integration

[Jon Tai]

[Jon Tai (jontai)]

This branch makes a large number of changes, so I'm putting it up for review early while I finish testing it. I don't anticipate any more big changes, but I might have to fix a thing or two if I find problems.

[jeff.apple (jeff-apple)]

Nice changes. I saw no problems.

review: Approve

[lp:~jontai/openvista-gtm-integration/bug336166]

145. By Jon Tai on 2009-12-18

add a warning in the sample env file

146. By Jon Tai on 2009-12-19

older versions of rsync (like the version that ships with RHEL5, 2.6.8) don't support the --out-format argument, so work around it by passing -v and greping for .m files ourselves

147. By Jon Tai on 2009-12-19

improve performance of ovimport by having mumps read the compile list file directly; this saves thousands of process invocations and about 3 minutes when importing OpenVista Server

148. By Jon Tai on 2009-12-21

Fix a bug where $user would be undefined in /etc/cron.daily/openvista. This occurs because list_openvista_instances is executed in a subshell, so variables set during its invocation aren't set in the parent shell.

[Jon Tai (jontai)]

OK I'm done with my testing. I tested KIDS builds on a routine-tiered installation and it worked fine. I also found a few OV utility regressions and fixed them.

In my testing, I noticed that the current version of VPE is unable to handle routine tiers (errors occur when saving routines), but I think this branch is large enough -- there are other people in the community working on VPE anyway, so it's likely that we will be able to just grab a new version of VPE and things will just work.

Jeff, can I get one more ACK before I merge?

[lp:~jontai/openvista-gtm-integration/bug336166]

149. By Jon Tai on 2009-12-21

look for FROM routine in the right directory

150. By Jon Tai on 2009-12-21

Separate TO/FROM (which are passed in as names of routines, e.g., %ZTM0) and SRC/DST which are full paths. This way, the call to ZLINK is given an argument like _ZTM0 instead of /path/to/_ZTM0.m. When called with the latter, ZLINK puts the .o file in /pat/to/ instead of the configured routines directory, which isn't what we want.

[Jon Tai (jontai)]

Oops, forgot to test ZTMGRSET. I did, and found that it's not pulling routines from the correct source directory when it's doing copies. Fixed that, plus an old bug (never filed) that caused .o files to be placed in the routines directory.

[jeff.apple (jeff-apple)]

If this tests out OK, then I see no problems.

As for VPE, they should be using kernel routines, right? If there's something that varies between implementations that isn't addressed in the kernel, then perhaps the kernel needs some addintions. That's way, way, way beyond the scope of this bug, though.

=== modified file 'docs/man1/ovbackup.1'
--- docs/man1/ovbackup.1	2009-12-01 21:55:02 +0000
+++ docs/man1/ovbackup.1	2009-12-21 19:35:21 +0000
@@ -1,6 +1,6 @@
-.TH ovbackup 1 "1 Dec 2009" Linux "User Manuals"
+.TH ovbackup 1 "10 Dec 2009" Linux "User Manuals"
 .SH NAME
-ovbackup \- backs up routines and globals of an OpenVista instance
+ovbackup \- back up routines and globals of an OpenVista instance
 .SH SYNOPSIS
 .B ovbackup [-h] [-V] [-q]
 .I instance_name
@@ -8,7 +8,17 @@
 Each invocation of
 .B ovbackup
 creates a consistent snapshot of the routines and globals of an OpenVista
-instance.  Backups are compressed with tar/bz2 and stored in the 
+instance.  The 
+.I mumps.gld 
+global directory file in the 
+.I globals 
+directory of the instance is also included in the backup, as is the 
+.I env 
+file in the 
+.I etc
+directory of the instance, if it exists.  If any of these files or directories
+are symlinks, the symlink targets are backed up instead of the symlinks
+themselves.  Backups are compressed with tar/bzip2 and stored in the 
 .I backups
 directory of an OpenVista instance.  The md5 checksum of the compressed backup
 file is computed and stored in a separate file.
 
=== modified file 'docs/man1/ovcheckperms.1'
--- docs/man1/ovcheckperms.1	2009-12-01 21:58:29 +0000
+++ docs/man1/ovcheckperms.1	2009-12-21 19:35:21 +0000
@@ -1,4 +1,4 @@
-.TH ovcheckperms 1 "1 Dec 2009" Linux "User Manuals"
+.TH ovcheckperms 1 "11 Dec 2009" Linux "User Manuals"
 .SH NAME
 ovcheckperms \- verify permissions
 .SH SYNOPSIS
@@ -6,9 +6,9 @@
 .I instance_name
 .SH DESCRIPTION
 .B ovcheckperms
-script verifies that all files and directories in an OpenVista instance have
-the correct permissions.  Incorrect permissions are written to stdout and
-logged to syslog.
+verifies that all files and directories in an OpenVista instance have the
+correct permissions.  Incorrect permissions are written to stdout and logged to
+syslog.
 .PP
 The
 .I /etc/cron.daily/openvista
 
=== added file 'docs/man1/ovgetvar.1'
--- docs/man1/ovgetvar.1	1970-01-01 00:00:00 +0000
+++ docs/man1/ovgetvar.1	2009-12-21 19:35:21 +0000
@@ -0,0 +1,51 @@
+.TH ovgetvar 1 "11 Dec 2009" Linux "User Manuals"
+.SH NAME
+ovgetvar \- get GT.M environment variable
+.SH SYNOPSIS
+.B ovgetvar [-h] [-V]
+.I instance_name
+.I gtm_dist|gtm_path|gtmroutines|gtmgbldir
+.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.
+.PP
+If 
+.I gtm_path
+is requested and 
+.I $gtm_dist
+is a symlink, 
+.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.
+.PP
+.SH OPTIONS
+.IP -h
+display help text and exit
+.IP -V
+display version information and exit
+.SH "EXIT VALUES"
+.IP 0
+Success
+.IP 1
+Permission denied or other error
+.IP 2
+Invalid command syntax
+.IP 3
+Invalid argument to option
+.SH "REPORTING BUGS"
+Please report any bugs you encounter at
+.PP
+https://bugs.launchpad.net/openvista-gtm-integration
+.SH AUTHOR
+Jonathan Tai <[e-mail]>
 
=== modified file 'docs/man1/ovimport.1'
--- docs/man1/ovimport.1	2009-12-01 21:55:02 +0000
+++ docs/man1/ovimport.1	2009-12-21 19:35:21 +0000
@@ -1,8 +1,10 @@
-.TH ovimport 1 "1 Dec 2009" Linux "User Manuals"
+.TH ovimport 1 "10 Dec 2009" Linux "User Manuals"
 .SH NAME
-ovimport \- imports routines and globals into a new OpenVista instance
+ovimport \- import routines and globals into an OpenVista instance
 .SH SYNOPSIS
-.B ovimport [-h] [-V] [-q] [-f] [-c 
+.B ovimport [-h] [-V] [-q] [-f] [-t 
+.I target
+.B ] [-c 
 .I imported|all|none
 .B ] [-r 
 .I routines
@@ -12,18 +14,34 @@
 .I instance_name
 .SH DESCRIPTION
 .B ovimport
-imports routines and globals into a new OpenVista instance.  Routines can be in
-a %RO-format file, or loose .m files in a directory.  In the latter case,
-specify the directory containing the .m files after the -r flag; do not specify
-the .m files themselves.  Globals can be in a %GO-format file or a ZWR-format
-file.  Files with DOS-style line endings are converted to UNIX-style line
-endings automagically; GT.M does not handle DOS-style line endings natively.
-Line ending conversion requires enough free space in the target instance's 
+imports routines and globals into an OpenVista instance.
+.PP
+Routines can be in a %RO-format file or loose .m files in a directory.  In the
+latter case, specify the directory containing the .m files after the -r flag;
+do not specify the .m files themselves.  By default, routines are imported into
+the 
+.I routines 
+subdirectory of the OpenVista instance.  Use the -t flag to specify an
+alternate directory if $gtmroutines has been overridden in the instance's 
+.I env 
+file.  The -t flag was added in 
+.B ovimport 
+0.8.7.
+.PP
+Globals can be in a %GO-format file or a ZWR-format file.
+.PP
+Files with DOS-style line endings are converted to UNIX-style line endings by 
+.B ovimport 
+automagically; GT.M does not handle DOS-style line endings natively.  Line
+ending conversion requires enough free space in the target instance's 
 .I tmp
 directory to hold a copy of the files to be imported.  Support for compressed
-files is planned in a future version.
+files is planned for a future version.
 .PP
-.B ovimport
+.B ovimport 
+is primarily used to import routines and globals into a new OpenVista instance.
+By default, 
+.B ovimport 
 checks to see if the target instance has any routines or database transactions.
 If either are found, the instance is assumed to not be new and 
 .B ovimport
@@ -36,15 +54,19 @@
 flag is given, although imported routines and globals will overwrite any
 routines or globals with the same name.
 .PP
-Routines are compiled after the routines are imported.  By default, only
-imported routines are compiled.  You should use 
+Routines are compiled after they are imported.  By default, only imported
+routines are compiled.  Use 
 .B -c all 
-if you want to recompile all routines or 
+to recompile all routines or 
 .B -c none 
-if you do not want to compile any routines.  Journaling is temporarily disabled
-during the global import to improve performance, unless the 
+to skip routine compilation.  The -c flag was added in 
+.B ovimport 
+0.8.7.
+.PP
+Journaling is temporarily disabled during the global import to improve
+performance, unless the 
 .B -f
-flag was given.  This is safe to do because the database is guaranteed to be
+flag is given.  This is safe to do because the database is guaranteed to be
 empty before the import, so even if the system crashes and the database is
 destroyed, the database can be recreated and
 .B ovimport
@@ -70,6 +92,8 @@
 quiet; suppress status messages
 .IP -f
 force; import routines and globals even if target instance is not empty
+.IP -t
+target; directory to import routines into (defaults to routines subdirectory of instance)
 .IP -c
 compile imported routines only (the default), all routines, or no routines
 .IP -r
 
=== modified file 'docs/man8/ovrestore.8'
--- docs/man8/ovrestore.8	2009-12-01 21:55:02 +0000
+++ docs/man8/ovrestore.8	2009-12-21 19:35:21 +0000
@@ -1,4 +1,4 @@
-.TH ovrestore 8 "1 Dec 2009" Linux "User Manuals"
+.TH ovrestore 8 "10 Dec 2009" Linux "User Manuals"
 .SH NAME
 ovrestore \- restores a backup file into an OpenVista instance
 .SH SYNOPSIS
@@ -28,12 +28,22 @@
 for each process currently using the database before attempting to acquire
 exclusive access to the database.
 .PP
-Routines are compiled after the routines are restored.  The mumps.gld global
-directory file is restored from the backup file, but the paths to database
-files and journal files are updated to reflect the name of the target instance. 
-The database file is also restored from the backup file; the path to the
-journal file is updated when journaling is re-enabled at the end of the restore
-process.
+If the backup file contains an 
+.I env 
+configuration file, it is checked for validity and restored.  Routines are
+restored from the backup file, then compiled.  The 
+.I mumps.gld 
+global directory file is restored from the backup file, and the paths to
+database files and journal files are updated to reflect the name of the target
+instance.  If the 
+.I env
+file sets $gtmgbldir to point to a different 
+.I mumps.gld
+file, the foreign global directory file is checked to make sure it exists, but
+no attempt is made to update the paths in the foreign global directory file.
+The database file is also restored from the backup file, and the embedded path
+to the journal file is updated when journaling is re-enabled at the end of the
+restore process.
 .PP
 If the 
 .B -j
 
=== modified file 'mumps/ZCD.m'
--- mumps/ZCD.m	2009-11-24 22:57:02 +0000
+++ mumps/ZCD.m	2009-12-21 19:35:21 +0000
@@ -1,4 +1,4 @@
-ZCD	; MSC/JKT,JDS ; "Namespace" utilities for GT.M/Unix ; 17JUL2009
+ZCD	; MSC/JKT,JDS ; "Namespace" utilities for GT.M/Unix ; 5DEC2009
 	;;8.0;KERNEL;**MSC**;April 21 2009
 	; This routine assumes that your global directory file exists one 
 	; directory below the root of the instance, e.g., 
@@ -40,12 +40,18 @@
 	Q $$ROOT()_"/"_INSTANCE
 	;
 GTMPATH(INSTANCE) ; return the path to the version of GT.M this instance uses
-	N %PIPE,%I S %PIPE="readlink",%I=$I
+	N %PATH,%PIPE,%I
+	S %I=$I
+	S %PIPE="ovgetvar"
+	O %PIPE:(COMMAND="ovgetvar "_INSTANCE_" gtm_path 2> /dev/null":READONLY)::"PIPE" U %PIPE
+	R %PATH
+	C %PIPE
+	I %PATH'="" U %I Q %PATH
+	S %PIPE="readlink"
 	O %PIPE:(COMMAND="readlink "_$$PATH(INSTANCE)_"/gtm":READONLY)::"PIPE" U %PIPE
-	N %PATH R %PATH
-	U %I
+	R %PATH
 	C %PIPE
-	Q %PATH
+	U %I Q %PATH
 	;
 LIST	; return an array (Y) of OpenVista instances on this system
 	N %PIPE,%I S %PIPE="ls",%I=$I
@@ -59,21 +65,16 @@
 SWITCH(INSTANCE) ; switch to another OpenVista instance
 	N %ZG,%ZRO D NEWZGZRO(INSTANCE) I %ZG="",%ZRO="" Q 0
 	;
-	; FIXME: set gtm_dist="$root/$instance/gtm"
 	N %TEMPDIR S %TEMPDIR=$$MKTEMP() S $ZG=%ZG,$ZRO=%ZRO_" "_%TEMPDIR
 	N X,Y S X=INSTANCE X ^%ZOSF("UPPERCASE") S $ZPROMPT=Y_">"
-	; FIXME: set GTMXC_openvista="$root/$instance/gtm/openvista.xc"
-	; FIXME: set PATH="$PATH:$root/$instance/gtm"
 	;
 	; re-ZLINK routines that have been loaded in our current image
 	X "Q" ; equivalent to ZGOTO so that you can recompile a routine you are using
 	N %ROUTINE,%FILENAME S %ROUTINE=""
 NEXT	F  S %ROUTINE=$VIEW("rtnnext",%ROUTINE) Q:%ROUTINE=""  D
-	. Q:%ROUTINE="GTM$DMOD"
-	. Q:%ROUTINE="ZCD"
-	. I "^MSCXUS3A^XQ1^XUP^%MSCXUCI^%ZMSCXUCI^"[("^"_%ROUTINE_"^") Q  ;switch UCI option
+	. I "^GTM$DMOD^ZCD^MSCXUS3A^XQ1^XUP^%MSCXUCI^%ZMSCXUCI^"[("^"_%ROUTINE_"^") Q  ;do not try to recompile these
 	. ;
-	. ; The only % routines that we ship start with %Z other % routines are allocated to the 
+	. ; The only % routines that we ship start with %Z; other % routines are allocated to the 
 	. ; vendor (GTM) and do not need to be recompiled (and may only have object code)
 	. Q:$E(%ROUTINE)="%"&($E(%ROUTINE,2)'="Z")
 	. ;
@@ -106,7 +107,19 @@
 SWITCHENV(INSTANCE) ; private entry point
 	; set new $ZG and $ZRO by parsing env file in target instance
 	;
-	; FIXME: implement this
+	N %PIPE,%I
+	S %I=$I
+	S %PIPE="ovgetvar_gtmgbldir"
+	O %PIPE:(COMMAND="ovgetvar "_INSTANCE_" gtmgbldir 2> /dev/null":READONLY)::"PIPE" U %PIPE
+	R %ZG
+	C %PIPE
+	S %PIPE="ovgetvar_gtmroutines"
+	O %PIPE:(COMMAND="ovgetvar "_INSTANCE_" gtmroutines 2> /dev/null":READONLY)::"PIPE" U %PIPE
+	R %ZRO
+	C %PIPE
+	U %I
+	;
+	; FIXME: check that %ZG actually exists and that all pieces of %ZRO exist
 	Q
 	;
 SWITCHCAT(INSTANCE) ; private entry point
 
=== modified file 'mumps/ZTMGRSET.m'
--- mumps/ZTMGRSET.m	2009-08-31 18:49:27 +0000
+++ mumps/ZTMGRSET.m	2009-12-21 19:35:21 +0000
@@ -1,4 +1,4 @@
-ZTMGRSET ;SF/RWF,PUG/TOAD,MSC/JDA/JDS/JKT - SET UP THE MGR ACCOUNT FOR THE SYSTEM ;11JUN2009
+ZTMGRSET ;SF/RWF,PUG/TOAD,MSC/JDA/JDS/JKT - SET UP THE MGR ACCOUNT FOR THE SYSTEM ;21DEC2009
  ;;8.0;KERNEL;**34,36,69,94,121,127,136,191,275,MSC**;JUL 10, 1995;
  ;
  N %D,%S,I,OSMAX,U,X,X1,X2,Y,Z1,Z2,ZTOS,ZTMODE,SCR
@@ -160,11 +160,13 @@
 COPY(FROM,TO) ;
  I ZTOS'=7,ZTOS'=8 X "ZL @FROM ZS @TO" Q
  ;For GT.M below
- N PATH,COPY S PATH=$$R
- D SILENT^%RSEL(FROM) S FROM=PATH_FROM_".m"
- S TO=PATH_$TR(TO,"%","_")_".m"
+ S TO=$TR(TO,"%","_")
+ N PATH,SRC,DST,COPY
+ S PATH=$$R
+ N %ZR D SILENT^%RSEL(FROM) S SRC=%ZR(FROM)_FROM_".m"
+ S DST=PATH_TO_".m"
  S COPY=$S(ZTOS=7:"COPY",1:"cp")
- ZSYSTEM COPY_" "_FROM_" "_TO
+ ZSYSTEM COPY_" "_SRC_" "_DST
  ZLINK TO
  Q
  ;
 
=== modified file 'packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/changelog'
--- packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/changelog	2009-11-22 08:04:35 +0000
+++ packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/changelog	2009-12-21 19:35:21 +0000
@@ -1,3 +1,12 @@
+openvista-gtm-integration (0.8.6-0ubuntu2~msc3~jaunty1) jaunty; urgency=low
+
+  * Update utils to honor env config file if it exists (Closes: #336166)
+  * Add man pages for new ovcheckperms and ovgetvar utilities
+  * Add config file templates in /usr/share/openvista
+  * Remove executable bit on munin plugin configuration file
+
+ -- Jonathan Tai <[e-mail]>  Thu, 17 Dec 2009 10:11:25 -0800
+
 openvista-gtm-integration (0.8.6-0ubuntu2~msc2~jaunty1) jaunty; urgency=low
 
   * Re-order dependencies so preferred packages come first.
 
=== modified file 'packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/openvista-utils.dirs'
--- packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/openvista-utils.dirs	2009-10-20 02:23:22 +0000
+++ packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/openvista-utils.dirs	2009-12-21 19:35:21 +0000
@@ -4,6 +4,7 @@
 sbin
 usr/bin
 usr/lib/openvista
+usr/share/openvista
 usr/sbin
 usr/share/doc/openvista-utils
 var/www/webdav
 
=== modified file 'packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/openvista-utils.manpages'
--- packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/openvista-utils.manpages	2009-10-20 02:23:22 +0000
+++ packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/openvista-utils.manpages	2009-12-21 19:35:21 +0000
@@ -10,3 +10,5 @@
 docs/man1/ovpurgejournals.1
 docs/man1/ovswitchjournals.1
 docs/man1/ovimport.1
+docs/man1/ovcheckperms.1
+docs/man1/ovgetvar.1
 
=== modified file 'packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/rules'
--- packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/rules	2009-10-21 23:27:51 +0000
+++ packages/deb/Ubuntu/9.04/openvista-gtm-integration/debian/rules	2009-12-21 19:35:21 +0000
@@ -86,7 +86,7 @@
 	dh_prep -i 
 	dh_installdirs -i
 
-	install scripts/etc/munin/plugin-conf.d/openvista debian/openvista-munin-plugins/etc/munin/plugin-conf.d/
+	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/
@@ -110,17 +110,17 @@
 
 	install -m 644 scripts/usr/lib/openvista/functions debian/openvista-utils/usr/lib/openvista/
 
-	install scripts/usr/sbin/ovinstanceadd debian/openvista-utils/usr/sbin/
-	install scripts/usr/sbin/ovinstancedel debian/openvista-utils/usr/sbin/
-	install scripts/usr/sbin/ovrestore debian/openvista-utils/usr/sbin/
-
-	install scripts/usr/bin/openvista debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovtied debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovcc debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovbackup debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovpurgejournals debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovswitchjournals debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovimport debian/openvista-utils/usr/bin/
+	for config in scripts/usr/share/openvista/*; do \
+		install -m 644 $$config debian/openvista-utils/usr/share/openvista/ ;\
+	done
+
+	for script in scripts/usr/sbin/*; do \
+		install $$script debian/openvista-utils/usr/sbin/ ;\
+	done
+
+	for script in scripts/usr/bin/*; do \
+		install $$script debian/openvista-utils/usr/bin/ ;\
+	done
 
 	install scripts/etc/init.d/openvista-databases debian/openvista-utils.openvista-databases.init
 	install scripts/etc/init.d/openvista debian/openvista-utils.openvista.init
 
=== modified file 'packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/changelog'
--- packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/changelog	2009-11-22 08:04:35 +0000
+++ packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/changelog	2009-12-21 19:35:21 +0000
@@ -1,3 +1,12 @@
+openvista-gtm-integration (0.8.6-0ubuntu2~msc3~karmic1) karmic; urgency=low
+
+  * Update utils to honor env config file if it exists (Closes: #336166)
+  * Add man pages for new ovcheckperms and ovgetvar utilities
+  * Add config file templates in /usr/share/openvista
+  * Remove executable bit on munin plugin configuration file
+
+ -- Jonathan Tai <[e-mail]>  Thu, 17 Dec 2009 10:11:25 -0800
+
 openvista-gtm-integration (0.8.6-0ubuntu2~msc2~karmic1) karmic; urgency=low
 
   * Re-order dependencies so preferred packages come first.
 
=== 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-11-19 21:19:51 +0000
+++ packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/openvista-utils.dirs	2009-12-21 19:35:21 +0000
@@ -4,6 +4,7 @@
 sbin
 usr/bin
 usr/lib/openvista
+usr/share/openvista
 usr/sbin
 usr/share/doc/openvista-utils
 var/www/webdav
 
=== 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	2009-11-19 21:19:51 +0000
+++ packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/openvista-utils.manpages	2009-12-21 19:35:21 +0000
@@ -10,3 +10,5 @@
 docs/man1/ovpurgejournals.1
 docs/man1/ovswitchjournals.1
 docs/man1/ovimport.1
+docs/man1/ovcheckperms.1
+docs/man1/ovgetvar.1
 
=== modified file 'packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/rules'
--- packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/rules	2009-11-19 21:19:51 +0000
+++ packages/deb/Ubuntu/9.10/openvista-gtm-integration/debian/rules	2009-12-21 19:35:21 +0000
@@ -86,7 +86,7 @@
 	dh_prep -i 
 	dh_installdirs -i
 
-	install scripts/etc/munin/plugin-conf.d/openvista debian/openvista-munin-plugins/etc/munin/plugin-conf.d/
+	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/
@@ -110,17 +110,17 @@
 
 	install -m 644 scripts/usr/lib/openvista/functions debian/openvista-utils/usr/lib/openvista/
 
-	install scripts/usr/sbin/ovinstanceadd debian/openvista-utils/usr/sbin/
-	install scripts/usr/sbin/ovinstancedel debian/openvista-utils/usr/sbin/
-	install scripts/usr/sbin/ovrestore debian/openvista-utils/usr/sbin/
-
-	install scripts/usr/bin/openvista debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovtied debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovcc debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovbackup debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovpurgejournals debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovswitchjournals debian/openvista-utils/usr/bin/
-	install scripts/usr/bin/ovimport debian/openvista-utils/usr/bin/
+	for config in scripts/usr/share/openvista/*; do \
+		install -m 644 $$config debian/openvista-utils/usr/share/openvista/ ;\
+	done
+
+	for script in scripts/usr/sbin/*; do \
+		install $$script debian/openvista-utils/usr/sbin/ ;\
+	done
+
+	for script in scripts/usr/bin/*; do \
+		install $$script debian/openvista-utils/usr/bin/ ;\
+	done
 
 	install scripts/etc/init.d/openvista-databases debian/openvista-utils.openvista-databases.init
 	install scripts/etc/init.d/openvista debian/openvista-utils.openvista.init
 
=== modified file 'packages/rpm/CentOS/5/openvista-gtm-integration.spec'
--- packages/rpm/CentOS/5/openvista-gtm-integration.spec	2009-11-23 21:23:06 +0000
+++ packages/rpm/CentOS/5/openvista-gtm-integration.spec	2009-12-21 19:35:21 +0000
@@ -63,6 +63,11 @@
 install -d %{buildroot}/usr/lib/openvista
 install scripts/usr/lib/openvista/functions %{buildroot}/usr/lib/openvista
 
+install -d %{buildroot}%{_datadir}/openvista
+for config in scripts/usr/share/openvista/*; do
+    install -m 644 $config %{buildroot}%{_datadir}/openvista/
+done
+
 install -d %{buildroot}%{_sbindir}/
 for script in scripts/usr/sbin/*; do
     install $script %{buildroot}%{_sbindir}/
@@ -301,7 +306,7 @@
 
 
 %package -n openvista-utils
-Release:	1
+Release:	2
 Summary:	Utilities for configuring and managing OpenVista
 Group:		Applications/System
 
@@ -335,6 +340,7 @@
 %doc COPYING.AGPL
 %doc NEWS
 /usr/lib/openvista/functions
+%{_datadir}/openvista/*
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/man8/*
 
=== modified file 'scripts/etc/bash_completion.d/openvista'
--- scripts/etc/bash_completion.d/openvista	2009-12-01 22:03:11 +0000
+++ scripts/etc/bash_completion.d/openvista	2009-12-21 19:35:21 +0000
@@ -19,14 +19,8 @@
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
 
-_ovinstances()
-{
-    for instance in `ls /opt/openvista 2> /dev/null`; do
-        if [ -L "/opt/openvista/$instance/gtm" ]; then
-            echo $instance
-        fi
-    done
-}
+# common functions
+. /usr/lib/openvista/functions
 
 _ov()
 {
@@ -64,7 +58,7 @@
             ;;
         *)
             if [ $allowed_nonopt_words -eq 0 ]; then
-                COMPREPLY=( $(compgen -W "$(_ovinstances)" -- $cur) )
+                COMPREPLY=( $(compgen -W "$(list_openvista_instances)" -- $cur) )
             else
                 _filedir
             fi
@@ -135,10 +129,10 @@
 
 complete -F _ovinstanceadd ovinstanceadd
 
-# ovimport [-h] [-V] [-q] [-f] [-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 -c -r -g'
+    opts='-h -V -q -f -t -c -r -g'
     allowed_nonopt_words=1
 
     COMPREPLY=()
@@ -158,7 +152,7 @@
 		    # afterward; use a hack to exit on the next iteration of
 		    # the loop
                     allowed_nonopt_words=0
-                elif [ x"${COMP_WORDS[i]}" = x"-c" ] || [ x"${COMP_WORDS[i]}" = x"-r" ] || [ x"${COMP_WORDS[i]}" = x"-g" ]; then
+                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
                 ;;
@@ -178,7 +172,11 @@
             ;;
         *)
             if [ $allowed_nonopt_words -eq 0 ]; then
-                COMPREPLY=( $(compgen -W "$(_ovinstances)" -- $cur) )
+                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
             fi
@@ -188,3 +186,52 @@
 
 complete -F _ovimport $filenames ovimport
 
+# ovgetvar [-h] [-V] INSTANCE_NAME gtm_dist|gtm_path|gtmroutines|gtmgbldir
+_ovgetvar()
+{
+    opts='-h -V'
+    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
+        if [ $allowed_nonopt_words -eq 0 ]; then
+            return
+        fi
+
+        case ${COMP_WORDS[i]} in
+            -*)
+                # 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`
+                ;;
+        esac
+    done
+
+    cur=${COMP_WORDS[COMP_CWORD]}
+
+    case $cur in
+        -*)
+            COMPREPLY=( $(compgen -W "$opts" -- $cur) )
+            ;;
+        *)
+            if [ $allowed_nonopt_words -eq 0 ]; then
+                COMPREPLY=( $(compgen -W "gtm_dist gtm_path gtmroutines gtmgbldir" -- $cur) )
+            else
+                COMPREPLY=( $(compgen -W "$(list_openvista_instances)" -- $cur) )
+            fi
+            ;;
+    esac
+}
+
+complete -F _ovgetvar ovgetvar
 
=== modified file 'scripts/etc/cron.daily/openvista'
--- scripts/etc/cron.daily/openvista	2009-12-01 22:02:20 +0000
+++ scripts/etc/cron.daily/openvista	2009-12-21 19:35:21 +0000
@@ -34,11 +34,11 @@
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
 
-root="/opt/openvista"
-user="openvista"
+# common functions
+. /usr/lib/openvista/functions
 
-for instance in `ls $root`; do
-    [ -L "$root/$instance/gtm" ] || continue
+for instance in `list_openvista_instances`; do
+    set_gtm_env "$instance"
 
     # the default is "yes" unless the etc/backups.conf file exists and it has
     # backup_daily set to "no"... in other words, an instance has to "opt out"
 
=== modified file 'scripts/etc/init.d/openvista'
--- scripts/etc/init.d/openvista	2009-08-31 19:42:33 +0000
+++ scripts/etc/init.d/openvista	2009-12-21 19:35:21 +0000
@@ -62,9 +62,6 @@
 [ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions
 . /usr/lib/openvista/functions
 
-root="/opt/openvista"
-user="openvista"
-
 run_hook()
 {
     set_gtm_env "$1" || return 1
@@ -124,10 +121,8 @@
             elif function_exists "log_daemon_msg"; then
                 log_daemon_msg "Running startup hooks for OpenVista databases"
             fi
-    
-            for instance in `ls $root`; do
-                [ -L "$root/$instance/gtm" ] || continue
 
+            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
@@ -161,9 +156,7 @@
                 log_daemon_msg "Running shutdown hooks for OpenVista databases"
             fi
 
-            for instance in `ls $root`; do
-                [ -L "$root/$instance/gtm" ] || continue
-
+            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
 
=== modified file 'scripts/etc/init.d/openvista-databases'
--- scripts/etc/init.d/openvista-databases	2009-10-22 19:48:28 +0000
+++ scripts/etc/init.d/openvista-databases	2009-12-21 19:35:21 +0000
@@ -69,8 +69,6 @@
 [ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions
 . /usr/lib/openvista/functions
 
-root="/opt/openvista"
-
 recover_backward()
 {
     set_gtm_env "$1" || return 1
@@ -158,7 +156,7 @@
 if [ `id -u` -ne 0 ]; then
     echo "openvista-databases: Must be run as root" >&2
     exit 4 # LSB: user had insufficient privilege
-fi  
+fi
 
 # check for for valid arguments (requires correct permissions to do; must happen after permission checks)
 if [ -n "$2" ]; then
@@ -177,9 +175,7 @@
                 log_daemon_msg "Performing backward journal recovery on OpenVista databases"
             fi
 
-            for instance in `ls $root`; do
-                [ -L "$root/$instance/gtm" ] || continue
-
+            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
@@ -212,10 +208,8 @@
             elif function_exists "log_daemon_msg"; then
                 log_daemon_msg "Terminating remaining mumps processes"
             fi
-    
-            for instance in `ls $root`; do
-                [ -L "$root/$instance/gtm" ] || continue
 
+            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
 
=== modified file 'scripts/usr/bin/ovbackup'
--- scripts/usr/bin/ovbackup	2009-10-31 06:23:59 +0000
+++ scripts/usr/bin/ovbackup	2009-12-21 19:35:21 +0000
@@ -80,7 +80,7 @@
 }
 
 if [ -e "$root/$instance/etc/backups.conf" ]; then
-    . "$root/$instance/etc/backups.conf" 
+    . "$root/$instance/etc/backups.conf"
 fi
 
 case $num_backups in
@@ -88,7 +88,7 @@
         # num_backups was not set, blank, 0, or not an integer; set to default of 3
         num_backups=3
         ;;
-esac 
+esac
 
 print_status "ovbackup" "Starting backup of $instance" "$skip_status"
 
@@ -98,7 +98,7 @@
 # the EXIT handler may or may not run if we're interrupted or killed depending
 # on the shell used (from what I've read, it does run on bash, but not on
 # dash); use $exit to exit with the correct status in both cases
-trap '[ -z "$exit" ] && rm -rf "$tempdir"; exit ${exit:-0}' EXIT
+trap 'rm -rf "$tempdir"; exit ${exit:-0}' EXIT
 
 trap 'print_status "ovbackup" "Caught SIGINT, exiting" "$skip_status"; rm -rf "$tempdir"; exit ${exit:=130}' INT
 trap 'print_status "ovbackup" "Caught SIGTERM, exiting" "$skip_status"; rm -rf "$tempdir"; exit ${exit:=143}' TERM
@@ -109,16 +109,31 @@
 # store the version of GT.M the current instance is using in the backup file per bug404177
 echo -e 'W $ZVERSION\nH\n' | mumps -dir 2>&1 | grep -v '^$' | grep -v '>$' > "$tempdir/gtm_version"
 
+print_status "ovbackup" "Copying configuration files" "$skip_status"
+
+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/" || 
+    exit_with_error "ovbackup" "Unable to copy env configuration file"
+fi
+
 print_status "ovbackup" "Copying routines" "$skip_status"
 
-cp -a "$root/$instance/routines" "$tempdir" || 
+# follow symlinks when copying (copy the routines pointed to by the symlink,
+# 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" || 
 exit_with_error "ovbackup" "Unable to copy routines"
 
 print_status "ovbackup" "Copying database files" "$skip_status"
 
 {
     install -m 2750 -d "$tempdir/globals" &&
-    cp -a "$root/$instance/globals/mumps.gld" "$tempdir/globals/"
+    cp -p "$root/$instance/globals/mumps.gld" "$tempdir/globals/"
 } || exit_with_error "ovbackup" "Unable to copy mumps.gld global directory file"
 
 # save this timestamp - this is the timestamp that the backup is consistent to.
@@ -165,7 +180,7 @@
 #
 # FIXME: if the routines did change, we should probably try again instead of
 # just aborting - rsync the routines, then re-run the database backup
-output=`rsync -rli --delete --dry-run "$root/$instance/routines/" "$tempdir/routines/"`
+output=`rsync -rLi --delete --dry-run "$root/$instance/routines/" "$tempdir/routines/"`
 [ -z "$output" ] || exit_with_error "ovbackup" "Routines changed during backup"
 
 # if we get here, that means that the routines haven't changed, and either the
@@ -185,7 +200,7 @@
 
 (
     umask 007
-    tar -c --remove-files `choose_bzip2` -f "$tempdir/${instance}-$timestamp.tar.bz2" -C "$tempdir" gtm_version routines globals
+    tar -c --remove-files `choose_bzip2` -f "$tempdir/${instance}-$timestamp.tar.bz2" -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
 
=== modified file 'scripts/usr/bin/ovcheckperms'
--- scripts/usr/bin/ovcheckperms	2009-12-01 23:05:48 +0000
+++ scripts/usr/bin/ovcheckperms	2009-12-21 19:35:21 +0000
@@ -79,7 +79,7 @@
 fi
 
 if [ -z "$apache_user" ]; then
-    echo "ovinstanceadd: apache user not found in /etc/passwd" >&2
+    echo "ovcheckperms: apache user not found in /etc/passwd" >&2
     exit 2
 fi
 
@@ -114,6 +114,10 @@
 check_perms "$root/$instance/routines"             "drwxrws--- root openvista"
 check_perms "$root/$instance/tmp"                  "drwxrws--- root openvista"
 
+if [ -f "$root/$instance/etc/env" ]; then
+    check_perms "$root/$instance/etc/env"          "-rw-r----- root openvista"
+fi
+
 count=`find "$root/$instance/journals" -type f -name '*.mjl*' \! \( -perm '0666' -a -group openvista \) | wc -l`
 if [ "$count" -ne 0 ]; then
     logger -p user.info -t "ovcheckperms[$$]" -- "$instance: $count journals found with incorrect permissions and/or ownership, should be -rw-rw-rw- and group openvista"
 
=== added file 'scripts/usr/bin/ovgetvar'
--- scripts/usr/bin/ovgetvar	1970-01-01 00:00:00 +0000
+++ scripts/usr/bin/ovgetvar	2009-12-21 19:35:21 +0000
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# This script prints the effective values of $gtm_dist, $gtmroutines, and
+# $gtmgbldir for the specified OpenVista instance.
+
+
+# Copyright (C) 2009 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].
+
+
+# common functions
+. /usr/lib/openvista/functions
+
+# parse arguments
+while getopts hV option; do
+    case $option in
+        h)
+            cat <<EOF
+Usage: ovgetvar INSTANCE_NAME gtm_dist|gtm_path|gtmroutines|gtmgbldir
+   or  ovgetvar -h
+   or  ovgetvar -V
+
+  -h  display this help text and exit
+  -V  display version information and exit
+EOF
+            exit 0
+            ;;
+        V)
+            cat <<EOF
+ovgetvar 0.8.6
+Copyright (C) 2009 Medsphere Systems Corporation
+
+ovgetvar 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
+            ;;
+    esac
+done
+shift `expr $OPTIND - 1`
+
+# check command syntax
+if [ -z "$1" ]; then
+    echo "ovgetvar: missing OpenVista instance name" >&2
+    echo "Try 'ovgetvar -h' for more information" >&2
+    exit 2
+fi
+
+# check permissions
+in_groups || {
+    echo "ovgetvar: 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 "ovgetvar: $instance: Not an OpenVista instance" >&2
+    exit 3
+}
+
+if [ -z "$2" ]; then
+    echo "ovgetvar: missing key" >&2
+    echo "Try 'ovgetvar -h' for more information" >&2
+    exit 2
+fi
+
+case $2 in
+    gtm_dist)
+        echo "$gtm_dist"
+        ;;
+    gtm_path)
+        if [ -L "$gtm_dist" ]; then
+            readlink "$gtm_dist"
+        else
+            echo "$gtm_dist"
+        fi
+        ;;
+    gtmroutines)
+        echo "$gtmroutines"
+        ;;
+    gtmgbldir)
+        echo "$gtmgbldir"
+        ;;
+    *)
+        echo "ovgetvar: invalid key" >&2
+        echo "Try 'ovgetvar -h' for more information" >&2
+        exit 3
+        ;;
+esac
+
 
=== modified file 'scripts/usr/bin/ovimport'
--- scripts/usr/bin/ovimport	2009-12-01 21:51:30 +0000
+++ scripts/usr/bin/ovimport	2009-12-21 19:35:21 +0000
@@ -25,16 +25,17 @@
 . /usr/lib/openvista/functions
 
 # parse arguments
-while getopts hVqfc:r:g: option; do
+while getopts hVqft:c:r:g: option; do
     case $option in
         h)
             cat <<EOF
-Usage: ovimport [-q] [-f] [-c imported|all|none] [-r ROUTINES] [-g GLOBALS] INSTANCE_NAME
+Usage: ovimport [-q] [-f] [-t target] [-c imported|all|none] [-r ROUTINES] [-g GLOBALS] INSTANCE_NAME
    or  ovimport -h
    or  ovimport -V
 
   -q  quiet; suppress status messages
   -f  force; import routines and globals even if target instance is not empty
+  -t  target; directory to import routines into (defaults to routines subdirectory of instance)
   -c  compile imported routines only (the default), all routines, or no routines
   -r  path to routine export file, archive, or directory
   -g  path to global export file or archive
@@ -59,6 +60,9 @@
         f)
             force=true
             ;;
+        t)
+            target=$OPTARG
+            ;;
         c)
             compile=$OPTARG
             ;;
@@ -96,6 +100,15 @@
     exit 3
 }
 
+: ${target:="$root/$instance/routines"}
+if [ ! -d "$target" ]; then
+    echo "ovimport: $target: No such directory" >&2
+    exit 3
+fi
+
+# make sure target ends in a slash
+target=`echo "$target" | sed 's;/$;;'`/
+
 if [ -z "$routines" ] && [ -z "$globals" ]; then
     echo "ovimport: No routines or globals specified; please use -r ROUTINES, -g GLOBALS, or both" >&2
     exit 3
@@ -103,14 +116,14 @@
 
 if [ "0x0000000000000001" != `dse dump -fileheader 2>&1 | grep -F 'Current transaction' | awk '{ print $3 }'` ]; then
     $force || {
-        echo "ovimport: $instance: OpenVista instance is not new; use -f to force"
+        echo "ovimport: $instance: OpenVista instance is not new; use -f to force" >&2
         exit 1
     }
 fi
 
 if [ -n "`find \"$root/$instance/routines/\" -type f -name '*.m' -print -quit`" ]; then
     $force || {
-        echo "ovimport: $instance: OpenVista instance is not new; use -f to force"
+        echo "ovimport: $instance: OpenVista instance is not new; use -f to force" >&2
         exit 1
     }
 fi
@@ -121,7 +134,7 @@
 # the EXIT handler may or may not run if we're interrupted or killed depending
 # on the shell used (from what I've read, it does run on bash, but not on
 # dash); use $exit to exit with the correct status in both cases
-trap '[ -z "$exit" ] && rm -rf "$tempdir"; exit ${exit:-0}' EXIT
+trap 'rm -rf "$tempdir"; exit ${exit:-0}' EXIT
 
 trap 'print_status "ovimport" "Caught SIGINT, exiting" "$skip_status"; rm -rf "$tempdir"; exit ${exit:=130}' INT
 trap 'print_status "ovimport" "Caught SIGTERM, exiting" "$skip_status"; rm -rf "$tempdir"; exit ${exit:=143}' TERM
@@ -194,40 +207,41 @@
             real_routines=`cd "$dirname"; pwd`/"$basename"
 
             # redirect output to a temporary file because we need to both log
-            # the output and inspect it to determine success
+            # the output and inspect it later to determine success
             (
                 umask 007
-                mumps -run ^%RI > "$tempdir/ovimport.ri" 2>&1 <<EOF
-N
-$real_routines
-$root/$instance/routines/
-EOF
+                echo -e 'N\n'"$real_routines"'\n'"$target"'\n' | mumps -run ^%RI 2>&1 \
+                  | tee "$tempdir/ovimport.ri" \
+                  | grep -v '^$' \
+                  | logger -p user.info -t "ovimport[$$]"
             )
 
-            cat "$tempdir/ovimport.ri" \
-              | grep -v '^$' \
-              | logger -p user.info -t "ovimport[$$]"
-
-            grep '^Restored [0-9]\{1,\} lines in [0-9]\{1,\} routines' "$tempdir/ovimport.ri" > /dev/null ||
+            grep '^Restored [0-9]\{1,\} lines in [0-9]\{1,\} routine' "$tempdir/ovimport.ri" > /dev/null ||
             exit_with_error "ovimport" "Unable to import routines"
 
-            awk '{ if ($0 ~ /^Restored [0-9]+ lines in [0-9]+ routines/) { capture = 0 } if (capture == 1 && NF != 0) { print $0 } if ($0 ~ /^Output directory/) { capture = 1 } }' "$tempdir/ovimport.ri" > "$tempdir/ovimport.compile"
+            for routine in `awk '{ if ($0 ~ /^Restored [0-9]+ lines in [0-9]+ routine/) { capture = 0 } if (capture == 1 && NF != 0) { print $0 } if ($0 ~ /^Output directory/) { capture = 1 } }' "$tempdir/ovimport.ri"`; do
+                echo "$routine" | sed 's/^%/_/' >> "$tempdir/ovimport.compile"
+            done
             ;;
         M)
             print_status "ovimport" "Copying routines" "$skip_status"
 
             (
                 umask 007
-                rsync -rl --exclude '.*/' --include '*/' --include '*.m' --exclude '*' --out-format='%n' "$real_routines/" "$root/$instance/routines/" > "$tempdir/ovimport.compile"
+                rsync -rlv --exclude '.*/' --include '*/' --include '*.m' --exclude '*' "$real_routines/" "$target" > "$tempdir/ovimport.rsync"
             ) || exit_with_error "ovimport" "Unable to import routines"
 
+            for routine in `cat "$tempdir/ovimport.rsync" | grep '\.m$'`; do
+                basename "$routine" | sed 's/\.m$//' >> "$tempdir/ovimport.compile"
+            done
+
             # the umask is not enough to guarantee that the routines are user
             # and group readable and writable; if the source routines are not
             # group writable, the destination routines won't be, either.
             #
             # if we're not running as root, we won't be able to set the
             # permissions for files we don't own, so just do our best
-            chmod -R u+rw,g+rw "$root/$instance/routines/" 2> /dev/null
+            chmod -R u+rw,g+rw "$target" 2> /dev/null
             ;;
     esac
 
@@ -235,11 +249,19 @@
         all)
             print_status "ovimport" "Compiling all routines" "$skip_status"
 
+            # FIXME: there is a possibility (if the env file doesn't match the
+            # -t target) that %RSEL will come up empty and no routines will be
+            # compiled.
+
+            # use mumps to compile all the files via auto-zlink; this will ensure that the
+            # correct version of the routine is compiled if more than one version exists
+            # in a different tier and that the object file is compiled to the right place.
             (
                 umask 007
-                cd "$root/$instance/objects" &&
-                find "$root/$instance/routines/" -type f -name '*.m' -exec mumps {} \; 2> /dev/null
-            ) || exit_with_error "ovimport" "Unable to compile routines"
+                echo -e 'D SILENT^%RSEL("*") S R="" F  S R=$O(%ZR(R)) Q:R=""  ZLINK $S($E(R)="%":"_"_$E(R,2,$L(R)),1:R)\nH\n' | mumps -dir 2>&1 \
+                  | grep -v '^$' | grep -v '>$' \
+                  | logger -p user.info -t "ovimport[$$]"
+            )
             ;;
         none)
             print_status "ovimport" "Skipping routine compilation" "$skip_status"
@@ -249,11 +271,39 @@
 
             (
                 umask 007
-                cd "$root/$instance/objects" &&
-                for routine in `cat "$tempdir/ovimport.compile" | sed 's/\.m//g'`; do
-                    mumps "../routines/$routine.m" 2> /dev/null
-                done
-            )
+                cat "$tempdir/ovimport.compile" | sort | uniq > "$tempdir/ovimport.compile.uniq"
+                echo -e 'S LIST="'"$tempdir/ovimport.compile.uniq"'"\nO LIST:(readonly) U LIST F  R ROUTINE Q:ROUTINE=""  ZLINK ROUTINE\nC LIST U $P\nH\n' | mumps -dir 2>&1 \
+                  | tee "$tempdir/ovimport.zlink" \
+                  | grep -v '^$' | grep -v '>$' \
+                  | logger -p user.info -t "ovimport[$$]"
+
+                # There are a couple of things could cause the routine compilation to fail
+                # (besides compile errors, which we should ignore).
+                #
+                # The user could have used the wrong -r argument, e.g.,
+                # /home/jon/openvistaserver-1.5.sp2-gtm instead of
+                # /home/jon/openvistaserver-1.5.sp2-gtm/routines, which would cause the
+                # routines to be imported to /opt/openvista/instance/routines/routines.
+                #
+                # The user could have specified a target directory other than
+                # /opt/openvista/instance/routines with -t but forgot to update $gtmroutines in
+                # /opt/openvista/instance/etc/env to reflect the target directory.
+                #
+                # The reverse of the previous case -- the user updated $gtmroutines in the env
+                # file but forgot to specify a target directory with -t.
+                #
+                # The env file has an invalid $gtmroutines setting.
+                grep -F '%GTM-E-ZLINKFILE' "$tempdir/ovimport.zlink" > /dev/null && exit 1 # exit subshell
+
+                exit 0
+            ) || {
+                # provide a helpful suggestion for the most common error -- "Unable to compile routines" can be a little cryptic
+                if [ "$target" = "$root/$instance/routines/" ] && [ `cat "$root/$instance/etc/env" 2> /dev/null | grep -v '^$' | grep -v '^#' | wc -l` -eq 0 ] && [ -d "$routines" ]; then
+                    suggestion=" (routines in $routines should not be in subdirectories)"
+                fi
+
+                exit_with_error "ovimport" "Unable to compile routines$suggestion"
+            }
             ;;
     esac
 
@@ -289,7 +339,7 @@
           | logger -p user.info -t "ovimport[$$]"
     }
 
-    print_status "ovimport" "Loading globals using 'mupip load'" "$skip_status"
+    print_status "ovimport" "Loading globals" "$skip_status"
 
     mupip load -format="$globals_format" "$real_globals" 2>&1 \
       | grep -v '^$' \
 
=== modified file 'scripts/usr/lib/openvista/functions'
--- scripts/usr/lib/openvista/functions	2009-10-22 19:48:28 +0000
+++ scripts/usr/lib/openvista/functions	2009-12-21 19:35:21 +0000
@@ -19,9 +19,10 @@
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
 
-# set environmental variables required by GT.M - takes a single argument, the
-# name of an OpenVista instance
-set_gtm_env()
+# check if an OpenVista instance exists.  this is normally not called directly;
+# see list_openvista_instances or set_gtm_env.  returns 0 if instance exists
+# and passes basic sanity checks, 1 otherwise
+is_openvista_instance()
 {
     # these are set for the benefit of the calling script
     root="/opt/openvista"
@@ -35,27 +36,85 @@
     # check for special characters in $instance
     case $instance in
         */*|*" "*|*"("*|*")"*)
-            return 2
+            return 1
             ;;
     esac
 
     # ensure the instance root directory exists
     if [ ! -d "$root/$instance" ]; then
-        return 3
+        return 1
     fi
 
     # ensure that the directory looks like an OpenVista instance
-    if [ ! -L "$root/$instance/gtm" ]; then
-        return 4
-    fi
-
-    gtm_dist="$root/$instance/gtm"
-    gtmroutines="$root/$instance/objects($root/$instance/routines) $root/$instance/gtm"
-    gtmgbldir="$root/$instance/globals/mumps.gld"
-    gtm_zinterrupt='I $$JOBEXAM^ZU($ZPOSITION)'
-    gtm_prompt=`echo "$instance>" | tr '[:lower:]' '[:upper:]'`
-    GTMXC_openvista="$root/$instance/gtm/openvista.xc"
-    PATH="$PATH:$root/$instance/gtm"
+    if [ ! -f "$root/$instance/etc/env" ] && [ ! -L "$root/$instance/gtm" ]; then
+        return 1
+    fi
+
+    return 0
+}
+
+# returns a list of openvista instances
+list_openvista_instances()
+{
+    is_openvista_instance "foo" # dummy call to set $root
+
+    for instance in `ls "$root" 2> /dev/null`; do
+        is_openvista_instance "$instance" || continue
+        echo $instance
+    done
+}
+
+# set environmental variables required by GT.M - takes a single argument, the
+# name of an OpenVista instance
+set_gtm_env()
+{
+    is_openvista_instance "$1" || return 1
+
+    # unset all vars to prevent contamination from the calling environment
+    gtm_dist=""
+    gtmroutines=""
+    gtmgbldir=""
+    gtm_zinterrupt=""
+    gtm_prompt=""
+    GTMXC_openvista=""
+
+    # if the env file exists, source it
+    if [ -f ${2:-"$root/$instance/etc/env"} ]; then
+        . ${2:-"$root/$instance/etc/env"}
+    fi
+
+    # set remaining variables if they have not been set already
+    #
+    # if none of these variables were dependent on each other, we could have
+    # just set them first, then sourced the env file, but since they depend on
+    # each other (e.g., gtmroutines contains gtm_dist), we need to first source
+    # the env file, then set the variables conditionally
+
+    if [ -z "$gtm_dist" ]; then
+        gtm_dist="$root/$instance/gtm"
+    fi
+
+    if [ -z "$gtmroutines" ]; then
+        gtmroutines="$root/$instance/objects($root/$instance/routines) $gtm_dist"
+    fi
+
+    if [ -z "$gtmgbldir" ]; then
+        gtmgbldir="$root/$instance/globals/mumps.gld"
+    fi
+
+    if [ -z "$gtm_zinterrupt" ]; then
+        gtm_zinterrupt='I $$JOBEXAM^ZU($ZPOSITION)'
+    fi
+
+    if [ -z "$gtm_prompt" ]; then
+        gtm_prompt=`echo "$instance>" | tr '[:lower:]' '[:upper:]'`
+    fi
+
+    if [ -z "$GTMXC_openvista" ]; then
+        GTMXC_openvista="$gtm_dist/openvista.xc"
+    fi
+
+    PATH="$PATH:$gtm_dist"
 
     export gtm_dist
     export gtmroutines
@@ -71,6 +130,7 @@
 # check user's group membership - users need to be in the gtm group to use
 # GT.M; users need to be in the openvista group to access files under
 # /opt/openvista.  If the user is root, pretend that root is in both groups.
+# returns 0 if group membership is OK, 1 if not OK
 in_groups()
 {
     if [ `id -u` -eq 0 ]; then
@@ -129,6 +189,7 @@
     fi
 }
 
+# check if a certain bash function has been defined
 function function_exists()
 {
     type "$1" 2> /dev/null | grep -q 'function'
 
=== modified file 'scripts/usr/sbin/ovinstanceadd'
--- scripts/usr/sbin/ovinstanceadd	2009-12-01 22:25:59 +0000
+++ scripts/usr/sbin/ovinstanceadd	2009-12-21 19:35:21 +0000
@@ -184,66 +184,11 @@
 set_gtm_env "$instance" || 
 exit_with_error "ovinstanceadd" "Unable to set GT.M environment"
 
-(
-    umask 027
-    cat > "$root/$instance/etc/backups.conf" <<EOF
-# configuration file for OpenVista backup utilities
-# this file is sourced by bash, so any valid bash syntax is allowed
-
-# backup_daily: Back up this instance automatically once per day
-#
-# The /etc/cron.daily/openvista script runs once per day and backs up all
-# instances with backup_daily set to "yes" one after another to avoid excessive
-# I/O from all the instances being backed up simultaneously.
-#
-# If backup_daily is set to "yes" here, the /etc/cron.daily/openvista script
-# will back up this instance.  The default is "yes".
-#
-# If you want this instance to be backed up on a custom schedule, set
-# backup_daily to "no" here and add an entry for this instance in
-# /etc/cron.d/openvista.
-#
-backup_daily=yes
-
-# num_backups: Number of backups to keep in the backups directory
-#
-# After a successful backup, if there are more than num_backups backup files in
-# the backups directory, the oldest file will be deleted until the number of
-# backup files is less than or equal to num_backups.  The default is 3.
-#
-num_backups=3
-
-EOF
-) || exit_with_error "ovinstanceadd" "Unable to write backups.conf configuration file"
-
-(
-    umask 027
-    cat > "$root/$instance/etc/journals.conf" <<EOF
-# configuration file for OpenVista journaling
-# this file is sourced by bash, so any valid bash syntax is allowed
-
-# purge_daily: Purge old journals for this instance automatically once per day
-#
-# If purge_daily is set to "yes" here, the /etc/cron.daily/openvista script
-# will call ovpurgejournals on this instance.  The default is "yes".
-#
-# If you want old journals for this instance to be removed on a custom
-# schedule, set purge_daily to "no" here and add an entry for this instance in
-# /etc/cron.d/openvista.
-#
-purge_daily=yes
-
-# num_journals: Number of old journals to keep in the journals directory
-#
-# After a successful backup, all inactive journals should be safe to delete.
-# However, disk space permitting, it is a good idea to keep a few old journal
-# files around in case there is a problem with the most recent backup.  The
-# default is 3.
-#
-num_journals=3
-
-EOF
-) || exit_with_error "ovinstanceadd" "Unable to write journals.conf configuration file"
+{
+    install -o root -g $user -m 640 /usr/share/openvista/backups.conf "$root/$instance/etc/" &&
+    install -o root -g $user -m 640 /usr/share/openvista/journals.conf "$root/$instance/etc/" &&
+    install -o root -g $user -m 640 /usr/share/openvista/env "$root/$instance/etc/"
+} || exit_with_error "ovinstanceadd" "Unable to create configuration files"
 
 # create the global directory file, mumps.gld
 (
 
=== modified file 'scripts/usr/sbin/ovrestore'
--- scripts/usr/sbin/ovrestore	2009-12-01 03:37:46 +0000
+++ scripts/usr/sbin/ovrestore	2009-12-21 19:35:21 +0000
@@ -143,7 +143,7 @@
 # the EXIT handler may or may not run if we're interrupted or killed depending
 # on the shell used (from what I've read, it does run on bash, but not on
 # dash); use $exit to exit with the correct status in both cases
-trap '[ -z "$exit" ] && rm -rf "$tempdir"; exit ${exit:-0}' EXIT
+trap 'rm -rf "$tempdir"; exit ${exit:-0}' EXIT
 
 trap 'print_status "ovrestore" "Caught SIGINT, exiting" "$skip_status"; rm -rf "$tempdir"; exit ${exit:=130}' INT
 trap 'print_status "ovrestore" "Caught SIGTERM, exiting" "$skip_status"; rm -rf "$tempdir"; exit ${exit:=143}' TERM
@@ -157,6 +157,8 @@
 tar -x `choose_bzip2` -f "$backup_file" -C "$tempdir" || 
 exit_with_error "ovrestore" "Unable to extract contents of backup file"
 
+print_status "ovrestore" "Checking contents of backup file" "$skip_status"
+
 [ -d "$tempdir/routines" ]            || exit_with_error "ovrestore" "Backup file does not contain routines"
 [ -f "$tempdir/globals/mumps.gld" ]   || exit_with_error "ovrestore" "Backup file does not contain mumps.gld global directory file"
 [ -f "$tempdir/globals/default.dat" ] || exit_with_error "ovrestore" "Backup file does not contain default.dat database file"
@@ -170,6 +172,43 @@
     logger -p user.info -t "ovrestore[$$]" Backup file does not contain GT.M version information
 fi
 
+if [ -f "$tempdir/etc/env" ]; then
+    # set environment variables from new env file
+    set_gtm_env "$instance" "$tempdir/etc/env"
+
+    # change any references to the destination routines directory to point to
+    # the routines directory in the backup
+    gtmroutines=`echo "$gtmroutines" | sed "s;$root/$instance/routines;$tempdir/routines;g"`
+    export gtmroutines
+
+    # check $gtmroutines syntax
+    zro=`echo -e 'W $ZRO\nH\n' | mumps -dir 2>&1 | grep -v '^$' | grep -v '>$'`
+    if echo "$zro" | grep -F '%GTM-E-ZROSYNTAX' > /dev/null; then
+        echo "$zro" | logger -p user.info -t "ovrestore[$$]"
+        exit_with_error "ovrestore" 'Backup file contains invalid env configuration file ($gtmroutines has invalid syntax or a path in $gtmroutines does not exist)'
+    fi
+
+    # if $gtmgbldir is the default value, check the one in the backup
+    if [ "$gtmgbldir" = "$root/$instance/globals/mumps.gld" ]; then
+        gtmgbldir="$tempdir/globals/mumps.gld"
+        export gtmgbldir
+    fi
+
+    # check $gtmgbldir
+    zg=`echo -e 'W ^GLOBAL\nH\n' | mumps -dir 2>&1 | grep -v '^$' | grep -v '>$'`
+    if echo "$zg" | grep -F '%GTM-E-ZGBLDIRACC' > /dev/null; then
+        echo "$zg" | logger -p user.info -t "ovrestore[$$]"
+        exit_with_error "ovrestore" 'Backup file contains invalid env configuration file (global directory file specified by $gtmgbldir does not exist)'
+    fi
+    if echo "$zg" | grep -F '%GTM-E-GDINVALID' > /dev/null; then
+        echo "$zg" | logger -p user.info -t "ovrestore[$$]"
+        exit_with_error "ovrestore" 'Backup file contains invalid env configuration file (global directory file specified by $gtmgbldir is in an unrecognized format)'
+    fi
+
+    # re-set environment variables from original env file
+    set_gtm_env "$instance"
+fi
+
 # at this point, we're committed... we're about to kill processes, lock the
 # instance, overwrite files, etc.
 
@@ -217,6 +256,22 @@
 # close this instance off so nobody can use it
 chmod 700 "$root/$instance"
 
+print_status "ovrestore" "Restoring configuration files" "$skip_status"
+
+install -o root -g $user -m 640 /usr/share/openvista/env "$root/$instance/etc/" ||
+exit_with_error "ovrestore" "Unable to overwrite existing env configuration file"
+
+if [ -f "$tempdir/etc/env" ]; then
+    {
+        chown root:"$user" "$tempdir/etc/env" &&
+        chmod 640 "$tempdir/etc/env" &&
+        mv -f "$tempdir/etc/env" "$root/$instance/etc/env"
+    } || exit_with_error "ovrestore" "Unable to restore env configuration file"
+fi
+
+# re-set environment variables from new env file (or lack of env file)
+set_gtm_env "$instance"
+
 print_status "ovrestore" "Restoring routines" "$skip_status"
 
 {
@@ -228,12 +283,19 @@
 
 print_status "ovrestore" "Compiling routines" "$skip_status"
 
+# remove all object files first
+find "$root/$instance/objects/" -type f -name '*.o' -exec rm -f {} \; || 
+exit_with_error "ovrestore" "Unable to remove existing object files"
+
+# use mumps to compile all the files via auto-zlink; this will ensure that the
+# correct version of the routine is compiled if more than one version exists
+# in more than one tier and that the object file is compiled to the right place.
 (
     umask 007
-    find "$root/$instance/objects/" -type f -name '*.o' -exec rm -f {} \; &&
-    cd "$root/$instance/objects" &&
-    find "$root/$instance/routines/" -type f -name '*.m' -exec mumps {} \; 2> /dev/null
-) || exit_with_error "ovrestore" "Unable to compile routines"
+    echo -e 'D SILENT^%RSEL("*") S R="" F  S R=$O(%ZR(R)) Q:R=""  ZLINK $S($E(R)="%":"_"_$E(R,2,$L(R)),1:R)\nH\n' | mumps -dir 2>&1 \
+      | grep -v '^$' | grep -v '>$' \
+      | logger -p user.info -t "ovrestore[$$]"
+)
 
 # if we're not applying journals, shut off journaling on the old database so
 # that there's a clean break, then move the journal file out of the way
@@ -248,7 +310,7 @@
       | grep -v '^$' \
       | logger -p user.info -t "ovrestore[$$]"
 
-    mv -f "$root/$instance/journals/default.mjl" "$root/$instance/journals/default.mjl_`date +%Y%j%H%M%S`_ovrestore"
+    mv -f "$root/$instance/journals/default.mjl" "$root/$instance/journals/default.mjl_`date +%Y%j%H%M%S`_ovrestore" 2> /dev/null
 }
 
 print_status "ovrestore" "Restoring database files" "$skip_status"
@@ -277,7 +339,12 @@
 SHOW -SEGMENT DEFAULT
 QUIT
 EOF
-) || exit_with_error "ovrestore" "Unable to update mumps.gld global directory file"
+) || {
+    # delete mumps.gld as a safety measure -- it could be pointing to another database
+    rm -f "$root/$instance/globals/mumps.gld"
+
+    exit_with_error "ovrestore" "Unable to update mumps.gld global directory file"
+}
 
 {
     chown root:"$user" "$tempdir/globals/default.dat" &&
@@ -286,7 +353,7 @@
 } || exit_with_error "ovrestore" "Unable to restore default.dat database file"
 
 {
-    mv -f "$root/$instance/globals/scratch.dat" "$root/$instance/globals/scratch.dat~" && 
+    mv -f "$root/$instance/globals/scratch.dat" "$root/$instance/globals/scratch.dat~" &&
     mupip create -region=SCRATCH 2>&1 \
       | grep -v '^$' \
       | logger -p user.info -t "ovrestore[$$]"
 
=== modified file 'scripts/usr/share/munin/plugins/openvista_databases_'
--- scripts/usr/share/munin/plugins/openvista_databases_	2009-10-21 17:48:07 +0000
+++ scripts/usr/share/munin/plugins/openvista_databases_	2009-12-21 19:35:21 +0000
@@ -25,14 +25,9 @@
 
 . /usr/lib/openvista/functions
 
-root="/opt/openvista"
-user="openvista"
-
 case $1 in
     autoconf)
-        for instance in `ls $root`; do
-            [ -L "$root/$instance/gtm" ] || continue
-
+        for instance in `list_openvista_instances`; do
             echo "yes"
             exit 0
         done
@@ -42,9 +37,7 @@
         ;;
 
     suggest)
-        for instance in `ls $root`; do
-            [ -L "$root/$instance/gtm" ] || continue
-
+        for instance in `list_openvista_instances`; do
             echo $instance
         done
         ;;
 
=== modified file 'scripts/usr/share/munin/plugins/openvista_locks_'
--- scripts/usr/share/munin/plugins/openvista_locks_	2009-10-21 17:48:07 +0000
+++ scripts/usr/share/munin/plugins/openvista_locks_	2009-12-21 19:35:21 +0000
@@ -26,14 +26,9 @@
 
 . /usr/lib/openvista/functions
 
-root="/opt/openvista"
-user="openvista"
-
 case $1 in
     autoconf)
-        for instance in `ls $root`; do
-            [ -L "$root/$instance/gtm" ] || continue
-
+        for instance in `list_openvista_instances`; do
             echo "yes"
             exit 0
         done
@@ -43,9 +38,7 @@
         ;;
 
     suggest)
-        for instance in `ls $root`; do
-            [ -L "$root/$instance/gtm" ] || continue
-
+        for instance in `list_openvista_instances`; do
             echo $instance
         done
         ;;
 
=== modified file 'scripts/usr/share/munin/plugins/openvista_processes_'
--- scripts/usr/share/munin/plugins/openvista_processes_	2009-10-21 17:48:07 +0000
+++ scripts/usr/share/munin/plugins/openvista_processes_	2009-12-21 19:35:21 +0000
@@ -26,14 +26,9 @@
 
 . /usr/lib/openvista/functions
 
-root="/opt/openvista"
-user="openvista"
-
 case $1 in
     autoconf)
-        for instance in `ls $root`; do
-            [ -L "$root/$instance/gtm" ] || continue
-
+        for instance in `list_openvista_instances`; do
             echo "yes"
             exit 0
         done
@@ -43,9 +38,7 @@
         ;;
 
     suggest)
-        for instance in `ls $root`; do
-            [ -L "$root/$instance/gtm" ] || continue
-
+        for instance in `list_openvista_instances`; do
             echo $instance
         done
         ;;
 
=== added directory 'scripts/usr/share/openvista'
=== added file 'scripts/usr/share/openvista/backups.conf'
--- scripts/usr/share/openvista/backups.conf	1970-01-01 00:00:00 +0000
+++ scripts/usr/share/openvista/backups.conf	2009-12-21 19:35:21 +0000
@@ -0,0 +1,26 @@
+# configuration file for OpenVista backup utilities
+# this file is sourced by bash, so any valid bash syntax is allowed
+
+# backup_daily: Back up this instance automatically once per day
+#
+# The /etc/cron.daily/openvista script runs once per day and backs up all
+# instances with backup_daily set to "yes" one after another to avoid excessive
+# I/O from all the instances being backed up simultaneously.
+#
+# If backup_daily is set to "yes" here, the /etc/cron.daily/openvista script
+# will back up this instance.  The default is "yes".
+#
+# If you want this instance to be backed up on a custom schedule, set
+# backup_daily to "no" here and add an entry for this instance in
+# /etc/cron.d/openvista.
+#
+backup_daily=yes
+
+# num_backups: Number of backups to keep in the backups directory
+#
+# After a successful backup, if there are more than num_backups backup files in
+# the backups directory, the oldest file will be deleted until the number of
+# backup files is less than or equal to num_backups.  The default is 3.
+#
+num_backups=3
+
 
=== added file 'scripts/usr/share/openvista/env'
--- scripts/usr/share/openvista/env	1970-01-01 00:00:00 +0000
+++ scripts/usr/share/openvista/env	2009-12-21 19:35:21 +0000
@@ -0,0 +1,96 @@
+# configuration file for OpenVista
+# this file is sourced by bash, so any valid bash syntax is allowed
+
+# The following environment variables are set to their defaults by set_gtm_env
+# in /usr/lib/openvista/functions if they are not set here.  Leaving this file
+# completely commented out is recommended unless you need to change one of the
+# variables.
+#
+# WARNING: Use of the $root and $instance variables is recommended over
+# hard-coding paths such as /opt/openvista/production.  Using variables allows
+# a backup of an OpenVista instance (e.g., production) to be restored into an
+# empty OpenVista instance with a different name (e.g., dev), since $root and
+# $instance are evaluated at run-time.  Hard-coding a path to
+# /opt/openvista/production will cause the dev instance to look for its
+# routines (or worse, its globals!) in /opt/openvista/production.
+
+# Uncomment and modify these lines to set an alternate installation of GT.M
+# that this OpenVista instance should use.  By default, this points to the gtm
+# symlink in the OpenVista instance's root directory.  Updating the symlink is
+# the preferred way to change the version of GT.M this instance uses, so you
+# should almost always leave this commented out.
+#
+#gtm_dist="$root/$instance/gtm"
+#export gtm_dist
+
+# Uncomment and modify these lines to override GT.M's routine search path.  By
+# default, GT.M is configured to look for routines in the routines subdirectory
+# in the OpenVista instance's root directory and store compiled objects in the
+# objects subdirectory.
+#
+# A common practice is to divide routines into "released routines" and
+# "patches".  This can be accomplished by setting $gtmroutines as follows:
+#
+# gtmroutines="$root/$instance/objects($root/$instance/routines/patches $root/$instance/routines/routines) $root/$instance/gtm"
+#
+# Any routines in the patches directory will take precedence over the same
+# routine in the routines directory.
+#
+# Another common practice is to split routines into tiers that reflect their
+# origin, e.g.,
+#
+# gtmroutines="$root/$instance/objects($root/$instance/routines/medsphere $root/$instance/routines/vendor $root/$instance/routines/foia) $root/$instance/gtm"
+#
+# In a development environment, you may want to reference routines outside of
+# the routines directory:
+#
+# gtmroutines="$root/$instance/objects(/home/developer/routines $root/$instance/routines) $root/$instance/gtm"
+#
+# WARNING: Utilities such as ovbackup will ignore routines outside of the
+# routines directory.  If you reference routines outside of the routines
+# directory, you must back them up yourself.  In the development example
+# provided above, it is assumed that /home/developer/routines is managed by an
+# external revision control system.
+#
+# NOTE: If you want to reference routines outside of the routines directory,
+# but you still want to have them backed up by ovbackup, you should create a
+# symlink inside the routines directory that points to the external directory,
+# e.g.,
+#
+# gtmroutines="$root/$instance/objects($root/$instance/routines/instance-specific $root/$instance/routines/shared) $root/$instance/gtm"
+#
+# where $root/$instance/routines/shared is a symlink to a directory of routines
+# that are shared across instances.  ovbackup and other utilities follow
+# symlinks, so the symlink targets will be backed up, allowing you to do a
+# restore with ovrestore and get a functional standalone system.
+#
+#gtmroutines="$root/$instance/objects($root/$instance/routines) $root/$instance/gtm"
+#export gtmroutines
+
+# Uncomment and modify these lines to set the path where GT.M looks for the
+# global directory file.  By default, the global directory file is named
+# mumps.gld and resides in the globals subdirectory of the OpenVista instance's
+# root directory.  Updating the default global directory file is the preferred
+# way to customize the global directory, so you should almost always leave this
+# commented out.
+#
+# WARNING: Utilities such as ovbackup will ignore alternate global directory
+# paths and back up the default mumps.gld file.  If you change the path to the
+# global directory file here, you must back it up yourself.
+#
+# WARNING: Utilities such as ovrestore and /etc/init.d/openvista-databases
+# expect two database regions, DEFAULT and SCRATCH, and two physical segments
+# (database files), globals/default.dat and globals/scratch.dat.  Your
+# alternate global directory file must have these regions and physical
+# segments.
+#
+# WARNING: Utilities such as the ZCD routine expect paths to physical segments
+# in the global directory file to be fully-evaluated, absolute, paths.  Using
+# variables or relative paths will likely cause ZCD to malfunction, preventing
+# users from switching between OpenVista instances (or worse, it may look like
+# they have switched, but they are still accessing globals in the original
+# instance!)
+#
+#gtmgbldir="$root/$instance/globals/mumps.gld"
+#export gtmgbldir
+
 
=== added file 'scripts/usr/share/openvista/journals.conf'
--- scripts/usr/share/openvista/journals.conf	1970-01-01 00:00:00 +0000
+++ scripts/usr/share/openvista/journals.conf	2009-12-21 19:35:21 +0000
@@ -0,0 +1,23 @@
+# configuration file for OpenVista journaling
+# this file is sourced by bash, so any valid bash syntax is allowed
+
+# purge_daily: Purge old journals for this instance automatically once per day
+#
+# If purge_daily is set to "yes" here, the /etc/cron.daily/openvista script
+# will call ovpurgejournals on this instance.  The default is "yes".
+#
+# If you want old journals for this instance to be removed on a custom
+# schedule, set purge_daily to "no" here and add an entry for this instance in
+# /etc/cron.d/openvista.
+#
+purge_daily=yes
+
+# num_journals: Number of old journals to keep in the journals directory
+#
+# After a successful backup, all inactive journals should be safe to delete.
+# However, disk space permitting, it is a good idea to keep a few old journal
+# files around in case there is a problem with the most recent backup.  The
+# default is 3.
+#
+num_journals=3
+