diff --git a/CHANGES.rst b/CHANGES.rst index 8ca82522aa..26dcddc03d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -62,6 +62,10 @@ Features Other changes +++++++++++++ +- Change naming for the generated WSGI configurations to ``zope.conf`` and + ``zope.ini`` to match existing documentation for Zope configurations. + (`#571 `_) + - Make Zope write a PID file again under WSGI. This makes interaction with sysadmin tools easier. The PID file path can be set in the Zope configuration with ``pid-filename``, diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst index fd2270f107..bf5b3ea607 100644 --- a/docs/INSTALL.rst +++ b/docs/INSTALL.rst @@ -152,7 +152,7 @@ include the WSGI server software egg in the ``eggs`` specification: gunicorn user = admin:adminpassword http-address = 8080 - wsgi = /path/to/wsgi.ini + wsgi = /path/to/zope.ini On Python 2 you can also forego the use of WSGI and create an old-fashioned ZServer-based installation by pulling in the ``ZServer`` egg and setting diff --git a/docs/operation.rst b/docs/operation.rst index f79f75d512..808ba1004b 100644 --- a/docs/operation.rst +++ b/docs/operation.rst @@ -67,7 +67,7 @@ an existing account with non-admin privileges. Configuring Zope ---------------- -Your instance's configuration is defined in its ``etc/wsgi.conf`` +Your instance's configuration is defined in its ``etc/zope.conf`` and ``etc/zope.ini`` configuration files. When starting Zope, if you see errors indicating that an address is in @@ -88,7 +88,7 @@ After making any changes to the configuration file, you need to restart any running Zope server for the affected instance before changes are in effect. For a full description of the supported sections and directives for -``wsgi.conf``, refer to the machine readable schema description file +``zope.conf``, refer to the machine readable schema description file ``https://rawgit.com/zopefoundation/Zope/master/src/Zope2/Startup/wsgischema.xml``. @@ -184,7 +184,7 @@ module and console script: .. code-block:: console - $ bin/zconsole debug etc/wsgi.conf + $ bin/zconsole debug etc/zope.conf >>> app @@ -204,7 +204,7 @@ Again in the WSGI setup the `zconsole` module and console script can be used: .. code-block:: console - $ bin/zconsole run etc/wsgi.conf ... + $ bin/zconsole run etc/zope.conf ... Adding users @@ -216,7 +216,7 @@ this using `addzope2user` as follows: $ bin/addzope2user user password -The script expects to find the configuration file at ``etc/wsgi.conf``. +The script expects to find the configuration file at ``etc/zope.conf``. Running Zope (plone.recipe.zope2instance install) diff --git a/docs/zope4/migration/zodb.rst b/docs/zope4/migration/zodb.rst index f78d478179..da931a80a8 100644 --- a/docs/zope4/migration/zodb.rst +++ b/docs/zope4/migration/zodb.rst @@ -109,8 +109,8 @@ Migration example - Create a new Zope instance using ``mkwsgiinstance`` - - Update configuration in ``zope.ini`` and ``wsgi.conf`` to match previous - Zope2 instance configuration. + - Update configuration in ``zope.ini`` and ``zope.conf`` to match + previous Zope2 instance configuration. - Run ``zodb-py3migrate-analyze Data.fs`` to determine if third party products have serialized objects into the ZODB that would cause decoding diff --git a/docs/zopebook/AdvZPT.rst b/docs/zopebook/AdvZPT.rst index 195412f0fb..66f84db0dd 100644 --- a/docs/zopebook/AdvZPT.rst +++ b/docs/zopebook/AdvZPT.rst @@ -1214,7 +1214,7 @@ File system caching is activated by setting an environment variable named ``CHAMELEON_CACHE`` to the path of a folder on the filesystem where Chameleon can write its compiled template representation. -Look for or add a section named ``environment`` in ``etc/wsgi.conf`` +Look for or add a section named ``environment`` in ``etc/zope.conf`` and add a suitable filesystem path, for example:: diff --git a/src/Products/PageTemplates/unicodeconflictresolver.py b/src/Products/PageTemplates/unicodeconflictresolver.py index d651162804..e2196f8fd7 100644 --- a/src/Products/PageTemplates/unicodeconflictresolver.py +++ b/src/Products/PageTemplates/unicodeconflictresolver.py @@ -48,7 +48,7 @@ def resolve(self, context, text, expression): class Z2UnicodeEncodingConflictResolver(object): """ This resolver tries to lookup the encoding from the 'default-zpublisher-encoding' setting in the Zope configuration - file and defaults to sys.getdefaultencoding(). + file and defaults to the old ZMI encoding iso-8859-15. """ def __init__(self, mode='strict'): diff --git a/src/Zope2/Startup/tests/test_schema.py b/src/Zope2/Startup/tests/test_schema.py index cdbcc72b6c..24f219535f 100644 --- a/src/Zope2/Startup/tests/test_schema.py +++ b/src/Zope2/Startup/tests/test_schema.py @@ -67,7 +67,7 @@ def load_config_text(self, text): def test_load_config_template(self): import Zope2.utilities base = os.path.dirname(Zope2.utilities.__file__) - fn = os.path.join(base, "skel", "etc", "wsgi.conf.in") + fn = os.path.join(base, "skel", "etc", "zope.conf.in") with codecs.open(fn, encoding='utf-8') as f: text = f.read() self.load_config_text(text) diff --git a/src/Zope2/utilities/finder.py b/src/Zope2/utilities/finder.py index 2060d4b77e..d233f5b6ef 100644 --- a/src/Zope2/utilities/finder.py +++ b/src/Zope2/utilities/finder.py @@ -38,10 +38,10 @@ def get_app(self, config_file=None): def get_zope_conf(self): # the default config file path is assumed to live in - # $instance_home/etc/wsgi.conf, and the console scripts that use this + # $instance_home/etc/zope.conf, and the console scripts that use this # are assumed to live in $instance_home/bin; override if the # environ contains "ZOPE_CONF". ihome = os.path.dirname(os.path.abspath(os.path.dirname(self.cmd))) - default_config_file = os.path.join(ihome, 'etc', 'wsgi.conf') + default_config_file = os.path.join(ihome, 'etc', 'zope.conf') zope_conf = os.environ.get('ZOPE_CONF', default_config_file) return zope_conf diff --git a/src/Zope2/utilities/skel/etc/wsgi.conf.in b/src/Zope2/utilities/skel/etc/zope.conf.in similarity index 100% rename from src/Zope2/utilities/skel/etc/wsgi.conf.in rename to src/Zope2/utilities/skel/etc/zope.conf.in diff --git a/src/Zope2/utilities/skel/etc/zope.ini.in b/src/Zope2/utilities/skel/etc/zope.ini.in index b81187cb9f..71884f4ad0 100644 --- a/src/Zope2/utilities/skel/etc/zope.ini.in +++ b/src/Zope2/utilities/skel/etc/zope.ini.in @@ -1,6 +1,6 @@ [app:zope] use = egg:Zope#main -zope_conf = %(here)s/wsgi.conf +zope_conf = %(here)s/zope.conf [server:main] use = egg:waitress#main