Update mkzopesite skeleton.

Provide both a ZServer based etc/zope.conf and 'no HTTP server'
etc/wsgi.conf, both based on a common etc/base.conf.

Also move the full configuration options into an etc/example.conf

.gitignore

@@ -8,8 +8,11 @@ develop/
 develop-eggs/
 dist/
 eggs/
+etc/
 include/
 lib/
+log/
 parts/
+var/
 docs/_build/
 docs/.build/

MANIFEST.in

@@ -15,7 +15,7 @@ global-exclude *.pyo
 global-exclude *.so
 
 include *.py
-include .travis.yml
 include buildout.cfg
 include sources.cfg
+include versions-prod.cfg
 include versions.cfg

src/Zope2/Startup/run.py

@@ -46,7 +46,6 @@ def _setconfig(configfile=None):
     accept a configfile argument (string path) in order to specify
     where the configuration file exists. """
     from Zope2.Startup import options, handlers
-    from App import config
     opts = options.ZopeOptions()
     if configfile:
         opts.configfile = configfile

src/Zope2/Startup/tests/test_schema.py

@@ -72,7 +72,7 @@ def test_load_config_template(self):
         cfg = getConfiguration()
         import Zope2.utilities
         base = os.path.dirname(Zope2.utilities.__file__)
-        fn = os.path.join(base, "skel", "etc", "zope.conf.in")
+        fn = os.path.join(base, "skel", "etc", "base.conf.in")
         f = open(fn)
         text = f.read()
         f.close()

src/Zope2/Startup/zopectl.py

@@ -218,6 +218,8 @@ def do_debug(self, arg):
     def do_foreground(self, arg):
         program = self.options.program
         local_additions = []
+        if not program.count('-C'):
+            local_additions += ['-C', self.options.configfile]
         if not program.count('-X'):
             local_additions += ['-X']
         if not program.count('debug-mode=on'):

src/Zope2/utilities/skel/etc/base.conf.in

@@ -0,0 +1,34 @@
+%define INSTANCE <<INSTANCE_HOME>>
+
+instancehome $INSTANCE
+
+<eventlog>
+  level info
+  <logfile>
+    path $INSTANCE/log/event.log
+    level info
+  </logfile>
+</eventlog>
+
+<logger access>
+  level WARN
+  <logfile>
+    path $INSTANCE/log/Z2.log
+    format %(message)s
+  </logfile>
+</logger>
+
+<zodb_db main>
+   <filestorage>
+     path $INSTANCE/var/Data.fs
+   </filestorage>
+   mount-point /
+</zodb_db>
+
+<zodb_db temporary>
+   <temporarystorage>
+     name temporary storage for sessioning
+   </temporarystorage>
+   mount-point /temp_folder
+   container-class Products.TemporaryFolder.TemporaryContainer
+</zodb_db>