1 diff -durN Zope-2.7.0-b2.orig/skel/README.txt Zope-2.7.0-b2/skel/README.txt
2 --- Zope-2.7.0-b2.orig/skel/README.txt Tue Mar 18 22:22:00 2003
3 +++ Zope-2.7.0-b2/skel/README.txt Sat Nov 15 10:33:17 2003
5 server. It contains the following directories:
7 bin/ Scripts used to control the Zope instance
8 - etc/ Configuration files
9 Extensions/ Python sources for External Methods
11 Products/ Installed products specific to the instance
12 var/ Run-time data files, including the object database
14 +In PLD some files are placed outside "instance home":
16 + /etc/zope/$instance_name Configuration files
17 + /var/log/zope/$instance_name Log files
18 diff -durN Zope-2.7.0-b2.orig/skel/bin/runzope.in Zope-2.7.0-b2/skel/bin/runzope.in
19 --- Zope-2.7.0-b2.orig/skel/bin/runzope.in Thu Jul 24 22:19:19 2003
20 +++ Zope-2.7.0-b2/skel/bin/runzope.in Sat Nov 15 10:05:42 2003
23 ZOPE_HOME="<<ZOPE_HOME>>"
24 INSTANCE_HOME="<<INSTANCE_HOME>>"
25 -CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
26 -SOFTWARE_HOME="<<SOFTWARE_HOME>>"
27 +CONFIG_FILE="<<CONFIG_FILE>>"
28 +SOFTWARE_HOME="<<ZOPE_HOME>>/lib/python"
29 PYTHONPATH="$SOFTWARE_HOME"
31 diff -durN Zope-2.7.0-b2.orig/skel/bin/zopectl.in Zope-2.7.0-b2/skel/bin/zopectl.in
32 --- Zope-2.7.0-b2.orig/skel/bin/zopectl.in Thu Jul 24 22:19:19 2003
33 +++ Zope-2.7.0-b2/skel/bin/zopectl.in Sat Nov 15 10:05:56 2003
36 ZOPE_HOME="<<ZOPE_HOME>>"
37 INSTANCE_HOME="<<INSTANCE_HOME>>"
38 -CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
39 -SOFTWARE_HOME="<<SOFTWARE_HOME>>"
40 +CONFIG_FILE="<<CONFIG_FILE>>"
41 +SOFTWARE_HOME="<<ZOPE_HOME>>/lib/python"
42 PYTHONPATH="$SOFTWARE_HOME"
44 diff -durN Zope-2.7.0-b2.orig/skel/etc/zope.conf.in Zope-2.7.0-b2/skel/etc/zope.conf.in
45 --- Zope-2.7.0-b2.orig/skel/etc/zope.conf.in Sat Nov 15 09:59:53 2003
46 +++ Zope-2.7.0-b2/skel/etc/zope.conf.in Sat Nov 15 10:07:08 2003
49 %define INSTANCE <<INSTANCE_HOME>>
50 %define ZOPE <<ZOPE_HOME>>
51 +%define INSTANCE_NAME <<INSTANCE_NAME>>
53 # Directive: instancehome
59 - path $INSTANCE/log/event.log
60 + path /var/log/zope/$INSTANCE_NAME/event.log
68 - path $INSTANCE/log/Z2.log
69 + path /var/log/zope/$INSTANCE_NAME/Z2.log
73 diff -durN Zope-2.7.0-b2.orig/skel/log/README.txt Zope-2.7.0-b2/skel/log/README.txt
74 --- Zope-2.7.0-b2.orig/skel/log/README.txt Tue Mar 18 22:22:05 2003
75 +++ Zope-2.7.0-b2/skel/log/README.txt Thu Jan 1 01:00:00 1970
77 -This is the directory used to hold log files by default.
78 diff -durN Zope-2.7.0-b2.orig/utilities/mkzopeinstance.py Zope-2.7.0-b2/utilities/mkzopeinstance.py
79 --- Zope-2.7.0-b2.orig/utilities/mkzopeinstance.py Mon Aug 25 23:32:48 2003
80 +++ Zope-2.7.0-b2/utilities/mkzopeinstance.py Sat Nov 15 10:05:23 2003
83 instancehome = skeltarget
84 zopehome = os.path.dirname(os.path.dirname(script))
85 - softwarehome = os.path.join(zopehome, "lib", "python")
86 - configfile = os.path.join(instancehome, 'etc', 'zope.conf')
87 + softwarehome = os.path.join(zopehome, "zope")
88 + instancename = os.path.basename(instancehome)
89 + configfile = os.path.join('/etc/zope', instancename, 'zope.conf')
91 # default to using stock Zope skeleton source
92 - skelsrc = os.path.join(zopehome, "skel")
93 + skelsrc = os.path.join("/etc/zope/skel")
95 inituser = os.path.join(instancehome, "inituser")
96 if not (user or os.path.exists(inituser)):
101 + "INSTANCE_NAME": instancename,
102 "INSTANCE_HOME": instancehome,
103 "SOFTWARE_HOME": softwarehome,
104 + "CONFIG_FILE": configfile,
105 "ZOPE_HOME": zopehome,