X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=Zope-instance_paths.patch;h=473876e363169fe834ca47abcde2cb8e0b4585dd;hb=c77e910d3f1feacdcbb1a7a4c6fc9783594f9137;hp=9124580e964764e1e96db5113d2b73fd56a4022d;hpb=6b13d2acc292aae2b6305c12425a48e149480735;p=packages%2FZope.git diff --git a/Zope-instance_paths.patch b/Zope-instance_paths.patch index 9124580..473876e 100644 --- a/Zope-instance_paths.patch +++ b/Zope-instance_paths.patch @@ -1,48 +1,35 @@ -diff -durN Zope-2.7.0-b2.orig/skel/README.txt Zope-2.7.0-b2/skel/README.txt ---- Zope-2.7.0-b2.orig/skel/README.txt Tue Mar 18 22:22:00 2003 -+++ Zope-2.7.0-b2/skel/README.txt Sat Nov 15 10:33:17 2003 -@@ -2,8 +2,11 @@ - 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 - Products/ Installed 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 -diff -durN Zope-2.7.0-b2.orig/skel/bin/runzope.in Zope-2.7.0-b2/skel/bin/runzope.in ---- Zope-2.7.0-b2.orig/skel/bin/runzope.in Thu Jul 24 22:19:19 2003 -+++ Zope-2.7.0-b2/skel/bin/runzope.in Sat Nov 15 10:05:42 2003 -@@ -3,7 +3,7 @@ +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="<>" ZOPE_HOME="<>" INSTANCE_HOME="<>" -CONFIG_FILE="<>/etc/zope.conf" +-SOFTWARE_HOME="<>" +CONFIG_FILE="<>" - SOFTWARE_HOME="<>" - 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 ---- Zope-2.7.0-b2.orig/skel/bin/zopectl.in Thu Jul 24 22:19:19 2003 -+++ Zope-2.7.0-b2/skel/bin/zopectl.in Sat Nov 15 10:05:56 2003 -@@ -3,7 +3,7 @@ ++SOFTWARE_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="<>" ZOPE_HOME="<>" INSTANCE_HOME="<>" -CONFIG_FILE="<>/etc/zope.conf" +-SOFTWARE_HOME="<>" +CONFIG_FILE="<>" - SOFTWARE_HOME="<>" - 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 ---- Zope-2.7.0-b2.orig/skel/etc/zope.conf.in Sat Nov 15 09:59:53 2003 -+++ Zope-2.7.0-b2/skel/etc/zope.conf.in Sat Nov 15 10:07:08 2003 -@@ -11,6 +11,7 @@ ++SOFTWARE_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 <> %define ZOPE <> @@ -50,16 +37,16 @@ diff -durN Zope-2.7.0-b2.orig/skel/etc/zope.conf.in Zope-2.7.0-b2/skel/etc/zope. # Directive: instancehome # -@@ -651,7 +652,7 @@ +@@ -802,7 +803,7 @@ - level all + level info - path $INSTANCE/log/event.log + path /var/log/zope/$INSTANCE_NAME/event.log level info -@@ -659,7 +660,7 @@ +@@ -810,7 +811,7 @@ level WARN @@ -68,15 +55,35 @@ diff -durN Zope-2.7.0-b2.orig/skel/etc/zope.conf.in Zope-2.7.0-b2/skel/etc/zope. format %(message)s -diff -durN Zope-2.7.0-b2.orig/skel/log/README.txt Zope-2.7.0-b2/skel/log/README.txt ---- Zope-2.7.0-b2.orig/skel/log/README.txt Tue Mar 18 22:22:05 2003 -+++ Zope-2.7.0-b2/skel/log/README.txt Thu Jan 1 01:00:00 1970 -@@ -1 +0,0 @@ +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 -durN Zope-2.7.0-b2.orig/utilities/mkzopeinstance.py Zope-2.7.0-b2/utilities/mkzopeinstance.py ---- Zope-2.7.0-b2.orig/utilities/mkzopeinstance.py Mon Aug 25 23:32:48 2003 -+++ Zope-2.7.0-b2/utilities/mkzopeinstance.py Sat Nov 15 10:05:23 2003 -@@ -81,11 +81,12 @@ ++ +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)) @@ -92,7 +99,7 @@ diff -durN Zope-2.7.0-b2.orig/utilities/mkzopeinstance.py Zope-2.7.0-b2/utilitie inituser = os.path.join(instancehome, "inituser") if not (user or os.path.exists(inituser)): -@@ -113,8 +114,10 @@ +@@ -116,8 +117,10 @@ kw = { "PYTHON":PYTHON, "PYTHONW":PYTHONW,