]>
Commit | Line | Data |
---|---|---|
6b13d2ac JK |
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 | |
4 | @@ -2,8 +2,11 @@ | |
5 | server. It contains the following directories: | |
6 | ||
7 | bin/ Scripts used to control the Zope instance | |
8 | - etc/ Configuration files | |
9 | Extensions/ Python sources for External Methods | |
10 | - log/ Log files | |
11 | Products/ Installed products specific to the instance | |
12 | var/ Run-time data files, including the object database | |
13 | + | |
14 | +In PLD some files are placed outside "instance home": | |
15 | + | |
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 | |
21 | @@ -3,7 +3,7 @@ | |
22 | PYTHON="<<PYTHON>>" | |
23 | ZOPE_HOME="<<ZOPE_HOME>>" | |
24 | INSTANCE_HOME="<<INSTANCE_HOME>>" | |
25 | -CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf" | |
26 | +CONFIG_FILE="<<CONFIG_FILE>>" | |
27 | SOFTWARE_HOME="<<SOFTWARE_HOME>>" | |
28 | PYTHONPATH="$SOFTWARE_HOME" | |
29 | export PYTHONPATH | |
30 | diff -durN Zope-2.7.0-b2.orig/skel/bin/zopectl.in Zope-2.7.0-b2/skel/bin/zopectl.in | |
31 | --- Zope-2.7.0-b2.orig/skel/bin/zopectl.in Thu Jul 24 22:19:19 2003 | |
32 | +++ Zope-2.7.0-b2/skel/bin/zopectl.in Sat Nov 15 10:05:56 2003 | |
33 | @@ -3,7 +3,7 @@ | |
34 | PYTHON="<<PYTHON>>" | |
35 | ZOPE_HOME="<<ZOPE_HOME>>" | |
36 | INSTANCE_HOME="<<INSTANCE_HOME>>" | |
37 | -CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf" | |
38 | +CONFIG_FILE="<<CONFIG_FILE>>" | |
39 | SOFTWARE_HOME="<<SOFTWARE_HOME>>" | |
40 | PYTHONPATH="$SOFTWARE_HOME" | |
41 | export PYTHONPATH | |
42 | diff -durN Zope-2.7.0-b2.orig/skel/etc/zope.conf.in Zope-2.7.0-b2/skel/etc/zope.conf.in | |
43 | --- Zope-2.7.0-b2.orig/skel/etc/zope.conf.in Sat Nov 15 09:59:53 2003 | |
44 | +++ Zope-2.7.0-b2/skel/etc/zope.conf.in Sat Nov 15 10:07:08 2003 | |
45 | @@ -11,6 +11,7 @@ | |
46 | ||
47 | %define INSTANCE <<INSTANCE_HOME>> | |
48 | %define ZOPE <<ZOPE_HOME>> | |
49 | +%define INSTANCE_NAME <<INSTANCE_NAME>> | |
50 | ||
51 | # Directive: instancehome | |
52 | # | |
53 | @@ -651,7 +652,7 @@ | |
54 | <eventlog> | |
55 | level all | |
56 | <logfile> | |
57 | - path $INSTANCE/log/event.log | |
58 | + path /var/log/zope/$INSTANCE_NAME/event.log | |
59 | level info | |
60 | </logfile> | |
61 | </eventlog> | |
62 | @@ -659,7 +660,7 @@ | |
63 | <logger access> | |
64 | level WARN | |
65 | <logfile> | |
66 | - path $INSTANCE/log/Z2.log | |
67 | + path /var/log/zope/$INSTANCE_NAME/Z2.log | |
68 | format %(message)s | |
69 | </logfile> | |
70 | </logger> | |
71 | diff -durN Zope-2.7.0-b2.orig/skel/log/README.txt Zope-2.7.0-b2/skel/log/README.txt | |
72 | --- Zope-2.7.0-b2.orig/skel/log/README.txt Tue Mar 18 22:22:05 2003 | |
73 | +++ Zope-2.7.0-b2/skel/log/README.txt Thu Jan 1 01:00:00 1970 | |
74 | @@ -1 +0,0 @@ | |
75 | -This is the directory used to hold log files by default. | |
76 | diff -durN Zope-2.7.0-b2.orig/utilities/mkzopeinstance.py Zope-2.7.0-b2/utilities/mkzopeinstance.py | |
77 | --- Zope-2.7.0-b2.orig/utilities/mkzopeinstance.py Mon Aug 25 23:32:48 2003 | |
78 | +++ Zope-2.7.0-b2/utilities/mkzopeinstance.py Sat Nov 15 10:05:23 2003 | |
79 | @@ -81,11 +81,12 @@ | |
80 | ||
81 | instancehome = skeltarget | |
82 | zopehome = os.path.dirname(os.path.dirname(script)) | |
83 | - softwarehome = os.path.join(zopehome, "lib", "python") | |
84 | - configfile = os.path.join(instancehome, 'etc', 'zope.conf') | |
85 | + softwarehome = os.path.join(zopehome, "zope") | |
86 | + instancename = os.path.basename(instancehome) | |
87 | + configfile = os.path.join('/etc/zope', instancename, 'zope.conf') | |
88 | if skelsrc is None: | |
89 | # default to using stock Zope skeleton source | |
90 | - skelsrc = os.path.join(zopehome, "skel") | |
91 | + skelsrc = os.path.join("/etc/zope/skel") | |
92 | ||
93 | inituser = os.path.join(instancehome, "inituser") | |
94 | if not (user or os.path.exists(inituser)): | |
95 | @@ -113,8 +114,10 @@ | |
96 | kw = { | |
97 | "PYTHON":PYTHON, | |
98 | "PYTHONW":PYTHONW, | |
99 | + "INSTANCE_NAME": instancename, | |
100 | "INSTANCE_HOME": instancehome, | |
101 | "SOFTWARE_HOME": softwarehome, | |
102 | + "CONFIG_FILE": configfile, | |
103 | "ZOPE_HOME": zopehome, | |
104 | } | |
105 |