[Pkg-zenoss-commits] r110 - in /packages/zenoss/trunk/debian: control patches/00list patches/remove-ZENHOME-os.environ.dpatch patches/remove-ZENHOME-os.getent.dpatch patches/remove-ZENHOME-rest.dpatch patches/remove-ZENHOME-shellscripts.dpatch
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Fri Jun 15 15:56:17 UTC 2007
Author: bzed-guest
Date: Fri Jun 15 15:56:16 2007
New Revision: 110
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=110
Log:
lot of patches to get rid of ZENHOME in the environment.... hope it works well that way.
will be fixed by upstream for 2.1
Added:
packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch (with props)
packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch (with props)
packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch (with props)
packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch (with props)
Modified:
packages/zenoss/trunk/debian/control
packages/zenoss/trunk/debian/patches/00list
Modified: packages/zenoss/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/control?rev=110&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/control (original)
+++ packages/zenoss/trunk/debian/control Fri Jun 15 15:56:16 2007
@@ -17,11 +17,11 @@
python-mysqldb (>= 1.2.0),
python-pydot (>= 0.9.10), python-simplejson (>= 1.4),
python-rrd, python-twisted (>= 2.5.0),
- python-pynetsnmp,
+ python-pynetsnmp, python-wmi,
python-twill (>= 0.8.5), yapps2 (>= 2.1.1),
zope-common (>= 0.5.33), zope2.9, zope-advancedquery, zope-managableindex,
zope-cmfcore1.6, zope-genericsetup, zope-pas, zope-pluginregistry,
- wmi-client, zenoss-zensocket
+ python-wmi, zenoss-zensocket
Recommends: mysql-server-5.0 (>= 5.0.22), sendpage-server
Suggests: zenoss-doc, zenoss-plugins
Description: infrastucture monitoring and managment system
Modified: packages/zenoss/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/00list?rev=110&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/00list (original)
+++ packages/zenoss/trunk/debian/patches/00list Fri Jun 15 15:56:16 2007
@@ -1,2 +1,5 @@
pdis-distutils
testgen-distutils
+remove-ZENHOME-os.environ
+remove-ZENHOME-shellscripts
+remove-ZENHOME-os.getent
Added: packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch?rev=110&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch Fri Jun 15 15:56:16 2007
@@ -1,0 +1,715 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove-ZENHOME.dpatch by <bernd at bze.de>
+##
+## DP: remove the ZENHOME environment variable....
+## DP: grep -lr "os.environ\['ZENHOME'\]" * | sort -u | \
+## DP: while read i; do echo $i; sed "s,os.environ\['ZENHOME'\],pwd.getpwnam('zenoss'),g;s/import os/import os, pwd/g" $i > $i.new; mv $i.new $i; done
+
+ at DPATCH@
+diff -urNad zenoss~/Products/ZenEvents/zensendsyslog.py zenoss/Products/ZenEvents/zensendsyslog.py
+--- zenoss~/Products/ZenEvents/zensendsyslog.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenEvents/zensendsyslog.py 2007-06-15 15:04:55.000000000 +0100
+@@ -11,11 +11,11 @@
+ #
+ ###########################################################################
+ import sys
+-import os
++import os, pwd
+ import socket
+ import time
+ import Globals
+-zhome = os.environ['ZENHOME']
++zhome = pwd.getpwnam('zenoss')
+ logdir = os.path.join(zhome, "log")
+ defaultInfile = os.path.join(logdir, "origsyslog.log")
+
+diff -urNad zenoss~/Products/ZenEvents/zensyslog.py zenoss/Products/ZenEvents/zensyslog.py
+--- zenoss~/Products/ZenEvents/zensyslog.py 2007-05-11 19:36:04.000000000 +0100
++++ zenoss/Products/ZenEvents/zensyslog.py 2007-06-15 15:04:55.000000000 +0100
+@@ -21,7 +21,7 @@
+
+ import time
+ import socket
+-import os
++import os, pwd
+
+ from twisted.internet.protocol import DatagramProtocol
+ from twisted.internet import reactor
+@@ -57,7 +57,7 @@
+ self.olog = logging.getLogger("origsyslog")
+ self.olog.setLevel(20)
+ self.olog.propagate = False
+- lname = os.path.join(os.environ['ZENHOME'],"log","origsyslog.log")
++ lname = os.path.join(pwd.getpwnam('zenoss'),"log","origsyslog.log")
+ hdlr = logging.FileHandler(lname)
+ hdlr.setFormatter(logging.Formatter("%(message)s"))
+ self.olog.addHandler(hdlr)
+diff -urNad zenoss~/Products/ZenHub/zenhub.py zenoss/Products/ZenHub/zenhub.py
+--- zenoss~/Products/ZenHub/zenhub.py 2007-05-15 15:32:22.000000000 +0100
++++ zenoss/Products/ZenHub/zenhub.py 2007-06-15 15:04:55.000000000 +0100
+@@ -22,7 +22,7 @@
+ __version__ = "$Revision$"[11:-2]
+
+ from socket import getfqdn
+-import os
++import os, pwd
+
+
+ from twisted.cred import portal, checkers, error, credentials
+@@ -276,7 +276,7 @@
+ self.parser.add_option('--passwd',
+ dest='passwordfile',
+ type='string',
+- default=os.path.join(os.environ['ZENHOME'],
++ default=os.path.join(pwd.getpwnam('zenoss'),
+ 'etc','hubpasswd'))
+
+
+diff -urNad zenoss~/Products/ZenModel/DataRoot.py zenoss/Products/ZenModel/DataRoot.py
+--- zenoss~/Products/ZenModel/DataRoot.py 2007-05-30 20:26:43.000000000 +0100
++++ zenoss/Products/ZenModel/DataRoot.py 2007-06-15 15:04:55.000000000 +0100
+@@ -464,8 +464,8 @@
+ pack.organization = organization
+ pack.version = version
+ self.packs._setObject(id, pack)
+- import os
+- zp = os.path.join(os.environ['ZENHOME'], 'Products', id)
++ import os, pwd
++ zp = os.path.join(pwd.getpwnam('zenoss'), 'Products', id)
+ if not os.path.isdir(zp):
+ os.makedirs(zp)
+ for d in ['objects', 'skins', 'modeler/plugins',
+@@ -483,9 +483,9 @@
+
+ def removeZenPacks(self, ids=(), REQUEST = None):
+ """remove a ZenPack"""
+- import os
+- zp = os.path.join(os.environ['ZENHOME'], 'bin', 'zenpack')
+- import os
++ import os, pwd
++ zp = os.path.join(pwd.getpwnam('zenoss'), 'bin', 'zenpack')
++ import os, pwd
+ for pack in ids:
+ os.system('%s run --remove %s' % (zp, pack))
+ self._p_jar.sync()
+diff -urNad zenoss~/Products/ZenModel/IpNetwork.py zenoss/Products/ZenModel/IpNetwork.py
+--- zenoss~/Products/ZenModel/IpNetwork.py 2007-06-12 20:11:44.000000000 +0100
++++ zenoss/Products/ZenModel/IpNetwork.py 2007-06-15 15:04:55.000000000 +0100
+@@ -20,7 +20,7 @@
+
+ __version__ = "$Revision: 1.22 $"[11:-2]
+
+-import os
++import os, pwd
+ import sys
+ import math
+ import transaction
+@@ -435,8 +435,8 @@
+ for organizerName in organizerPaths:
+ try:
+ organizer = orgroot.getOrganizer(organizerName)
+- import os
+- zd = os.path.join(os.environ['ZENHOME'], 'bin', 'zendisc')
++ import os, pwd
++ zd = os.path.join(pwd.getpwnam('zenoss'), 'bin', 'zendisc')
+ zendiscCmd = "%s run --net=%s" % (zd, organizer.id)
+ log.info('Executing command: %s' % zendiscCmd)
+ f = Popen4(zendiscCmd)
+diff -urNad zenoss~/Products/ZenModel/PerformanceConf.py zenoss/Products/ZenModel/PerformanceConf.py
+--- zenoss~/Products/ZenModel/PerformanceConf.py 2007-06-05 14:19:35.000000000 +0100
++++ zenoss/Products/ZenModel/PerformanceConf.py 2007-06-15 15:04:55.000000000 +0100
+@@ -20,7 +20,7 @@
+
+ __version__ = "$Revision: 1.30 $"[11:-2]
+
+-import os
++import os, pwd
+ import glob
+ import zlib
+ import transaction
+@@ -63,7 +63,7 @@
+
+ from ZenDate import ZenDate
+
+-PERF_ROOT = os.path.join(os.environ['ZENHOME'], "perf")
++PERF_ROOT = os.path.join(pwd.getpwnam('zenoss'), "perf")
+
+ def performancePath(target):
+ if target.startswith("/"): target = target[1:]
+diff -urNad zenoss~/Products/ZenModel/ZenPack.py zenoss/Products/ZenModel/ZenPack.py
+--- zenoss~/Products/ZenModel/ZenPack.py 2007-04-30 04:26:32.000000000 +0100
++++ zenoss/Products/ZenModel/ZenPack.py 2007-06-15 15:04:55.000000000 +0100
+@@ -19,7 +19,7 @@
+ from Products.ZenUtils.Utils import importClass
+ import transaction
+
+-import os
++import os, pwd
+
+ __doc__="ZenPacks base definitions"
+
+@@ -165,7 +165,7 @@
+ from Products.ZenModel.ZenPackLoader import *
+
+ def zenPackPath(*parts):
+- return os.path.join(os.environ['ZENHOME'], 'Products', *parts)
++ return os.path.join(pwd.getpwnam('zenoss'), 'Products', *parts)
+
+ class ZenPackBase(ZenPack):
+
+diff -urNad zenoss~/Products/ZenModel/ZenPackLoader.py zenoss/Products/ZenModel/ZenPackLoader.py
+--- zenoss~/Products/ZenModel/ZenPackLoader.py 2007-04-30 16:54:50.000000000 +0100
++++ zenoss/Products/ZenModel/ZenPackLoader.py 2007-06-15 15:04:55.000000000 +0100
+@@ -17,7 +17,7 @@
+ from Products.ZenReports.ReportLoader import ReportLoader
+ from Products.ZenUtils.Utils import getObjByPath
+
+-import os
++import os, pwd
+ import logging
+ log = logging.getLogger('zen.ZPLoader')
+
+@@ -147,7 +147,7 @@
+ name = "Daemons"
+
+ def binPath(self, daemon):
+- return os.path.join(os.environ['ZENHOME'],
++ return os.path.join(pwd.getpwnam('zenoss'),
+ 'bin',
+ os.path.basename(daemon))
+
+diff -urNad zenoss~/Products/ZenModel/migrate/Migrate.py zenoss/Products/ZenModel/migrate/Migrate.py
+--- zenoss~/Products/ZenModel/migrate/Migrate.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/Migrate.py 2007-06-15 15:04:55.000000000 +0100
+@@ -41,8 +41,8 @@
+
+ def cleanup():
+ "recursively remove all files ending with .pyc"
+- import os
+- for p, d, fs in os.walk(os.path.join(os.environ['ZENHOME'], 'Products')):
++ import os, pwd
++ for p, d, fs in os.walk(os.path.join(pwd.getpwnam('zenoss'), 'Products')):
+ for f in fs:
+ if f.endswith('.pyc'):
+ fullPath = os.path.join(p, f)
+diff -urNad zenoss~/Products/ZenModel/migrate/command.py zenoss/Products/ZenModel/migrate/command.py
+--- zenoss~/Products/ZenModel/migrate/command.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/command.py 2007-06-15 15:04:55.000000000 +0100
+@@ -29,9 +29,9 @@
+ dmd.Devices._setProperty(name, default, **kw)
+
+ def cutover(self, dmd):
+- import os
++ import os, pwd
+ self.update(dmd, "zNagiosPath", "zCommandPath",
+- os.path.join(os.environ['ZENHOME'], 'libexec'))
++ os.path.join(pwd.getpwnam('zenoss'), 'libexec'))
+ if dmd.Devices.hasProperty("zNagiosCycleTime"):
+ dmd.Devices._delProperty("zNagiosCycleTime")
+ zem = self.dmd.ZenEventManager
+diff -urNad zenoss~/Products/ZenModel/migrate/kill_cricket.py zenoss/Products/ZenModel/migrate/kill_cricket.py
+--- zenoss~/Products/ZenModel/migrate/kill_cricket.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/kill_cricket.py 2007-06-15 15:04:55.000000000 +0100
+@@ -21,7 +21,7 @@
+
+ __version__ = "$Revision$"[11:-2]
+
+-import os
++import os, pwd
+
+ from Acquisition import aq_base
+
+@@ -93,7 +93,7 @@
+ from Products.ZenRelations.ImportRM import ImportRM
+ imp = ImportRM(noopts=True, app=dmd.getPhysicalRoot())
+ imp.options.noCommit = True
+- imp.options.infile = os.path.join(os.environ['ZENHOME'],
++ imp.options.infile = os.path.join(pwd.getpwnam('zenoss'),
+ 'Products', 'ZenModel', 'data', 'rrdconfig.update')
+ imp.loadDatabase()
+
+diff -urNad zenoss~/Products/ZenModel/migrate/menus.py zenoss/Products/ZenModel/migrate/menus.py
+--- zenoss~/Products/ZenModel/migrate/menus.py 2007-06-05 21:21:08.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/menus.py 2007-06-15 15:04:55.000000000 +0100
+@@ -19,12 +19,12 @@
+ $Id:$
+ '''
+ import Migrate
+-import os
++import os, pwd
+ from Products.ZenRelations.ImportRM import ImportRM
+ from Products.ZenModel.DeviceClass import DeviceClass
+ from Products.ZenModel.Device import Device
+
+-zenhome = os.environ['ZENHOME']
++zenhome = pwd.getpwnam('zenoss')
+ menuxml = os.path.join(zenhome, "Products/ZenModel/data/menus.xml")
+
+ ZenPackItems = dict(
+diff -urNad zenoss~/Products/ZenModel/migrate/processes.py zenoss/Products/ZenModel/migrate/processes.py
+--- zenoss~/Products/ZenModel/migrate/processes.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/processes.py 2007-06-15 15:04:55.000000000 +0100
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision$"[11:-2]
+
+ import Migrate
+-import os
++import os, pwd
+
+ class Processes(Migrate.Step):
+ version = Migrate.Version(0, 22, 0)
+@@ -41,7 +41,7 @@
+ imp = ImportRM(noopts=True, app=dmd.getPhysicalRoot())
+ imp.options.noCommit = True
+ imp.options.noindex = True
+- imp.options.infile = os.path.join(os.environ['ZENHOME'],
++ imp.options.infile = os.path.join(pwd.getpwnam('zenoss'),
+ 'Products', 'ZenModel', 'data', 'osproc.update')
+ imp.loadDatabase()
+
+diff -urNad zenoss~/Products/ZenModel/migrate/procparams.py zenoss/Products/ZenModel/migrate/procparams.py
+--- zenoss~/Products/ZenModel/migrate/procparams.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/procparams.py 2007-06-15 15:04:55.000000000 +0100
+@@ -21,10 +21,10 @@
+ version = Migrate.Version(1, 1, 0)
+
+ def cutover(self, dmd):
+- import os
+- import os.path
++ import os, pwd
++ import os, pwd.path
+ procs = os.path.join(
+- os.environ['ZENHOME'], 'Products', 'ZenEvents', 'db', 'zenprocs.sql')
++ pwd.getpwnam('zenoss'), 'Products', 'ZenEvents', 'db', 'zenprocs.sql')
+ os.system('cat %s | mysql -u%s -p%s %s' % (
+ procs,
+ dmd.ZenEventManager.username,
+diff -urNad zenoss~/Products/ZenModel/migrate/rrdmin.py zenoss/Products/ZenModel/migrate/rrdmin.py
+--- zenoss~/Products/ZenModel/migrate/rrdmin.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/rrdmin.py 2007-06-15 15:04:55.000000000 +0100
+@@ -20,7 +20,7 @@
+
+ __version__ = "$Revision$"[11:-2]
+
+-import os
++import os, pwd
+ import re
+
+ try:
+@@ -36,7 +36,7 @@
+ version = Migrate.Version(0, 22, 0)
+
+ def setMin(self, value):
+- for d,_, files in os.walk(os.path.join(os.environ['ZENHOME'], "perf")):
++ for d,_, files in os.walk(os.path.join(pwd.getpwnam('zenoss'), "perf")):
+ for f in [f for f in files if rrd.match(f)]:
+ rrdtool.tune(os.path.join(d, f), '-i', 'ds0:' + value)
+
+diff -urNad zenoss~/Products/ZenModel/migrate/smtpsnpp.py zenoss/Products/ZenModel/migrate/smtpsnpp.py
+--- zenoss~/Products/ZenModel/migrate/smtpsnpp.py 2007-06-05 14:19:35.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/smtpsnpp.py 2007-06-15 15:04:55.000000000 +0100
+@@ -17,7 +17,7 @@
+
+ '''
+ import Migrate
+-import os.path
++import os, pwd.path
+
+ def parseconfig(options):
+ """parse a config file which has key value pairs delimited by white space"""
+@@ -46,7 +46,7 @@
+ def cutover(self, dmd):
+ options = OptionsBucket()
+ options.configfile = os.path.join(
+- os.environ['ZENHOME'], 'etc', 'zenactions.conf')
++ pwd.getpwnam('zenoss'), 'etc', 'zenactions.conf')
+ parseconfig(options)
+ if not hasattr(dmd, 'smtpHost'):
+ dmd.smtpHost = getattr(options, 'smtphost', '') or 'localhost'
+diff -urNad zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py
+--- zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-06-05 14:19:35.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-06-15 15:04:55.000000000 +0100
+@@ -11,8 +11,8 @@
+ #
+ ###########################################################################
+ #!/usr/bin/python
+-import os
+-for d, dirs, filenames in os.walk(os.path.join(os.environ['ZENHOME'], 'perf')):
++import os, pwd
++for d, dirs, filenames in os.walk(os.path.join(pwd.getpwnam('zenoss'), 'perf')):
+ for f in filenames:
+ fullpath = os.path.join(d, f)
+ if f.find('_') >= 0: continue
+diff -urNad zenoss~/Products/ZenModel/migrate/twopointohobjects.py zenoss/Products/ZenModel/migrate/twopointohobjects.py
+--- zenoss~/Products/ZenModel/migrate/twopointohobjects.py 2007-06-06 23:42:16.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/twopointohobjects.py 2007-06-15 15:04:55.000000000 +0100
+@@ -25,8 +25,8 @@
+ dmd.Devices.manage_addRRDTemplate('softwareLoopback')
+
+ def _zCommandPath(self, dmd):
+- import os
+- dmd.Devices.zCommandPath = os.path.join(os.environ['ZENHOME'], 'libexec')
++ import os, pwd
++ dmd.Devices.zCommandPath = os.path.join(pwd.getpwnam('zenoss'), 'libexec')
+
+ def _cleanupClass(self, dmd):
+ d = [d.id for d in dmd.Devices.Server.Linux.getSubDevices()]
+diff -urNad zenoss~/Products/ZenModel/zenbuild.py zenoss/Products/ZenModel/zenbuild.py
+--- zenoss~/Products/ZenModel/zenbuild.py 2007-05-21 15:06:32.000000000 +0100
++++ zenoss/Products/ZenModel/zenbuild.py 2007-06-15 15:04:55.000000000 +0100
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision: 1.11 $"[11:-2]
+
+ import sys
+-import os
++import os, pwd
+
+ import Globals
+ import transaction
+@@ -29,7 +29,7 @@
+ print "ERROR: ZENHOME envrionment variable not set"
+ sys.exit(1)
+
+-zenhome = os.environ['ZENHOME']
++zenhome = pwd.getpwnam('zenoss')
+
+ import Globals
+
+@@ -45,7 +45,7 @@
+ if not os.environ.has_key("ZENHOME"):
+ print "ERROR: ZENHOME not set."
+ sys.exit(1)
+- zopeconf = os.path.join(os.environ['ZENHOME'], "etc/zope.conf")
++ zopeconf = os.path.join(pwd.getpwnam('zenoss'), "etc/zope.conf")
+ import Zope2
+ Zope2.configure(zopeconf)
+ self.app = Zope2.app()
+diff -urNad zenoss~/Products/ZenModel/zenmib.py zenoss/Products/ZenModel/zenmib.py
+--- zenoss~/Products/ZenModel/zenmib.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenModel/zenmib.py 2007-06-15 15:04:55.000000000 +0100
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+ import sys
+-import os
++import os, pwd
+ import glob
+ from sets import Set
+ import pprint
+@@ -137,7 +137,7 @@
+
+ def load(self):
+
+- smimibdir = os.path.join(os.environ['ZENHOME'], 'share/mibs')
++ smimibdir = os.path.join(pwd.getpwnam('zenoss'), 'share/mibs')
+ ietf, iana, irtf, tubs, site = \
+ map(lambda x: os.path.join(smimibdir, x),
+ 'ietf iana irtf tubs site'.split())
+diff -urNad zenoss~/Products/ZenRRD/RenderServer.py zenoss/Products/ZenRRD/RenderServer.py
+--- zenoss~/Products/ZenRRD/RenderServer.py 2007-05-18 14:52:58.000000000 +0100
++++ zenoss/Products/ZenRRD/RenderServer.py 2007-06-15 15:04:55.000000000 +0100
+@@ -19,7 +19,7 @@
+
+ __version__ = "$Revision: 1.14 $"[11:-2]
+
+-import os
++import os, pwd
+ import time
+ import logging
+ import urllib
+@@ -210,7 +210,7 @@
+ "render a custom graph and return it"
+ try:
+ dmd = self.dmd
+- m = os.path.join(os.environ['ZENHOME'],
++ m = os.path.join(pwd.getpwnam('zenoss'),
+ 'Products/ZenRRD/plugins/%s.py' % name)
+ exec open(m)
+ return graph
+diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateCpu.py zenoss/Products/ZenRRD/plugins/aggregateCpu.py
+--- zenoss~/Products/ZenRRD/plugins/aggregateCpu.py 2007-06-05 14:19:35.000000000 +0100
++++ zenoss/Products/ZenRRD/plugins/aggregateCpu.py 2007-06-15 15:04:55.000000000 +0100
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+
+-import os
++import os, pwd
+ import time
+ import rrdtool
+ import random
+@@ -39,7 +39,7 @@
+ fname = "%s/graph-%s.png" % (TMPDIR,name)
+ cmd = [fname,] + basicArgs(env) + args
+
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
+ rpn = env['rpn']
+ rfiles = []
+ devicePat = re.compile('.*(' + devices + ').*')
+diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py
+--- zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-06-15 15:04:55.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import os, pwd
+ import time
+ import re
+ import rrdtool
+@@ -45,7 +45,7 @@
+ '--vertical-label=%(label)s' % env] + args
+ ifiles = []
+ ofiles = []
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
+ rpn = env['rpn']
+ devicePat = re.compile('.*(' + env.get('devices', '') + ').*')
+ for d, _, fs in os.walk(perf):
+diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateIdle.py zenoss/Products/ZenRRD/plugins/aggregateIdle.py
+--- zenoss~/Products/ZenRRD/plugins/aggregateIdle.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenRRD/plugins/aggregateIdle.py 2007-06-15 15:04:55.000000000 +0100
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+
+-import os
++import os, pwd
+ import time
+ import glob
+ import rrdtool
+@@ -46,7 +46,7 @@
+ '--lower-limit=0',
+ '--vertical-label=%(label)s' % env] + args
+
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
+ rpn = env['rpn']
+ rfiles = []
+ for d, _, fs in os.walk(perf):
+diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py zenoss/Products/ZenRRD/plugins/aggregateNetwork.py
+--- zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenRRD/plugins/aggregateNetwork.py 2007-06-15 15:04:55.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import os, pwd
+ import time
+ import glob
+ import rrdtool
+@@ -38,7 +38,7 @@
+ '--vertical-label=%(label)s' % env]
+ ifiles = []
+ ofiles = []
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
+ rpn = env['rpn']
+ for d, _, fs in os.walk(perf):
+ for f in fs:
+diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateSwap.py zenoss/Products/ZenRRD/plugins/aggregateSwap.py
+--- zenoss~/Products/ZenRRD/plugins/aggregateSwap.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenRRD/plugins/aggregateSwap.py 2007-06-15 15:04:55.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import os, pwd
+ import time
+ import re
+ import rrdtool
+@@ -44,7 +44,7 @@
+ '--vertical-label=%(label)s' % env] + args
+ ifiles = []
+ ofiles = []
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
+ rpn = env['rpn']
+ devicePat = re.compile('.*(' + env.get('devices', '') + ').*')
+ for d, _, fs in os.walk(perf):
+diff -urNad zenoss~/Products/ZenRRD/plugins/areaLine.py zenoss/Products/ZenRRD/plugins/areaLine.py
+--- zenoss~/Products/ZenRRD/plugins/areaLine.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenRRD/plugins/areaLine.py 2007-06-15 15:04:55.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import os, pwd
+ import time
+ import glob
+ import rrdtool
+@@ -42,7 +42,7 @@
+ fname = "%s/graph-%s.png" % (TMPDIR,name)
+ afiles = []
+ lfiles = []
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
+ devPat = re.compile('.*(%s).*' % env.get('devices',''))
+ for d, _, fs in os.walk(perf):
+ if not devPat.match(d): continue
+diff -urNad zenoss~/Products/ZenRRD/plugins/plugin.py zenoss/Products/ZenRRD/plugins/plugin.py
+--- zenoss~/Products/ZenRRD/plugins/plugin.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenRRD/plugins/plugin.py 2007-06-15 15:04:55.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import os, pwd
+ import time
+
+ TMPDIR='/tmp/renderserver'
+@@ -50,7 +50,7 @@
+ except OSError:
+ return None
+
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
+
+ title = 'Plugin Title'
+ label = ''
+diff -urNad zenoss~/Products/ZenRRD/plugins/upperLower.py zenoss/Products/ZenRRD/plugins/upperLower.py
+--- zenoss~/Products/ZenRRD/plugins/upperLower.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenRRD/plugins/upperLower.py 2007-06-15 15:04:55.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import os, pwd
+ import time
+ import glob
+ import rrdtool
+@@ -42,7 +42,7 @@
+ fname = "%s/graph-%s.png" % (TMPDIR,name)
+ lfiles = []
+ ufiles = []
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
+ devPat = re.compile('.*(%s).*' % env.get('devices', ''))
+ for d, _, fs in os.walk(perf):
+ if not devPat.match(d): continue
+diff -urNad zenoss~/Products/ZenRelations/schemadoc.py zenoss/Products/ZenRelations/schemadoc.py
+--- zenoss~/Products/ZenRelations/schemadoc.py 2007-04-25 20:01:19.000000000 +0100
++++ zenoss/Products/ZenRelations/schemadoc.py 2007-06-15 15:04:55.000000000 +0100
+@@ -142,7 +142,7 @@
+ baseModule = None
+ if len(sys.argv) > 1:
+ baseModule = sys.argv[1]
+-docdir = os.path.join(os.environ['ZENHOME'],"zendocs/schema")
++docdir = os.path.join(pwd.getpwnam('zenoss'),"zendocs/schema")
+ classList = importClasses(basemodule=baseModule,
+ skipnames=("ZentinelPortal", "ZDeviceLoader"))
+ htmlGen = HtmlGenerator(baseModule, classList, docdir)
+diff -urNad zenoss~/Products/ZenReports/ReportServer.py zenoss/Products/ZenReports/ReportServer.py
+--- zenoss~/Products/ZenReports/ReportServer.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenReports/ReportServer.py 2007-06-15 15:04:55.000000000 +0100
+@@ -25,7 +25,7 @@
+ from Products.ZenModel.ZenModelRM import ZenModelRM
+ from Products.ZenUtils.Utils import importClass
+
+-import os
++import os, pwd
+ import sys
+
+ class ReportServer(ZenModelRM):
+@@ -37,7 +37,7 @@
+ "Run a plugin to generate the report object"
+ dmd = self.dmd
+ args = dict(zip(REQUEST.keys(), REQUEST.values()))
+- m = os.path.join(os.environ['ZENHOME'],
++ m = os.path.join(pwd.getpwnam('zenoss'),
+ 'Products/ZenReports/plugins')
+ directories = [
+ p.path('reports', 'plugins') for p in self.packs()
+diff -urNad zenoss~/Products/ZenUtils/ConfDaemon.py zenoss/Products/ZenUtils/ConfDaemon.py
+--- zenoss~/Products/ZenUtils/ConfDaemon.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenUtils/ConfDaemon.py 2007-06-15 15:04:55.000000000 +0100
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision: 1.9 $"[11:-2]
+
+ import signal
+-import os
++import os, pwd
+ import sys
+ import socket
+ import time
+@@ -60,7 +60,7 @@
+ print >>sys.stderr, ("fork #2 failed: %d (%s)" %
+ (e.errno, e.strerror))
+ myname = sys.argv[0].split(os.sep)[-1] + ".pid"
+- zenhome = os.path.join(os.environ['ZENHOME'], 'var')
++ zenhome = os.path.join(pwd.getpwnam('zenoss'), 'var')
+ pidfile = os.path.join(zenhome, myname)
+ if os.path.exists(zenhome):
+ file = open(pidfile, 'w')
+diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
+--- zenoss~/Products/ZenUtils/Graphics.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenUtils/Graphics.py 2007-06-15 15:04:55.000000000 +0100
+@@ -58,8 +58,8 @@
+
+
+ def setGraphFromEdges(self, edges, directed=True):
+- import os, os.path
+- config = os.path.join(os.environ['ZENHOME'], 'lib/graphviz/config')
++ import os, pwd, os.path
++ config = os.path.join(pwd.getpwnam('zenoss'), 'lib/graphviz/config')
+ if not os.path.exists(config) or os.path.getsize(config) == 0:
+ os.system("$ZENHOME/bin/dot -c")
+ import pydot
+diff -urNad zenoss~/Products/ZenUtils/ZenDaemon.py zenoss/Products/ZenUtils/ZenDaemon.py
+--- zenoss~/Products/ZenUtils/ZenDaemon.py 2007-06-05 14:19:35.000000000 +0100
++++ zenoss/Products/ZenUtils/ZenDaemon.py 2007-06-15 15:04:55.000000000 +0100
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision: 1.9 $"[11:-2]
+
+ import sys
+-import os
++import os, pwd
+ import pwd
+ import signal
+ import logging
+@@ -50,7 +50,7 @@
+ def __init__(self, noopts=0, keeproot=False):
+ CmdBase.__init__(self, noopts)
+ self.keeproot=keeproot
+- self.zenhome = os.path.join(os.environ['ZENHOME'])
++ self.zenhome = os.path.join(pwd.getpwnam('zenoss'))
+ self.zenvar = os.path.join(self.zenhome, "var")
+ if not noopts:
+ signal.signal(signal.SIGINT, self.sigTerm)
+@@ -75,7 +75,7 @@
+ self.options.logpath)
+ logdir = self.options.logpath
+ else:
+- logdir = os.path.join(os.environ['ZENHOME'], "log")
++ logdir = os.path.join(pwd.getpwnam('zenoss'), "log")
+ logfile = os.path.join(logdir, mname.lower()+".log")
+ h = logging.FileHandler(logfile)
+ h.setFormatter(logging.Formatter(
+diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
+--- zenoss~/Products/ZenUtils/zenpack.py 2007-05-31 15:07:08.000000000 +0100
++++ zenoss/Products/ZenUtils/zenpack.py 2007-06-15 15:04:55.000000000 +0100
+@@ -18,7 +18,7 @@
+ from Products.ZenUtils.Utils import cleanupSkins
+ import transaction
+
+-import os, sys
++import os, pwd, sys
+
+ class ZenPackCmd(ZenScriptBase):
+ "Manage ZenPacks"
+@@ -116,7 +116,7 @@
+ self.stop("%s already exists" % root)
+ self.log.debug('Extracting ZenPack "%s"' % packName)
+ for name in zf.namelist():
+- fullname = os.path.join(os.environ['ZENHOME'], 'Products', name)
++ fullname = os.path.join(pwd.getpwnam('zenoss'), 'Products', name)
+ self.log.debug('Extracting %s' % name)
+ if name.find('/.svn') > -1: continue
+ if name.endswith('~'): continue
Propchange: packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch?rev=110&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch Fri Jun 15 15:56:16 2007
@@ -1,0 +1,389 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove-ZENHOME-rest.dpatch by <bernd at bzed.de>
+##
+## DP more zenhome stuff removed
+## DP: grep -lr "os.getenv('ZENHOME')" * | sort -u | while read i; do echo $i; sed "s,os.getenv('ZENHOME'),pwd.getpwnam('zenoss'),g;s/import os/import os, pwd/g" $i > $i.new; mv $i.new $i; done
+
+ at DPATCH@
+diff -urNad zenoss~/Products/ZenModel/DeviceClass.py zenoss/Products/ZenModel/DeviceClass.py
+--- zenoss~/Products/ZenModel/DeviceClass.py 2007-06-12 20:13:26.000000000 +0100
++++ zenoss/Products/ZenModel/DeviceClass.py 2007-06-15 16:47:20.000000000 +0100
+@@ -17,7 +17,7 @@
+
+ __version__ = "$Revision: 1.76 $"[11:-2]
+
+-import os
++import os, pwd
+ import types
+ import time
+ import urllib
+@@ -423,7 +423,7 @@
+ """Get a list of XML filenames and basenames from the ZENHOME/import
+ directory.
+ """
+- path = os.path.join(os.getenv('ZENHOME'), 'import')
++ path = os.path.join(pwd.getpwnam('zenoss'), 'import')
+ filedata = []
+ for filename in glob(path+os.path.sep+'*.xml'):
+ basename = os.path.basename(filename)
+diff -urNad zenoss~/Products/ZenModel/ZenModelRM.py zenoss/Products/ZenModel/ZenModelRM.py
+--- zenoss~/Products/ZenModel/ZenModelRM.py 2007-05-03 16:19:41.000000000 +0100
++++ zenoss/Products/ZenModel/ZenModelRM.py 2007-06-15 16:47:20.000000000 +0100
+@@ -17,7 +17,7 @@
+
+ __version__ = "$Revision: 1.50 $"[11:-2]
+
+-import os
++import os, pwd
+ import time
+
+ from DateTime import DateTime
+@@ -107,7 +107,7 @@
+ dest = 'filesystem'
+ if REQUEST:
+ dest = REQUEST.form.get('dest')
+- zenhome = os.getenv('ZENHOME')
++ zenhome = pwd.getpwnam('zenoss')
+ expDir = os.path.join(zenhome, 'export')
+ fileBase = '%s_%s.xml' % (context.getNodeName(), context.id)
+ if dest == 'filesystem':
+diff -urNad zenoss~/Products/ZenModel/ZenPack.py zenoss/Products/ZenModel/ZenPack.py
+--- zenoss~/Products/ZenModel/ZenPack.py 2007-06-15 16:23:20.000000000 +0100
++++ zenoss/Products/ZenModel/ZenPack.py 2007-06-15 16:47:21.000000000 +0100
+@@ -19,7 +19,7 @@
+ from Products.ZenUtils.Utils import importClass
+ import transaction
+
+-import os, pwd
++import os, pwd, pwd
+
+ __doc__="ZenPacks base definitions"
+
+@@ -128,7 +128,7 @@
+ ''' % (self.author, self.organization, self.version))
+
+ fp.close()
+- zenhome = os.getenv('ZENHOME')
++ zenhome = pwd.getpwnam('zenoss')
+ path = os.path.join(zenhome, 'export')
+ if not os.path.isdir(path):
+ os.makeDirs(path)
+diff -urNad zenoss~/Products/ZenModel/ZenossInfo.py zenoss/Products/ZenModel/ZenossInfo.py
+--- zenoss~/Products/ZenModel/ZenossInfo.py 2007-05-18 21:25:16.000000000 +0100
++++ zenoss/Products/ZenModel/ZenossInfo.py 2007-06-15 16:47:21.000000000 +0100
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+
+-import os
++import os, pwd
+ import re
+ import time
+ import logging
+@@ -179,7 +179,7 @@
+ v = Version(*getRRDToolVersion())
+ v.full()
+ """
+- cmd = os.path.join(os.getenv('ZENHOME'), 'bin', 'rrdtool')
++ cmd = os.path.join(pwd.getpwnam('zenoss'), 'bin', 'rrdtool')
+ if not os.path.exists(cmd):
+ cmd = 'rrdtool'
+ fd = os.popen(cmd)
+@@ -244,7 +244,7 @@
+
+ def getZenossRevision(self):
+ try:
+- os.chdir(os.path.join(os.getenv('ZENHOME'), 'Products'))
++ os.chdir(os.path.join(pwd.getpwnam('zenoss'), 'Products'))
+ fd = os.popen("svn info 2>/dev/null | grep Revision | awk '{print $2}'")
+ return fd.readlines()[0].strip()
+ except:
+@@ -346,7 +346,7 @@
+ name = 'ZEO'
+ else:
+ name = "%s.py" % name
+- pidFile = os.path.join(os.getenv('ZENHOME'), 'var', '%s.pid' % name)
++ pidFile = os.path.join(pwd.getpwnam('zenoss'), 'var', '%s.pid' % name)
+ if os.path.exists(pidFile):
+ pid = open(pidFile).read()
+ try:
+@@ -363,7 +363,7 @@
+ """
+ Get the list of supported Zenoss daemons.
+ """
+- masterScript = os.path.join(os.getenv('ZENHOME'), 'bin', 'zenoss')
++ masterScript = os.path.join(pwd.getpwnam('zenoss'), 'bin', 'zenoss')
+ daemons = []
+ for line in os.popen("%s list" % masterScript).readlines():
+ daemons.append(line.strip())
+@@ -402,7 +402,7 @@
+ daemon = 'event'
+ elif daemon == 'zeoctl':
+ daemon = 'zeo'
+- filename = os.path.join(os.getenv('ZENHOME'), 'log', "%s.log" % daemon)
++ filename = os.path.join(pwd.getpwnam('zenoss'), 'log', "%s.log" % daemon)
+ # if there is no data read, we don't want to return something that can
+ # be interptreted as "None", so we make the default a single white
+ # space
+@@ -419,7 +419,7 @@
+ daemon = 'zope'
+ elif daemon == 'zeoctl':
+ daemon = 'zeo'
+- return os.path.join(os.getenv('ZENHOME'), 'etc',
++ return os.path.join(pwd.getpwnam('zenoss'), 'etc',
+ "%s.conf" % daemon)
+
+ def _readConfigFile(self, filename):
+@@ -468,7 +468,7 @@
+ action = (REQUEST.form.get('action') or '').lower()
+ if action not in legalValues:
+ return self.callZenScreen(REQUEST)
+- daemon = os.path.join(os.getenv('ZENHOME'), 'bin',
++ daemon = os.path.join(pwd.getpwnam('zenoss'), 'bin',
+ REQUEST.form.get('daemon'))
+ # we actually want to block here, so that the page doesn't refresh
+ # until the action has completed
+diff -urNad zenoss~/Products/ZenModel/migrate/about_zenoss.py zenoss/Products/ZenModel/migrate/about_zenoss.py
+--- zenoss~/Products/ZenModel/migrate/about_zenoss.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/about_zenoss.py 2007-06-15 16:47:20.000000000 +0100
+@@ -20,13 +20,13 @@
+
+ __version__ = "$Revision$"[11:-2]
+
+-import os
++import os, pwd
+
+ from Products.ZenModel.ZenossInfo import manage_addZenossInfo
+
+ import Migrate
+
+-zenhome = os.getenv('ZENHOME')
++zenhome = pwd.getpwnam('zenoss')
+
+ class AboutZenoss(Migrate.Step):
+ version = Migrate.Version(0, 23, 0)
+diff -urNad zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py
+--- zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-06-05 14:19:35.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-06-15 16:47:20.000000000 +0100
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision$"[11:-2]
+
+ import Migrate
+-import os
++import os, pwd
+
+ class BetterStandardErrorMessage(Migrate.Step):
+ version = Migrate.Version(1, 1, 0)
+@@ -31,7 +31,7 @@
+ app = dmd.getPhysicalRoot()
+ if app.hasObject('standard_error_message'):
+ app._delObject('standard_error_message')
+- zenhome = os.getenv('ZENHOME')
++ zenhome = pwd.getpwnam('zenoss')
+ file = open('%s/Products/ZenModel/dtml/standard_error_message.dtml' %
+ zenhome)
+ try:
+diff -urNad zenoss~/Products/ZenModel/migrate/datapoints.py zenoss/Products/ZenModel/migrate/datapoints.py
+--- zenoss~/Products/ZenModel/migrate/datapoints.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/datapoints.py 2007-06-15 16:47:20.000000000 +0100
+@@ -19,7 +19,7 @@
+
+ __version__ = "$Revision$"[11:-2]
+
+-import os
++import os, pwd
+ import sys
+ import Migrate
+
+@@ -71,7 +71,7 @@
+ s.datapoints._setObject(p.id, p)
+
+ def cutoverTemplate(self, t, rrdPath):
+- oldbase = os.path.join(os.getenv('ZENHOME'), 'perf')
++ oldbase = os.path.join(pwd.getpwnam('zenoss'), 'perf')
+ for s in t.datasources()[:]:
+ self.cutoverDataSource(s)
+ oldname = os.path.join(oldbase + rrdPath, s.id)
+diff -urNad zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py
+--- zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-06-05 14:19:35.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-06-15 16:47:20.000000000 +0100
+@@ -11,7 +11,7 @@
+ '''
+
+ import Migrate
+-import os
++import os, pwd
+
+ class EvenBetterStandardErrorMessage(Migrate.Step):
+ version = Migrate.Version(2, 0, 0)
+@@ -22,7 +22,7 @@
+ app = dmd.getPhysicalRoot()
+ if app.hasObject('standard_error_message'):
+ app._delObject('standard_error_message')
+- zenhome = os.getenv('ZENHOME')
++ zenhome = pwd.getpwnam('zenoss')
+ file = open('%s/Products/ZenModel/dtml/standard_error_message.dtml' %
+ zenhome)
+ try:
+diff -urNad zenoss~/Products/ZenModel/migrate/hoist_perf_data.py zenoss/Products/ZenModel/migrate/hoist_perf_data.py
+--- zenoss~/Products/ZenModel/migrate/hoist_perf_data.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py 2007-06-15 16:47:20.000000000 +0100
+@@ -23,7 +23,7 @@
+
+ import Migrate
+
+-import os
++import os, pwd
+
+ class HoistPerfData(Migrate.Step):
+ version = Migrate.Version(0, 21, 0)
+@@ -36,7 +36,7 @@
+ import glob
+ names = dmd.getDmdRoot('Devices').getOrganizerNames(True)
+
+- oldbase = os.path.join(os.getenv('ZENHOME'), 'perf', 'Devices')
++ oldbase = os.path.join(pwd.getpwnam('zenoss'), 'perf', 'Devices')
+ names.sort()
+ names.reverse()
+ for name in names:
+diff -urNad zenoss~/Products/ZenModel/migrate/import_export_filesystem.py zenoss/Products/ZenModel/migrate/import_export_filesystem.py
+--- zenoss~/Products/ZenModel/migrate/import_export_filesystem.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py 2007-06-15 16:47:20.000000000 +0100
+@@ -20,11 +20,11 @@
+
+ __version__ = "$Revision$"[11:-2]
+
+-import os
++import os, pwd
+
+ import Migrate
+
+-zenhome = os.getenv('ZENHOME')
++zenhome = pwd.getpwnam('zenoss')
+
+ class ImportExportFilesystem(Migrate.Step):
+ version = Migrate.Version(0, 23, 0)
+diff -urNad zenoss~/Products/ZenModel/migrate/standarderrormessage.py zenoss/Products/ZenModel/migrate/standarderrormessage.py
+--- zenoss~/Products/ZenModel/migrate/standarderrormessage.py 2007-06-05 14:19:35.000000000 +0100
++++ zenoss/Products/ZenModel/migrate/standarderrormessage.py 2007-06-15 16:47:20.000000000 +0100
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision$"[11:-2]
+
+ import Migrate
+-import os
++import os, pwd
+
+ class StandardErrorMessage(Migrate.Step):
+ version = Migrate.Version(0, 23, 0)
+@@ -32,7 +32,7 @@
+ app = dmd.getPhysicalRoot()
+ if app.hasObject('standard_error_message'):
+ app._delObject('standard_error_message')
+- zenhome = os.getenv('ZENHOME')
++ zenhome = pwd.getpwnam('zenoss')
+ file = open('%s/Products/ZenModel/dtml/standard_error_message.dtml' %
+ zenhome)
+ try:
+diff -urNad zenoss~/Products/ZenModel/zendmd.py zenoss/Products/ZenModel/zendmd.py
+--- zenoss~/Products/ZenModel/zendmd.py 2007-05-07 20:10:54.000000000 +0100
++++ zenoss/Products/ZenModel/zendmd.py 2007-06-15 16:47:20.000000000 +0100
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+
+-import os
++import os, pwd
+ import atexit
+ import socket
+ try:
+@@ -34,7 +34,7 @@
+ # Itamar Shtull-Trauring of Twisted Python. A current copy of his
+ # original code is available at http://pastebin.adytum.us/40 though
+ # the original has proven difficult to locate.
+- zenHome = os.getenv('ZENHOME')
++ zenHome = pwd.getpwnam('zenoss')
+ historyPath = os.path.join(zenHome, '.pyhistory')
+ def save_history(historyPath=historyPath):
+ import readline
+diff -urNad zenoss~/Products/ZenUtils/ZCmdBase.py zenoss/Products/ZenUtils/ZCmdBase.py
+--- zenoss~/Products/ZenUtils/ZCmdBase.py 2007-05-15 16:26:26.000000000 +0100
++++ zenoss/Products/ZenUtils/ZCmdBase.py 2007-06-15 16:47:21.000000000 +0100
+@@ -26,8 +26,8 @@
+ from Exceptions import ZentinelException
+ from ZenDaemon import ZenDaemon
+
+-import os
+-defaultCacheDir = os.getenv('ZENHOME')
++import os, pwd
++defaultCacheDir = pwd.getpwnam('zenoss')
+ if defaultCacheDir is not None:
+ defaultCacheDir = os.path.join(defaultCacheDir, 'var')
+
+diff -urNad zenoss~/Products/ZenUtils/ZenBackupBase.py zenoss/Products/ZenUtils/ZenBackupBase.py
+--- zenoss~/Products/ZenUtils/ZenBackupBase.py 2007-06-15 16:23:20.000000000 +0100
++++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-06-15 16:47:21.000000000 +0100
+@@ -18,8 +18,8 @@
+ Common code for zenbackup.py and zenrestore.py
+ '''
+
+-import os
+-import os.path
++import os, pwd
++import os, pwd.path
+ import tempfile
+ from CmdBase import CmdBase
+
+@@ -40,7 +40,7 @@
+
+ def __init__(self, noopts=0):
+ CmdBase.__init__(self, noopts)
+- self.zenhome = os.getenv('ZENHOME')
++ self.zenhome = pwd.getpwnam('zenoss')
+ self.zopehome = os.getenv('ZOPEHOME')
+
+
+diff -urNad zenoss~/Products/ZenUtils/ZenScriptBase.py zenoss/Products/ZenUtils/ZenScriptBase.py
+--- zenoss~/Products/ZenUtils/ZenScriptBase.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenUtils/ZenScriptBase.py 2007-06-15 16:47:21.000000000 +0100
+@@ -22,8 +22,8 @@
+
+ from Exceptions import ZentinelException
+
+-import os
+-defaultCacheDir = os.getenv('ZENHOME')
++import os, pwd
++defaultCacheDir = pwd.getpwnam('zenoss')
+ if defaultCacheDir is not None:
+ defaultCacheDir = os.path.join(defaultCacheDir, 'var')
+
+diff -urNad zenoss~/inst/zen2dump.py zenoss/inst/zen2dump.py
+--- zenoss~/inst/zen2dump.py 2007-05-31 21:43:11.000000000 +0100
++++ zenoss/inst/zen2dump.py 2007-06-15 16:47:20.000000000 +0100
+@@ -287,8 +287,8 @@
+
+
+
+-import os
+-defaultCacheDir = os.getenv('ZENHOME')
++import os, pwd
++defaultCacheDir = pwd.getpwnam('zenoss')
+ if defaultCacheDir is not None:
+ defaultCacheDir = os.path.join(defaultCacheDir, 'var')
+
+diff -urNad zenoss~/scripts/updateVersion zenoss/scripts/updateVersion
+--- zenoss~/scripts/updateVersion 2006-09-27 23:06:57.000000000 +0100
++++ zenoss/scripts/updateVersion 2007-06-15 16:47:21.000000000 +0100
+@@ -4,11 +4,11 @@
+ # Copyright (c) 2006 Zenoss, Inc. All rights reserved.
+ #
+ #################################################################
+-import os
++import os, pwd
+ import sys
+ import shutil
+
+-sys.path.append(os.path.join(os.getenv('ZENHOME'), 'Products'))
++sys.path.append(os.path.join(pwd.getpwnam('zenoss'), 'Products'))
+ from ZenModel.version import Current
+ from ZenModel.version.Version import Version
+ from ZenModel.version.Version import createCurrentVersionModule
Propchange: packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch?rev=110&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch Fri Jun 15 15:56:16 2007
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove-ZENHOME-rest.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: just the rest needed to get rid of ZENHOME....
+
+ at DPATCH@
+diff -urNad zenoss~/Products/ZenModel/zenbuild.py zenoss/Products/ZenModel/zenbuild.py
+--- zenoss~/Products/ZenModel/zenbuild.py 2007-06-15 16:49:11.000000000 +0100
++++ zenoss/Products/ZenModel/zenbuild.py 2007-06-15 16:50:09.000000000 +0100
+@@ -25,10 +25,6 @@
+ import Globals
+ import transaction
+
+-if not os.environ.has_key('ZENHOME'):
+- print "ERROR: ZENHOME envrionment variable not set"
+- sys.exit(1)
+-
+ zenhome = pwd.getpwnam('zenoss')
+
+ import Globals
Propchange: packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch?rev=110&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch Fri Jun 15 15:56:16 2007
@@ -1,0 +1,918 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove-ZENHOME-shellscripts.dpatch by <bernd at bzed.de>
+##
+## DP: more workarounds for $ZENHOME
+## DP: grep -lr \$ZENHOME * | grep -v debian/ | grep -v zendocs | grep -v inst | while read i; do sed "s,\$ZENHOME,\$\(getent passwd |grep '^zenoss' | cut -d : -f 6\),g" $i > $i.new; mv $i.new $i; done && grep -lr \${ZENHOME} * | grep -v debian/ | grep -v zendocs | grep -v inst | while read i; do sed "s,\${ZENHOME},\$\(getent passwd |grep '^zenoss' | cut -d : -f 6\),g" $i > $i.new; mv $i.new $i; done
+
+ at DPATCH@
+diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
+--- zenoss~/Products/ZenUtils/Graphics.py 2007-04-20 14:25:38.000000000 +0100
++++ zenoss/Products/ZenUtils/Graphics.py 2007-06-15 16:14:03.000000000 +0100
+@@ -61,7 +61,7 @@
+ import os, os.path
+ config = os.path.join(os.environ['ZENHOME'], 'lib/graphviz/config')
+ if not os.path.exists(config) or os.path.getsize(config) == 0:
+- os.system("$ZENHOME/bin/dot -c")
++ os.system("$(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/dot -c")
+ import pydot
+ graph = pydot.graph_from_edges(edges, directed=directed)
+ graph.ranksep = '1.5'
+diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
+--- zenoss~/Products/ZenUtils/ZenBackup.py 2007-06-04 20:32:10.000000000 +0100
++++ zenoss/Products/ZenUtils/ZenBackup.py 2007-06-15 16:14:03.000000000 +0100
+@@ -126,7 +126,7 @@
+ default=None,
+ help='File to backup to.'
+ ' Backups will by default be placed'
+- ' in $ZENHOME/backups/')
++ ' in $(getent passwd |grep '^zenoss' | cut -d : -f 6)/backups/')
+ self.parser.add_option('--no-eventsdb',
+ dest="noEventsDb",
+ default=False,
+diff -urNad zenoss~/Products/ZenUtils/ZenBackupBase.py zenoss/Products/ZenUtils/ZenBackupBase.py
+--- zenoss~/Products/ZenUtils/ZenBackupBase.py 2007-06-04 20:32:10.000000000 +0100
++++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-06-15 16:14:03.000000000 +0100
+@@ -87,7 +87,7 @@
+
+ def getRepozoPath(self):
+ ''' Return path to repozo.py
+- This is usually $ZENHOME/bin/repozo.py, but on the appliance it is
++ This is usually $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/repozo.py, but on the appliance it is
+ $ZOPEHOME/bin/repozo.py
+ '''
+ path = os.path.join(self.zenhome, 'bin', 'repozo.py')
+diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
+--- zenoss~/Products/ZenUtils/zenpack.py 2007-05-31 15:07:08.000000000 +0100
++++ zenoss/Products/ZenUtils/zenpack.py 2007-06-15 16:14:03.000000000 +0100
+@@ -149,7 +149,7 @@
+
+ # Continue without copying if the srcDir is already in Products
+ if os.path.exists(root) and os.path.samefile(root, srcDir):
+- self.log.debug('Directory already in $ZENHOME/Products,'
++ self.log.debug('Directory already in $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products,'
+ ' not copying.')
+ return packName
+
+@@ -160,10 +160,10 @@
+
+ # Copy the source dir over to Products
+ self.log.debug('Copying %s' % packName)
+- #result = os.system('cp -r %s $ZENHOME/Products/' % srcDir)
+- result = os.system('rsync -rlC %s $ZENHOME/Products' % srcDir)
++ #result = os.system('cp -r %s $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/' % srcDir)
++ result = os.system('rsync -rlC %s $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products' % srcDir)
+ if result == -1:
+- self.stop('Error copying %s to $ZENHOME/Products' % srcDir)
++ self.stop('Error copying %s to $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products' % srcDir)
+
+ return packName
+
+diff -urNad zenoss~/bin/fsrecover zenoss/bin/fsrecover
+--- zenoss~/bin/fsrecover 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/fsrecover 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/lib/python/ZODB
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/lib/python/ZODB
+ PRGNAME=fsrecover.py
+
+ PIDFILE=$VARDIR/ZEO_SERVER.pid
+diff -urNad zenoss~/bin/zenactions zenoss/bin/zenactions
+--- zenoss~/bin/zenactions 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenactions 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenEvents
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenEvents
+ PRGNAME=zenactions.py
+ CFGFILE=$CFGDIR/zenactions.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenbackup zenoss/bin/zenbackup
+--- zenoss~/bin/zenbackup 2007-05-22 19:04:11.000000000 +0100
++++ zenoss/bin/zenbackup 2007-06-15 16:14:03.000000000 +0100
+@@ -10,5 +10,5 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenUtils/ZenBackup.py "$CMD" $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenUtils/ZenBackup.py "$CMD" $*
+diff -urNad zenoss~/bin/zenbatchload zenoss/bin/zenbatchload
+--- zenoss~/bin/zenbatchload 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenbatchload 2007-06-15 16:14:03.000000000 +0100
+@@ -10,5 +10,5 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenModel/BatchDeviceLoader.py "$CMD" $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenModel/BatchDeviceLoader.py "$CMD" $*
+diff -urNad zenoss~/bin/zenbuild zenoss/bin/zenbuild
+--- zenoss~/bin/zenbuild 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenbuild 2007-06-15 16:14:03.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-$PYTHON $ZENHOME/Products/ZenModel/zenbuild.py "$CMD" "$@"
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenModel/zenbuild.py "$CMD" "$@"
+
+diff -urNad zenoss~/bin/zenchkrels zenoss/bin/zenchkrels
+--- zenoss~/bin/zenchkrels 2007-04-26 19:57:02.000000000 +0100
++++ zenoss/bin/zenchkrels 2007-06-15 16:14:03.000000000 +0100
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenUtils/CheckRelations.py "$CMD" $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenUtils/CheckRelations.py "$CMD" $*
+diff -urNad zenoss~/bin/zenchkschema zenoss/bin/zenchkschema
+--- zenoss~/bin/zenchkschema 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenchkschema 2007-06-15 16:14:03.000000000 +0100
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenRelations/checkrel.py $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRelations/checkrel.py $*
+diff -urNad zenoss~/bin/zencommand zenoss/bin/zencommand
+--- zenoss~/bin/zencommand 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zencommand 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenRRD
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRRD
+ PRGNAME=zencommand.py
+ CFGFILE=$CFGDIR/zencommand.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenctl zenoss/bin/zenctl
+--- zenoss~/bin/zenctl 2007-05-21 16:15:27.000000000 +0100
++++ zenoss/bin/zenctl 2007-06-15 16:15:40.000000000 +0100
+@@ -20,7 +20,7 @@
+ # description: Zenoss is a monitoring program written by Zenoss, Inc.
+ #
+ # Most of the time this script simply delegates to
+-# ${ZENHOME}/bin/zenoss to actually execute the requested command
++# $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenoss to actually execute the requested command
+ # (start/stop). But, in some situations it behaves differently.
+ #
+ # This script also checks for the fresh_install or upgraded flags. If
+@@ -53,18 +53,18 @@
+
+ # signature of zenoss having been installed for the first time (but
+ # not configured yet)
+-export FRESH_INSTALL=${ZENHOME}/.fresh_install
++export FRESH_INSTALL=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/.fresh_install
+
+ # signature of zenoss having been upgraded from a previous install
+-export UPGRADED=${ZENHOME}/.upgraded
++export UPGRADED=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/.upgraded
+
+
+ # changes the owners and permissions for the zenoss files
+ set_perms() {
+ for dir in \
+- ${ZENHOME}/log \
+- ${ZENHOME}/etc \
+- ${ZENHOME}/var
++ $(getent passwd |grep '^zenoss' | cut -d : -f 6)/log \
++ $(getent passwd |grep '^zenoss' | cut -d : -f 6)/etc \
++ $(getent passwd |grep '^zenoss' | cut -d : -f 6)/var
+ do
+ if [ ! -d ${dir} ]; then
+ continue
+@@ -81,7 +81,7 @@
+ echo "Zenoss not initialized. Performing first-boot initialization..."
+
+ # location of where we copy configuration items to
+- ZEN_ETC=${ZENHOME}/etc
++ ZEN_ETC=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/etc
+
+ # update the snmpd.conf file
+ SNMPD_CONF_DIR=`dirname ${SNMPD_CONF}`
+@@ -96,7 +96,7 @@
+
+ # run the first time initialization pre-run script
+ set_perms
+- ${ZENHOME}/bin/zenoss_init_pre
++ $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenoss_init_pre
+ set_perms
+
+ echo "Zenoss initialization complete."
+@@ -107,7 +107,7 @@
+ # but AFTER the zenoss processes are started
+ fresh_install_post() {
+ # run the first time initialization post-run script
+- ${ZENHOME}/bin/zenoss_init_post
++ $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenoss_init_post
+ }
+
+
+@@ -118,7 +118,7 @@
+
+ # run the first time initialization pre-run script
+ set_perms
+- ${ZENHOME}/bin/zenoss_upgrade_pre
++ $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenoss_upgrade_pre
+ set_perms
+
+ echo "Zenoss upgrade complete."
+@@ -130,7 +130,7 @@
+ upgrade_post() {
+
+ # run the first time initialization post-run script
+- ${ZENHOME}/bin/zenoss_upgrade_post
++ $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenoss_upgrade_post
+
+ }
+
+@@ -160,7 +160,7 @@
+
+
+ # delegate to the main zenoss script for control functions
+-su - ${RUNUSER} sh -c "${ZENHOME}/bin/zenoss $@"
++su - ${RUNUSER} sh -c "$(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenoss $@"
+
+
+ # run the post-script for firstboot and remove the firstboot flag
+diff -urNad zenoss~/bin/zendevicedump zenoss/bin/zendevicedump
+--- zenoss~/bin/zendevicedump 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zendevicedump 2007-06-15 16:14:03.000000000 +0100
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenRelations/ExportDevices.py "$CMD" $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRelations/ExportDevices.py "$CMD" $*
+diff -urNad zenoss~/bin/zendeviceload zenoss/bin/zendeviceload
+--- zenoss~/bin/zendeviceload 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zendeviceload 2007-06-15 16:14:03.000000000 +0100
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenRelations/ImportDevices.py "$CMD" $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRelations/ImportDevices.py "$CMD" $*
+diff -urNad zenoss~/bin/zendisc zenoss/bin/zendisc
+--- zenoss~/bin/zendisc 2007-05-11 20:04:45.000000000 +0100
++++ zenoss/bin/zendisc 2007-06-15 16:14:03.000000000 +0100
+@@ -10,10 +10,10 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-SUDO="$ZENHOME/bin/zensocket --ping -- "
+-PRGHOME=$ZENHOME/Products/DataCollector
++SUDO="$(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zensocket --ping -- "
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/DataCollector
+ PRGNAME=zendisc.py
+ CFGFILE=$CFGDIR/zendisc.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zendmd zenoss/bin/zendmd
+--- zenoss~/bin/zendmd 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zendmd 2007-06-15 16:14:03.000000000 +0100
+@@ -12,5 +12,5 @@
+
+ # For some reason the zenfunctions line eats part of $*. Store
+ # value now to use in call to zendmd.py
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON -i $ZENHOME/Products/ZenModel/zendmd.py "$CMD" $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON -i $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenModel/zendmd.py "$CMD" $*
+diff -urNad zenoss~/bin/zendoc zenoss/bin/zendoc
+--- zenoss~/bin/zendoc 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zendoc 2007-06-15 16:14:03.000000000 +0100
+@@ -9,8 +9,8 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions
+-rm -rf $ZENHOME/zendocs/api
+-mkdir -p $ZENHOME/zendocs/api
+-cd $ZENHOME/Products
+-$ZENHOME/bin/epydoc -o $ZENHOME/zendocs/api -n Zenoss --inheritance listed $ZENPRODUCTS
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++rm -rf $(getent passwd |grep '^zenoss' | cut -d : -f 6)/zendocs/api
++mkdir -p $(getent passwd |grep '^zenoss' | cut -d : -f 6)/zendocs/api
++cd $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products
++$(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/epydoc -o $(getent passwd |grep '^zenoss' | cut -d : -f 6)/zendocs/api -n Zenoss --inheritance listed $ZENPRODUCTS
+diff -urNad zenoss~/bin/zendump zenoss/bin/zendump
+--- zenoss~/bin/zendump 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zendump 2007-06-15 16:14:03.000000000 +0100
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenRelations/ExportRM.py "$CMD" $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRelations/ExportRM.py "$CMD" $*
+diff -urNad zenoss~/bin/zeneventbuild zenoss/bin/zeneventbuild
+--- zenoss~/bin/zeneventbuild 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zeneventbuild 2007-06-15 16:14:03.000000000 +0100
+@@ -10,12 +10,12 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-if [ "$ZENHOME" = "" ]; then
++if [ "$(getent passwd |grep '^zenoss' | cut -d : -f 6)" = "" ]; then
+ echo ERROR: ZENHOME envrionment variable not set.
+ exit 1
+ fi
+
+-EVTDB=$ZENHOME/Products/ZenEvents/db
++EVTDB=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenEvents/db
+
+ if [ -d $EVTDB ]; then
+ cd $EVTDB
+diff -urNad zenoss~/bin/zeneventlog zenoss/bin/zeneventlog
+--- zenoss~/bin/zeneventlog 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zeneventlog 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenWin
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenWin
+ PRGNAME=zeneventlog.py
+ CFGFILE=$CFGDIR/zeneventlog.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenfunctions zenoss/bin/zenfunctions
+--- zenoss~/bin/zenfunctions 2007-05-11 20:04:45.000000000 +0100
++++ zenoss/bin/zenfunctions 2007-06-15 16:14:03.000000000 +0100
+@@ -9,23 +9,23 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-INSTANCE_HOME=$ZENHOME
++INSTANCE_HOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)
+ export INSTANCE_HOME
+
+-SYBASE=$ZENHOME/sybase
++SYBASE=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/sybase
+ export SYBASE
+
+-ZOPEHOME=$ZENHOME
++ZOPEHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)
+ if [ -d /usr/lib/zope ] ; then
+ ZOPEHOME=/usr/lib/zope
+ fi
+
+ PYTHON=$ZOPEHOME/bin/python
+-PYTHONPATH=$ZENHOME/lib/python:$ZOPEHOME/lib/python
++PYTHONPATH=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/lib/python:$ZOPEHOME/lib/python
+ export PYTHONPATH
+
+-VARDIR=$ZENHOME/var
+-CFGDIR=$ZENHOME/etc
++VARDIR=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/var
++CFGDIR=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/etc
+
+ ZENPRODUCTS="ZenModel NcoProduct ZenUtils SiteScopeParser ZenRelations ZenStatus SnmpCollector ZenRRD DataCollector ZenWidgets ZenEvents"
+
+diff -urNad zenoss~/bin/zenhub zenoss/bin/zenhub
+--- zenoss~/bin/zenhub 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenhub 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenHub
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenHub
+ PRGNAME=zenhub.py
+ CFGFILE=$CFGDIR/zenhub.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenload zenoss/bin/zenload
+--- zenoss~/bin/zenload 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenload 2007-06-15 16:14:03.000000000 +0100
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenRelations/ImportRM.py "$CMD" $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRelations/ImportRM.py "$CMD" $*
+diff -urNad zenoss~/bin/zenmail zenoss/bin/zenmail
+--- zenoss~/bin/zenmail 2007-05-11 20:04:45.000000000 +0100
++++ zenoss/bin/zenmail 2007-06-15 16:14:03.000000000 +0100
+@@ -10,10 +10,10 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-SUDO="zensocket --listen=25 -- $ZENHOME/bin/python "
+-PRGHOME=$ZENHOME/Products/ZenEvents
++SUDO="zensocket --listen=25 -- $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/python "
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenEvents
+ PRGNAME=zenmail.py
+ CFGFILE=$CFGDIR/zenmail.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenmib zenoss/bin/zenmib
+--- zenoss~/bin/zenmib 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenmib 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenModel
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenModel
+ PRGNAME=zenmib.py
+ CFGFILE=$CFGDIR/zenmib.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenmigrate zenoss/bin/zenmigrate
+--- zenoss~/bin/zenmigrate 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenmigrate 2007-06-15 16:14:03.000000000 +0100
+@@ -12,5 +12,5 @@
+
+ # For some reason the zenfunctions line eats part of $*. Store
+ # value now to use in call to zendmd.py
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenModel/migrate/zenmigrate.py "$CMD" $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenModel/migrate/zenmigrate.py "$CMD" $*
+diff -urNad zenoss~/bin/zenmodeler zenoss/bin/zenmodeler
+--- zenoss~/bin/zenmodeler 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenmodeler 2007-06-15 16:14:03.000000000 +0100
+@@ -10,10 +10,10 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+
+-PRGHOME=$ZENHOME/Products/DataCollector
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/DataCollector
+ PRGNAME=zenmodeler.py
+ CFGFILE=$CFGDIR/zenmodeler.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenoss zenoss/bin/zenoss
+--- zenoss~/bin/zenoss 2007-05-21 16:23:04.000000000 +0100
++++ zenoss/bin/zenoss 2007-06-15 16:14:03.000000000 +0100
+@@ -19,7 +19,7 @@
+ #############################################################################
+ # Attempt to set ZENHOME if it is not already set, or bogus
+ # by calculating it relative to the executing command
+-if [ -z "$ZENHOME" -o ! -d "$ZENHOME" ] ; then
++if [ -z "$(getent passwd |grep '^zenoss' | cut -d : -f 6)" -o ! -d "$(getent passwd |grep '^zenoss' | cut -d : -f 6)" ] ; then
+ # Resolve links: $0 may be a link to zenoss's home.
+ PRG="$0"
+ while [ -h "$PRG" ] ; do
+@@ -39,17 +39,17 @@
+ fi
+
+ if [ `id -u` -eq 0 ] ; then
+- USERNAME=`ls -l $ZENHOME/var/Data.fs | awk '{ print $3 }'`
++ USERNAME=`ls -l $(getent passwd |grep '^zenoss' | cut -d : -f 6)/var/Data.fs | awk '{ print $3 }'`
+ if [ "$USERNAME" = "root" -o -z "$USERNAME" ] ; then
+ echo Unable to determine the right user to run zenoss
+ exit 1
+ fi
+- chown -R $USERNAME $ZENHOME/var
+- chown -R $USERNAME $ZENHOME/log
++ chown -R $USERNAME $(getent passwd |grep '^zenoss' | cut -d : -f 6)/var
++ chown -R $USERNAME $(getent passwd |grep '^zenoss' | cut -d : -f 6)/log
+ exec su - $USERNAME $0 $@
+ fi
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+ C=
+ C="$C zeoctl"
+ C="$C zopectl"
+@@ -64,13 +64,13 @@
+ C="$C zenperfsnmp"
+ C="$C zencommand"
+ C="$C zenprocess"
+-if [ -f $ZENHOME/lib/python/pywmi.py ]
++if [ -f $(getent passwd |grep '^zenoss' | cut -d : -f 6)/lib/python/pywmi.py ]
+ then
+ C="$C zenwin"
+ C="$C zeneventlog"
+ C="$C zenwinmodeler"
+ fi
+-for i in $ZENHOME/Products/*/daemons/*
++for i in $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/*/daemons/*
+ do
+ if [ -x "$i" ]
+ then
+@@ -95,7 +95,7 @@
+ for cmd in $CMDS
+ do
+ echo -n "Daemon: $cmd "
+- $ZENHOME/bin/$cmd "$FUNC"
++ $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/$cmd "$FUNC"
+ done
+ }
+
+diff -urNad zenoss~/bin/zenoss_init_post zenoss/bin/zenoss_init_post
+--- zenoss~/bin/zenoss_init_post 2007-05-11 19:57:16.000000000 +0100
++++ zenoss/bin/zenoss_init_post 2007-06-15 16:15:40.000000000 +0100
+@@ -31,11 +31,11 @@
+ export MYSQLPASS="**MYSQL_PASSWD**"
+ export MYSQLEVENTDB="**MYSQL_DATABASE**"
+ export ZOPEPASSWORD="**ZOPE_PASSWD**"
+-export ZOPEHOME=${ZENHOME}
++export ZOPEHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)
+
+ # load the installation functions
+-. ${ZENHOME}/bin/shared-functions.sh
+-. ${ZENHOME}/bin/install-functions.sh
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/shared-functions.sh
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/install-functions.sh
+
+
+ # add localhost as a device to zenoss
+diff -urNad zenoss~/bin/zenoss_init_pre zenoss/bin/zenoss_init_pre
+--- zenoss~/bin/zenoss_init_pre 2007-05-11 19:57:16.000000000 +0100
++++ zenoss/bin/zenoss_init_pre 2007-06-15 16:15:40.000000000 +0100
+@@ -30,14 +30,14 @@
+ export MYSQLPASS="**MYSQL_PASSWD**"
+ export MYSQLEVENTDB="**MYSQL_DATABASE**"
+ export ZOPEPASSWORD="**ZOPE_PASSWD**"
+-export ZOPEHOME=${ZENHOME}
++export ZOPEHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)
+
+ # load the installation functions
+-. ${ZENHOME}/bin/shared-functions.sh
+-. ${ZENHOME}/bin/install-functions.sh
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/shared-functions.sh
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/install-functions.sh
+
+ # create the log directory
+-mkdir -p ${ZENHOME}/log
++mkdir -p $(getent passwd |grep '^zenoss' | cut -d : -f 6)/log
+
+ # restart external server daemons
+ restart_snmpd
+@@ -61,6 +61,6 @@
+
+ # create the zeo database
+ start_zeodb
+-chown -R ${OS_USERNAME} ${ZENHOME}/var
++chown -R ${OS_USERNAME} $(getent passwd |grep '^zenoss' | cut -d : -f 6)/var
+ run_zenbuild
+ stop_zeodb
+diff -urNad zenoss~/bin/zenoss_upgrade_post zenoss/bin/zenoss_upgrade_post
+--- zenoss~/bin/zenoss_upgrade_post 2007-05-11 19:57:16.000000000 +0100
++++ zenoss/bin/zenoss_upgrade_post 2007-06-15 16:15:40.000000000 +0100
+@@ -30,10 +30,10 @@
+ export MYSQLPASS="**MYSQL_PASSWD**"
+ export MYSQLEVENTDB="**MYSQL_DATABASE**"
+ export ZOPEPASSWORD="**ZOPE_PASSWD**"
+-export ZOPEHOME=${ZENHOME}
++export ZOPEHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)
+
+ # load the installation functions
+-. ${ZENHOME}/bin/shared-functions.sh
+-. ${ZENHOME}/bin/install-functions.sh
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/shared-functions.sh
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/install-functions.sh
+
+ # do nothing... this is left here for others to fill in later
+diff -urNad zenoss~/bin/zenoss_upgrade_pre zenoss/bin/zenoss_upgrade_pre
+--- zenoss~/bin/zenoss_upgrade_pre 2007-05-11 19:57:16.000000000 +0100
++++ zenoss/bin/zenoss_upgrade_pre 2007-06-15 16:15:40.000000000 +0100
+@@ -30,11 +30,11 @@
+ export MYSQLPASS="**MYSQL_PASSWD**"
+ export MYSQLEVENTDB="**MYSQL_DATABASE**"
+ export ZOPEPASSWORD="**ZOPE_PASSWD**"
+-export ZOPEHOME=${ZENHOME}
++export ZOPEHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)
+
+ # load the installation functions
+-. ${ZENHOME}/bin/shared-functions.sh
+-. ${ZENHOME}/bin/install-functions.sh
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/shared-functions.sh
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/install-functions.sh
+
+ # copy the etc/*.conf.example files to etc/*.conf if etc/*.conf don't
+ # already exist (we don't want to clobber people's configs)
+diff -urNad zenoss~/bin/zenpack zenoss/bin/zenpack
+--- zenoss~/bin/zenpack 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenpack 2007-06-15 16:14:03.000000000 +0100
+@@ -10,5 +10,5 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenUtils/zenpack.py "$CMD" $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenUtils/zenpack.py "$CMD" $*
+diff -urNad zenoss~/bin/zenpass zenoss/bin/zenpass
+--- zenoss~/bin/zenpass 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenpass 2007-06-15 16:14:03.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-cd $ZENHOME
++cd $(getent passwd |grep '^zenoss' | cut -d : -f 6)
+
+ echo -n 'Password for the Zenoss "admin" user: '
+ stty -echo
+@@ -18,7 +18,7 @@
+ echo
+ stty echo
+
+-test -z "$ZOPEHOME" && export ZOPEHOME=$ZENHOME
++test -z "$ZOPEHOME" && export ZOPEHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)
+
+ $ZOPEHOME/bin/zpasswd.py -u admin -p $ZOPEPASSWORD inituser
+ zopectl stop
+@@ -27,7 +27,7 @@
+ for file in zenperfsnmp zencommand zenperfxmlrpc zenprocess
+ do
+ sed -e "s/zopepassword.*/zopepassword $ZOPEPASSWORD/" < \
+- $ZENHOME/etc/${file}.conf > /tmp/${file}.conf
+- mv /tmp/${file}.conf $ZENHOME/etc
++ $(getent passwd |grep '^zenoss' | cut -d : -f 6)/etc/${file}.conf > /tmp/${file}.conf
++ mv /tmp/${file}.conf $(getent passwd |grep '^zenoss' | cut -d : -f 6)/etc
+ $file restart
+ done
+diff -urNad zenoss~/bin/zenperfsnmp zenoss/bin/zenperfsnmp
+--- zenoss~/bin/zenperfsnmp 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenperfsnmp 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenRRD
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRRD
+ PRGNAME=zenperfsnmp.py
+ CFGFILE=$CFGDIR/zenperfsnmp.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenperfxmlrpc zenoss/bin/zenperfxmlrpc
+--- zenoss~/bin/zenperfxmlrpc 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenperfxmlrpc 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenRRD
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRRD
+ PRGNAME=zenperfxmlrpc.py
+ CFGFILE=$CFGDIR/zenperfxmlrpc.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenping zenoss/bin/zenping
+--- zenoss~/bin/zenping 2007-05-11 20:04:45.000000000 +0100
++++ zenoss/bin/zenping 2007-06-15 16:14:03.000000000 +0100
+@@ -10,10 +10,10 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-SUDO="$ZENHOME/bin/zensocket --ping -- "
+-PRGHOME=$ZENHOME/Products/ZenStatus
++SUDO="$(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zensocket --ping -- "
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenStatus
+ PRGNAME=zenping.py
+ CFGFILE=$CFGDIR/zenping.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenprocess zenoss/bin/zenprocess
+--- zenoss~/bin/zenprocess 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenprocess 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenRRD
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRRD
+ PRGNAME=zenprocess.py
+ CFGFILE=$CFGDIR/zenprocess.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenprodrm zenoss/bin/zenprodrm
+--- zenoss~/bin/zenprodrm 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenprodrm 2007-06-15 16:14:03.000000000 +0100
+@@ -16,9 +16,9 @@
+ echo No actions taken.
+ exit
+ else
+- . $ZENHOME/bin/zenfunctions
++ . $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+- cd $ZENHOME/Products
++ cd $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products
+
+ for d in $ZENPRODUCTS
+ do
+diff -urNad zenoss~/bin/zenrender zenoss/bin/zenrender
+--- zenoss~/bin/zenrender 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenrender 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenRRD
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRRD
+ PRGNAME=zenrender.py
+ CFGFILE=$CFGDIR/zenrender.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenrestore zenoss/bin/zenrestore
+--- zenoss~/bin/zenrestore 2007-05-22 19:04:11.000000000 +0100
++++ zenoss/bin/zenrestore 2007-06-15 16:14:03.000000000 +0100
+@@ -10,5 +10,5 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenUtils/ZenRestore.py "$CMD" $*
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenUtils/ZenRestore.py "$CMD" $*
+diff -urNad zenoss~/bin/zenschamadoc zenoss/bin/zenschamadoc
+--- zenoss~/bin/zenschamadoc 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenschamadoc 2007-06-15 16:14:03.000000000 +0100
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions
+-$PYTHON $ZENHOME/Products/ZenRelations/schemadoc.py Products.ZenModel
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
++$PYTHON $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRelations/schemadoc.py Products.ZenModel
+diff -urNad zenoss~/bin/zenstatus zenoss/bin/zenstatus
+--- zenoss~/bin/zenstatus 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenstatus 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenStatus
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenStatus
+ PRGNAME=zenstatus.py
+ CFGFILE=$CFGDIR/zenstatus.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenstep zenoss/bin/zenstep
+--- zenoss~/bin/zenstep 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenstep 2007-06-15 16:14:03.000000000 +0100
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-export INSTANCE_HOME=$ZENHOME
+-$ZENHOME/bin/python $ZENHOME/Products/ZenRRD/zenstep.py $@
++export INSTANCE_HOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)
++$(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/python $(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenRRD/zenstep.py $@
+diff -urNad zenoss~/bin/zensyslog zenoss/bin/zensyslog
+--- zenoss~/bin/zensyslog 2007-05-11 20:04:45.000000000 +0100
++++ zenoss/bin/zensyslog 2007-06-15 16:14:03.000000000 +0100
+@@ -10,10 +10,10 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-SUDO="$ZENHOME/bin/zensocket --listen=514 -- "
+-PRGHOME=$ZENHOME/Products/ZenEvents
++SUDO="$(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zensocket --listen=514 -- "
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenEvents
+ PRGNAME=zensyslog.py
+ CFGFILE=$CFGDIR/zensyslog.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zentrap zenoss/bin/zentrap
+--- zenoss~/bin/zentrap 2007-05-11 20:04:45.000000000 +0100
++++ zenoss/bin/zentrap 2007-06-15 16:14:03.000000000 +0100
+@@ -10,10 +10,10 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-SUDO="$ZENHOME/bin/zensocket --listen=162 -- "
+-PRGHOME=$ZENHOME/Products/ZenEvents
++SUDO="$(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zensocket --listen=162 -- "
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenEvents
+ PRGNAME=zentrap.py
+ CFGFILE=$CFGDIR/zentrap.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenwin zenoss/bin/zenwin
+--- zenoss~/bin/zenwin 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenwin 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenWin
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenWin
+ PRGNAME=zenwin.py
+ CFGFILE=$CFGDIR/zenwin.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zenwinmodeler zenoss/bin/zenwinmodeler
+--- zenoss~/bin/zenwinmodeler 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zenwinmodeler 2007-06-15 16:14:03.000000000 +0100
+@@ -10,9 +10,9 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+-PRGHOME=$ZENHOME/Products/ZenWin
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenWin
+ PRGNAME=zenwinmodeler.py
+ CFGFILE=$CFGDIR/zenwinmodeler.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/bin/zproprmlocal zenoss/bin/zproprmlocal
+--- zenoss~/bin/zproprmlocal 2007-04-20 14:48:17.000000000 +0100
++++ zenoss/bin/zproprmlocal 2007-06-15 16:14:03.000000000 +0100
+@@ -10,10 +10,10 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd |grep '^zenoss' | cut -d : -f 6)/bin/zenfunctions
+
+ NAME=zproprmlocal
+-PRGHOME=$ZENHOME/Products/ZenUtils
++PRGHOME=$(getent passwd |grep '^zenoss' | cut -d : -f 6)/Products/ZenUtils
+ PRGNAME=$NAME.py
+ CFGFILE=$CFGDIR/$NAME.conf
+ PIDFILE=$VARDIR/$PRGNAME.pid
+diff -urNad zenoss~/zenpacks/DnsMonitor/datasources/DnsMonitorDataSource.py zenoss/zenpacks/DnsMonitor/datasources/DnsMonitorDataSource.py
+--- zenoss~/zenpacks/DnsMonitor/datasources/DnsMonitorDataSource.py 2007-06-11 18:52:15.000000000 +0100
++++ zenoss/zenpacks/DnsMonitor/datasources/DnsMonitorDataSource.py 2007-06-15 16:14:03.000000000 +0100
+@@ -81,7 +81,7 @@
+ if self.expectedIpAddress:
+ parts.append('-a %s' % self.expectedIpAddress)
+ cmd = ' '.join(parts)
+- cmd = '$ZENHOME/libexec/' + \
++ cmd = '$(getent passwd |grep '^zenoss' | cut -d : -f 6)/libexec/' + \
+ RRDDataSource.RRDDataSource.getCommand(self, context, cmd)
+ return cmd
+
+diff -urNad zenoss~/zenpacks/HttpMonitor/datasources/HttpMonitorDataSource.py zenoss/zenpacks/HttpMonitor/datasources/HttpMonitorDataSource.py
+--- zenoss~/zenpacks/HttpMonitor/datasources/HttpMonitorDataSource.py 2007-06-11 18:46:39.000000000 +0100
++++ zenoss/zenpacks/HttpMonitor/datasources/HttpMonitorDataSource.py 2007-06-15 16:14:03.000000000 +0100
+@@ -114,7 +114,7 @@
+ if self.onRedirect:
+ parts.append('-f %s' % self.onRedirect)
+ cmd = ' '.join(parts)
+- cmd = '$ZENHOME/libexec/' + \
++ cmd = '$(getent passwd |grep '^zenoss' | cut -d : -f 6)/libexec/' + \
+ RRDDataSource.RRDDataSource.getCommand(self, context, cmd)
+ return cmd
+
Propchange: packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-zenoss-commits
mailing list