[rhmessaging-commits] rhmessaging commits: r1978 - in mgmt/cumin: bin and 1 other directories.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-04-24 15:08:06 -0400 (Thu, 24 Apr 2008)
New Revision: 1978

Modified:
   mgmt/cumin/Makefile
   mgmt/cumin/bin/cumin-instance-init
   mgmt/cumin/python/cumin/__init__.py
Log:
Use /etc/cumin/cumin.conf instead of /etc/cumin.conf

Modified: mgmt/cumin/Makefile
===================================================================
--- mgmt/cumin/Makefile	2008-04-24 18:56:19 UTC (rev 1977)
+++ mgmt/cumin/Makefile	2008-04-24 19:08:06 UTC (rev 1978)
@@ -5,6 +5,7 @@
 name := cumin
 
 lib := ${PYTHON_LIB_DIR}/${name}
+etc := ${ETC_DIR}/${name}
 doc := ${DOC_DIR}/${name}
 log := ${VAR_DIR}/log/${name}
 share := ${SHARE_DIR}/${name}
@@ -23,6 +24,6 @@
 	install -pm 0644 LICENSE COPYING ${doc}
 	install -d ${share}/resources
 	install -pm 0644 resources/* ${share}/resources
-	install -d ${ETC_DIR}
-	install -pm 0644 etc/* ${ETC_DIR}
+	install -d ${etc}
+	install -pm 0644 etc/* ${etc}
 	install -d ${log}

Modified: mgmt/cumin/bin/cumin-instance-init
===================================================================
--- mgmt/cumin/bin/cumin-instance-init	2008-04-24 18:56:19 UTC (rev 1977)
+++ mgmt/cumin/bin/cumin-instance-init	2008-04-24 19:08:06 UTC (rev 1978)
@@ -28,7 +28,7 @@
 
     check_home(home)
 
-    map = ((join(sep, "etc"), join(home, "etc")),
+    map = ((join(sep, "etc", "cumin"), join(home, "etc")),
            (join(sep, "var", "log", "cumin"), join(home, "log")),
            (join(prefix, "share", "cumin", "resources"), join(home, "resources")),
            (join(prefix, "share", "mint", "sql"), join(home, "sql")))
@@ -38,7 +38,7 @@
 
     check_home(home)
 
-    map = ((join(prefix, "etc"), join(home, "etc")),
+    map = ((join(prefix, "etc", "cumin"), join(home, "etc")),
            (join(sep, "var", "local", "log", "cumin"), join(home, "log")),
            (join(prefix, "share", "cumin", "resources"), join(home, "resources")),
            (join(prefix, "share", "mint", "sql"), join(home, "sql")))
@@ -52,7 +52,7 @@
 
     check_home(home)
 
-    map = ((join(prefix, "etc"), join(home, "etc")),
+    map = ((join(prefix, "etc", "cumin"), join(home, "etc")),
            (join(prefix, "var", "log", "cumin"), join(home, "log")),
            (join(prefix, "share", "cumin", "resources"), join(home, "resources")),
            (join(prefix, "share", "mint", "sql"), join(home, "sql")))

Modified: mgmt/cumin/python/cumin/__init__.py
===================================================================
--- mgmt/cumin/python/cumin/__init__.py	2008-04-24 18:56:19 UTC (rev 1977)
+++ mgmt/cumin/python/cumin/__init__.py	2008-04-24 19:08:06 UTC (rev 1978)
@@ -133,7 +133,7 @@
     def __init__(self):
         super(CuminConfig, self).__init__()
 
-        hdef = os.path.normpath("/usr/share/cumin")
+        hdef = os.path.normpath("/var/lib/cumin")
         self.home = os.environ.get("CUMIN_HOME", hdef)
 
         if not os.path.isdir(self.home):