- quote command-line arguments for zope

Changed files:
    Zope-start.sh -> 1.3
    Zope.init -> 1.9
    Zope.instance -> 1.3

diff --git a/Zope-start.sh b/Zope-start.sh
index b52d610b6d19f4ae7ef49585275e0b8d884e5b3b..3e8eea2c7a19efdcb2da33e762a116a86fbb7a54 100644 (file)
--- a/Zope-start.sh
+++ b/Zope-start.sh
@@ -114,12 +114,13 @@ fi
 # call server
 
 exec python $ZOPE_BASE/z2.py \
--z $INSTANCE_HOME  \
--t $NUMBER_OF_THREADS \
--u $ZOPE_USER  \
--w $HTTP_PORT  \
--f $FTP_PORT   \
--l $LOG_FILE   \
+-z "$INSTANCE_HOME"  \
+-t "$NUMBER_OF_THREADS" \
+-u "$ZOPE_USER"  \
+-w "$HTTP_PORT"  \
+-f "$FTP_PORT"   \
+-W "$WEBDAV_PORT"   \
+-l "$LOG_FILE"   \
 $ipstr \
 $icpstr  \
 $manager \

diff --git a/Zope.init b/Zope.init
index dfd99ec741e88011a91292b1aea868bdebd74369..c783a346c034ef76d04bc480eef4b984b41588dd 100644 (file)
--- a/Zope.init
+++ b/Zope.init
@@ -36,8 +36,14 @@ unset_vars()
 {
     unset INSTANCE_NAME INSTANCE_HOME INST_HOME CGIBIN_BASE LOG_FILE
     unset ZOPE_BASE ZOPE_USER NUMBER_OF_THREADS ZOPE_HOME
-    unset IP_ADDRESS HTTP_PORT FTP_PORT WATCHDOG
+    unset IP_ADDRESS HTTP_PORT FTP_PORT WEBDAV_PORT WATCHDOG
     unset IPC_PORT LOC DEBUG_MODE DETAILED_LOG_FILE
+
+    # by default disable any access
+    HTTP_PORT="-"
+    ICP_PORT="-"
+    FTP_PORT="-"
+    WEBDAV_PORT="-"
 }
 
 start_instance()

diff --git a/Zope.instance b/Zope.instance
index 34e29da01a6bb6ad345066343369e4a6ddc2fd47..ab5264a0bfcd524c6ef2b05ce7b258bce09daebe 100644 (file)
--- a/Zope.instance
+++ b/Zope.instance
@@ -21,10 +21,11 @@ ZOPE_USER=zope
 # empty means to listen on all interfaces
 IP_ADDRESS=
 
-# ports to listen on (0 means disabled)
+# ports to listen on (unset or "-" means disabled)
 HTTP_PORT=80
 FTP_PORT=21
 IPC_PORT=80
+#WEBDAV_PORT=9800
 
 # number of the initial threads to run
 NUMBER_OF_THREADS=4