[Zope3-checkins] SVN: Zope3/branches/3.2/ backported fix r41267 from trunk

[Bernd Dorn]

Log message for revision 66944:
  backported fix r41267 from trunk

Changed:
  U   Zope3/branches/3.2/doc/CHANGES.txt
  U   Zope3/branches/3.2/zopeskel/etc/zdaemon.conf.in

-=-
Modified: Zope3/branches/3.2/doc/CHANGES.txt
===================================================================
--- Zope3/branches/3.2/doc/CHANGES.txt	2006-04-14 13:48:21 UTC (rev 66943)
+++ Zope3/branches/3.2/doc/CHANGES.txt	2006-04-14 14:09:36 UTC (rev 66944)
@@ -21,6 +21,11 @@
       - Fixed a bug in zope.publisher.http which raises a TypeError
         when using zserver and xmlrpc.
 
+      - set socket-name to $INSTANCE_HOME/var/zopectlsock in
+        zdaemon.conf.in, to prevent conflicts when running multiply
+        instances or as root. the default was zdsock in the directory
+        where zopectl is started from.
+
   Zope 3.2.1 (2006/03/26)
 
     Bug fixes

Modified: Zope3/branches/3.2/zopeskel/etc/zdaemon.conf.in
===================================================================
--- Zope3/branches/3.2/zopeskel/etc/zdaemon.conf.in	2006-04-14 13:48:21 UTC (rev 66943)
+++ Zope3/branches/3.2/zopeskel/etc/zdaemon.conf.in	2006-04-14 14:09:36 UTC (rev 66944)
@@ -1,5 +1,6 @@
 %define INSTANCE <<INSTANCE_HOME>>
 %define LOGDIR $INSTANCE/log
+%define DATADIR $INSTANCE/var
 
 <runner>
   # This tells the runner what program to run.  Don't change this.
@@ -12,13 +13,27 @@
   #
   daemon on
 
-  # If set, this option specifies a file to which all output of theh
+  # If set, this option specifies a file to which all output of the
   # program being run is written when run in daemon mode.  If not set,
   # output from the program is discarded.  This has no effect outside
   # daemon mode.
   #
   transcript $LOGDIR/transcript.log
 
+  # Path to the zopectl socket. Should be accessable by the user the
+  # daemon is running under (see below)
+  #
+  socket-name $DATADIR/zopectlsock
+
+  # If you intend to run Zope as the "root" user, you must supply this
+  # directive with an effective username or userid number.
+  #
+  # Default: unset
+  #
+  # Example:
+  #
+  #  user zope1
+  
 </runner>
 
 <eventlog>