- x32 rebuild

[packages/Zope.git] / Zope-instance_paths.patch

diff -urN Zope-2.11.3-final.orig/skel/bin/runzope.in Zope-2.11.3-final/skel/bin/runzope.in
--- Zope-2.11.3-final.orig/skel/bin/runzope.in	2009-05-02 09:46:08.000000000 +0200
+++ Zope-2.11.3-final/skel/bin/runzope.in	2009-06-01 10:50:59.930385356 +0200
@@ -3,8 +3,8 @@
 PYTHON="<<PYTHON>>"
 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="<<ZOPE_HOME>>/lib/python"
 PYTHONPATH="$SOFTWARE_HOME:$PYTHONPATH"
 export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
 
diff -urN Zope-2.11.3-final.orig/skel/bin/zopectl.in Zope-2.11.3-final/skel/bin/zopectl.in
--- Zope-2.11.3-final.orig/skel/bin/zopectl.in	2009-05-02 09:46:08.000000000 +0200
+++ Zope-2.11.3-final/skel/bin/zopectl.in	2009-06-01 10:51:35.387136006 +0200
@@ -3,8 +3,8 @@
 PYTHON="<<PYTHON>>"
 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="<<ZOPE_HOME>>/lib/python"
 PYTHONPATH="$SOFTWARE_HOME:$PYTHONPATH"
 export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
 
diff -urN Zope-2.11.3-final.orig/skel/etc/zope.conf.in Zope-2.11.3-final/skel/etc/zope.conf.in
--- Zope-2.11.3-final.orig/skel/etc/zope.conf.in	2009-05-02 09:46:08.000000000 +0200
+++ Zope-2.11.3-final/skel/etc/zope.conf.in	2009-06-01 11:19:48.451080947 +0200
@@ -24,6 +24,7 @@
 
 %define INSTANCE <<INSTANCE_HOME>>
 %define ZOPE <<ZOPE_HOME>>
+%define INSTANCE_NAME <<INSTANCE_NAME>>
 
 # Directive: instancehome
 #
@@ -802,7 +803,7 @@
 <eventlog>
   level info
   <logfile>
-    path $INSTANCE/log/event.log
+    path /var/log/zope/$INSTANCE_NAME/event.log
     level info
   </logfile>
 </eventlog>
@@ -810,7 +811,7 @@
 <logger access>
   level WARN
   <logfile>
-    path $INSTANCE/log/Z2.log
+    path /var/log/zope/$INSTANCE_NAME/Z2.log
     format %(message)s
   </logfile>
 </logger>
diff -urN Zope-2.11.3-final.orig/skel/log/README.txt Zope-2.11.3-final/skel/log/README.txt
--- Zope-2.11.3-final.orig/skel/log/README.txt	2009-05-02 09:46:08.000000000 +0200
+++ Zope-2.11.3-final/skel/log/README.txt	2009-06-01 11:20:17.800185834 +0200
@@ -1 +1 @@
-This is the directory used to hold log files by default.
+
diff -urN Zope-2.11.3-final.orig/skel/README.txt Zope-2.11.3-final/skel/README.txt
--- Zope-2.11.3-final.orig/skel/README.txt	2009-05-02 09:46:08.000000000 +0200
+++ Zope-2.11.3-final/skel/README.txt	2009-06-01 10:49:59.224643237 +0200
@@ -2,9 +2,12 @@
 server.  It contains the following directories:
 
   bin/         Scripts used to control the Zope instance
-  etc/         Configuration files
   Extensions/  Python sources for External Methods
-  log/         Log files
   lib/python/  Installed Python packages specific to the instance
   Products/    Installed Zope Products specific to the instance
   var/         Run-time data files, including the object database
+
+In PLD some files are placed outside "instance home":
+
+  /etc/zope/$instance_name      Configuration files
+  /var/log/zope/$instance_name  Log files
\ Brak znaku nowej linii na końcu pliku
diff -urN Zope-2.11.3-final.orig/utilities/mkzopeinstance.py Zope-2.11.3-final/utilities/mkzopeinstance.py
--- Zope-2.11.3-final.orig/utilities/mkzopeinstance.py	2009-05-02 09:46:07.000000000 +0200
+++ Zope-2.11.3-final/utilities/mkzopeinstance.py	2009-06-01 12:03:49.910203053 +0200
@@ -82,11 +82,12 @@
 
     instancehome = skeltarget
     zopehome = os.path.dirname(os.path.dirname(script))
-    softwarehome = os.path.join(zopehome, "lib", "python")
-    configfile = os.path.join(instancehome, 'etc', 'zope.conf')
+    softwarehome = os.path.join(zopehome, "zope")
+    instancename = os.path.basename(instancehome)
+    configfile = os.path.join('/etc/zope', instancename, 'zope.conf')
     if skelsrc is None:
         # default to using stock Zope skeleton source
-        skelsrc = os.path.join(zopehome, "skel")
+        skelsrc = os.path.join("/etc/zope/skel")
 
     inituser = os.path.join(instancehome, "inituser")
     if not (user or os.path.exists(inituser)):
@@ -116,8 +117,10 @@
     kw = {
         "PYTHON":PYTHON,
         "PYTHONW":PYTHONW,
+        "INSTANCE_NAME": instancename,
         "INSTANCE_HOME": instancehome,
         "SOFTWARE_HOME": softwarehome,
+        "CONFIG_FILE": configfile,
         "ZOPE_HOME": zopehome,
         }