- adapted to new directory

Changed files:
    Zope-instance_paths.patch -> 1.2
    Zope-mkzeoinstance -> 1.2
    Zope-mkzopeinstance -> 1.3

diff --git a/Zope-instance_paths.patch b/Zope-instance_paths.patch
index 9124580e964764e1e96db5113d2b73fd56a4022d..ae0fdd6669869abc1402a6905ee802e1d61d29db 100644 (file)
--- a/Zope-instance_paths.patch
+++ b/Zope-instance_paths.patch
@@ -23,8 +23,9 @@ diff -durN Zope-2.7.0-b2.orig/skel/bin/runzope.in Zope-2.7.0-b2/skel/bin/runzope
  ZOPE_HOME="<<ZOPE_HOME>>"
  INSTANCE_HOME="<<INSTANCE_HOME>>"
 -CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
+-SOFTWARE_HOME="<<SOFTWARE_HOME>>"
 +CONFIG_FILE="<<CONFIG_FILE>>"
- SOFTWARE_HOME="<<SOFTWARE_HOME>>"
++SOFTWARE_HOME="<<ZOPE_HOME>>/lib/python"
  PYTHONPATH="$SOFTWARE_HOME"
  export PYTHONPATH
 diff -durN Zope-2.7.0-b2.orig/skel/bin/zopectl.in Zope-2.7.0-b2/skel/bin/zopectl.in
@@ -35,8 +36,9 @@ diff -durN Zope-2.7.0-b2.orig/skel/bin/zopectl.in Zope-2.7.0-b2/skel/bin/zopectl
  ZOPE_HOME="<<ZOPE_HOME>>"
  INSTANCE_HOME="<<INSTANCE_HOME>>"
 -CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
+-SOFTWARE_HOME="<<SOFTWARE_HOME>>"
 +CONFIG_FILE="<<CONFIG_FILE>>"
- SOFTWARE_HOME="<<SOFTWARE_HOME>>"
++SOFTWARE_HOME="<<ZOPE_HOME>>/lib/python"
  PYTHONPATH="$SOFTWARE_HOME"
  export PYTHONPATH
 diff -durN Zope-2.7.0-b2.orig/skel/etc/zope.conf.in Zope-2.7.0-b2/skel/etc/zope.conf.in

diff --git a/Zope-mkzeoinstance b/Zope-mkzeoinstance
index 835487d5563a5b93b4f1b6139d7c211abcbc105e..48a55c1b8a596a9ab7055df4d435b85eac3da776 100644 (file)
--- a/Zope-mkzeoinstance
+++ b/Zope-mkzeoinstance
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
 import sys
-sys.path.insert(0,"/usr/lib/zope")
+sys.path.insert(0,"/usr/lib/zope/lib/python")
 from ZEO.mkzeoinst import ZEOInstanceBuilder
 ZEOInstanceBuilder().run()

diff --git a/Zope-mkzopeinstance b/Zope-mkzopeinstance
index 7742ccbbb2b6f9159afe18b0889b3906aeaf6dc4..0a90fccea02ad7a1c41bb76959bb8c1d9af7a716 100644 (file)
--- a/Zope-mkzopeinstance
+++ b/Zope-mkzopeinstance
@@ -16,7 +16,7 @@ else
 fi
 
 umask 002
-python /usr/lib/zope/mkzopeinstance.py \
+python /usr/lib/zope/bin/mkzopeinstance.py \
        -s /etc/zope/skel \
        -d "$destdir" \
        $namepass || exit $?
@@ -28,7 +28,7 @@ chmod a+x "${destdir}"/bin/*
 
 install -d "/var/log/zope/$name"
 
-chown root.zope "${destdir}" "/var/log/zope/$name"
+chown zope.zope "${destdir}" "/var/log/zope/$name"
 chmod 770 "${destdir}" "/var/log/zope/$name"
 chown -R zope.zope "${destdir}"/*
 chmod a+X  "${destdir}"/*