Zope-instance_paths.patch

   1 diff -urN Zope-2.11.3-final.orig/skel/bin/runzope.in Zope-2.11.3-final/skel/bin/runzope.in
   2 --- Zope-2.11.3-final.orig/skel/bin/runzope.in  2009-05-02 09:46:08.000000000 +0200
   3 +++ Zope-2.11.3-final/skel/bin/runzope.in       2009-06-01 10:50:59.930385356 +0200
   4 @@ -3,8 +3,8 @@
   5  PYTHON="<<PYTHON>>"
   6  ZOPE_HOME="<<ZOPE_HOME>>"
   7  INSTANCE_HOME="<<INSTANCE_HOME>>"
   8 -CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
   9 -SOFTWARE_HOME="<<SOFTWARE_HOME>>"
  10 +CONFIG_FILE="<<CONFIG_FILE>>"
  11 +SOFTWARE_HOME="<<ZOPE_HOME>>/lib/python"
  12  PYTHONPATH="$SOFTWARE_HOME:$PYTHONPATH"
  13  export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
  14
  15 diff -urN Zope-2.11.3-final.orig/skel/bin/zopectl.in Zope-2.11.3-final/skel/bin/zopectl.in
  16 --- Zope-2.11.3-final.orig/skel/bin/zopectl.in  2009-05-02 09:46:08.000000000 +0200
  17 +++ Zope-2.11.3-final/skel/bin/zopectl.in       2009-06-01 10:51:35.387136006 +0200
  18 @@ -3,8 +3,8 @@
  19  PYTHON="<<PYTHON>>"
  20  ZOPE_HOME="<<ZOPE_HOME>>"
  21  INSTANCE_HOME="<<INSTANCE_HOME>>"
  22 -CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
  23 -SOFTWARE_HOME="<<SOFTWARE_HOME>>"
  24 +CONFIG_FILE="<<CONFIG_FILE>>"
  25 +SOFTWARE_HOME="<<ZOPE_HOME>>/lib/python"
  26  PYTHONPATH="$SOFTWARE_HOME:$PYTHONPATH"
  27  export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
  28
  29 diff -urN Zope-2.11.3-final.orig/skel/etc/zope.conf.in Zope-2.11.3-final/skel/etc/zope.conf.in
  30 --- Zope-2.11.3-final.orig/skel/etc/zope.conf.in        2009-05-02 09:46:08.000000000 +0200
  31 +++ Zope-2.11.3-final/skel/etc/zope.conf.in     2009-06-01 11:19:48.451080947 +0200
  32 @@ -24,6 +24,7 @@
  33
  34  %define INSTANCE <<INSTANCE_HOME>>
  35  %define ZOPE <<ZOPE_HOME>>
  36 +%define INSTANCE_NAME <<INSTANCE_NAME>>
  37
  38  # Directive: instancehome
  39  #
  40 @@ -802,7 +803,7 @@
  41  <eventlog>
  42    level info
  43    <logfile>
  44 -    path $INSTANCE/log/event.log
  45 +    path /var/log/zope/$INSTANCE_NAME/event.log
  46      level info
  47    </logfile>
  48  </eventlog>
  49 @@ -810,7 +811,7 @@
  50  <logger access>
  51    level WARN
  52    <logfile>
  53 -    path $INSTANCE/log/Z2.log
  54 +    path /var/log/zope/$INSTANCE_NAME/Z2.log
  55      format %(message)s
  56    </logfile>
  57  </logger>
  58 diff -urN Zope-2.11.3-final.orig/skel/log/README.txt Zope-2.11.3-final/skel/log/README.txt
  59 --- Zope-2.11.3-final.orig/skel/log/README.txt  2009-05-02 09:46:08.000000000 +0200
  60 +++ Zope-2.11.3-final/skel/log/README.txt       2009-06-01 11:20:17.800185834 +0200
  61 @@ -1 +1 @@
  62 -This is the directory used to hold log files by default.
  63 +
  64 diff -urN Zope-2.11.3-final.orig/skel/README.txt Zope-2.11.3-final/skel/README.txt
  65 --- Zope-2.11.3-final.orig/skel/README.txt      2009-05-02 09:46:08.000000000 +0200
  66 +++ Zope-2.11.3-final/skel/README.txt   2009-06-01 10:49:59.224643237 +0200
  67 @@ -2,9 +2,12 @@
  68  server.  It contains the following directories:
  69
  70    bin/         Scripts used to control the Zope instance
  71 -  etc/         Configuration files
  72    Extensions/  Python sources for External Methods
  73 -  log/         Log files
  74    lib/python/  Installed Python packages specific to the instance
  75    Products/    Installed Zope Products specific to the instance
  76    var/         Run-time data files, including the object database
  77 +
  78 +In PLD some files are placed outside "instance home":
  79 +
  80 +  /etc/zope/$instance_name      Configuration files
  81 +  /var/log/zope/$instance_name  Log files
  82 \ Brak znaku nowej linii na końcu pliku
  83 diff -urN Zope-2.11.3-final.orig/utilities/mkzopeinstance.py Zope-2.11.3-final/utilities/mkzopeinstance.py
  84 --- Zope-2.11.3-final.orig/utilities/mkzopeinstance.py  2009-05-02 09:46:07.000000000 +0200
  85 +++ Zope-2.11.3-final/utilities/mkzopeinstance.py       2009-06-01 12:03:49.910203053 +0200
  86 @@ -82,11 +82,12 @@
  87
  88      instancehome = skeltarget
  89      zopehome = os.path.dirname(os.path.dirname(script))
  90 -    softwarehome = os.path.join(zopehome, "lib", "python")
  91 -    configfile = os.path.join(instancehome, 'etc', 'zope.conf')
  92 +    softwarehome = os.path.join(zopehome, "zope")
  93 +    instancename = os.path.basename(instancehome)
  94 +    configfile = os.path.join('/etc/zope', instancename, 'zope.conf')
  95      if skelsrc is None:
  96          # default to using stock Zope skeleton source
  97 -        skelsrc = os.path.join(zopehome, "skel")
  98 +        skelsrc = os.path.join("/etc/zope/skel")
  99
 100      inituser = os.path.join(instancehome, "inituser")
 101      if not (user or os.path.exists(inituser)):
 102 @@ -116,8 +117,10 @@
 103      kw = {
 104          "PYTHON":PYTHON,
 105          "PYTHONW":PYTHONW,
 106 +        "INSTANCE_NAME": instancename,
 107          "INSTANCE_HOME": instancehome,
 108          "SOFTWARE_HOME": softwarehome,
 109 +        "CONFIG_FILE": configfile,
 110          "ZOPE_HOME": zopehome,
 111          }
 112