Bert JW Regeer
2016-12-07 988c1f789faf9662abead1e1be40969be37867a8
Revert "Changed 'host' and 'port' configuration to a new 'listen' style that …"
65 files modified
203 ■■■■■ changed files
CHANGES.txt 3 ●●●●● patch | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● patch | view | raw | blame | history
docs/narr/MyProject/development.ini 3 ●●●● patch | view | raw | blame | history
docs/narr/MyProject/production.ini 3 ●●●● patch | view | raw | blame | history
docs/narr/project.rst 11 ●●●● patch | view | raw | blame | history
docs/narr/startup.rst 4 ●●●● patch | view | raw | blame | history
docs/quick_tour/package/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tour/sqla_demo/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tour/sqla_demo/production.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/authentication/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/authorization/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/databases/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/debugtoolbar/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/forms/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/functional_testing/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/ini/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/jinja2/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/json/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/logging/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/more_view_classes/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/request_response/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/retail_forms/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/routing/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/scaffolds/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/scaffolds/production.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/sessions/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/static_assets/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/templating/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/unit_testing/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/view_classes/development.ini 3 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/views/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/authorization/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/authorization/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/installation/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/installation/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/models/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/models/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/tests/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/tests/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/views/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/views/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/installation/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/installation/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/models/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/models/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/tests/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/tests/production.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/views/development.ini 3 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/views/production.ini 3 ●●●● patch | view | raw | blame | history
pyramid/scaffolds/alchemy/development.ini_tmpl 3 ●●●● patch | view | raw | blame | history
pyramid/scaffolds/alchemy/production.ini_tmpl 3 ●●●● patch | view | raw | blame | history
pyramid/scaffolds/starter/development.ini_tmpl 3 ●●●● patch | view | raw | blame | history
pyramid/scaffolds/starter/production.ini_tmpl 3 ●●●● patch | view | raw | blame | history
pyramid/scaffolds/zodb/development.ini_tmpl 3 ●●●● patch | view | raw | blame | history
pyramid/scaffolds/zodb/production.ini_tmpl 3 ●●●● patch | view | raw | blame | history
pyramid/tests/test_scaffolds/fixture_scaffold/development.ini_tmpl 3 ●●●● patch | view | raw | blame | history
pyramid/tests/test_scaffolds/fixture_scaffold/production.ini_tmpl 3 ●●●● patch | view | raw | blame | history
CHANGES.txt
@@ -119,9 +119,6 @@
  See https://github.com/Pylons/pyramid/pull/2805
- Scaffolds, documentation and tutorials now use ``listen`` option instead
  of ``host`` and ``port`` to configure Waitress server.
Bug Fixes
---------
CONTRIBUTORS.txt
@@ -288,5 +288,3 @@
- Moriyoshi Koizumi, 2016/11/20
- Mikko Ohtamaa, 2016/12/6
- Martin Frlin, 2016/12/6
docs/narr/MyProject/development.ini
@@ -24,7 +24,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/narr/MyProject/production.ini
@@ -18,7 +18,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/narr/project.rst
@@ -295,15 +295,16 @@
Access is restricted such that only a browser running on the same machine as
Pyramid will be able to access your Pyramid application.  However, if you want
to open access to other machines on the same network, then edit the
``development.ini`` file, and replace the ``listen`` value in the
``[server:main]`` section, changing it from ``127.0.0.1:6543`` to ``0.0.0.0:6543``.  For
``development.ini`` file, and replace the ``host`` value in the
``[server:main]`` section, changing it from ``127.0.0.1`` to ``0.0.0.0``.  For
example:
.. code-block:: ini
   [server:main]
   use = egg:waitress#main
   listen = 0.0.0.0:6543
   host = 0.0.0.0
   port = 6543
Now when you use ``pserve`` to start the application, it will respond to
requests on *all* IP addresses possessed by your system, not just requests to
@@ -319,8 +320,8 @@
You can change the port on which the server runs on by changing the same
portion of the ``development.ini`` file.  For example, you can change the
``listen = 127.0.0.1:6543`` line in the ``development.ini`` file's ``[server:main]``
section to ``listen = 127:0.0.1:8080`` to run the server on port 8080 instead of port 6543.
``port = 6543`` line in the ``development.ini`` file's ``[server:main]``
section to ``port = 8080`` to run the server on port 8080 instead of port 6543.
You can shut down a server started this way by pressing ``Ctrl-C`` (or
``Ctrl-Break`` on Windows).
docs/narr/startup.rst
@@ -130,8 +130,8 @@
#. ``pserve`` starts the WSGI *server* defined within the ``[server:main]``
   section.  In our case, this is the Waitress server (``use =
   egg:waitress#main``), and it will listen on all interfaces (``listen =
   127.0.0.1:6543``), on port number 6543. The server code itself
   egg:waitress#main``), and it will listen on all interfaces (``host =
   127.0.0.1``), on port number 6543 (``port = 6543``). The server code itself
   is what prints ``serving on http://127.0.0.1:6543``. The server serves the
   application, and the application is running, waiting to receive requests.
docs/quick_tour/package/development.ini
@@ -25,7 +25,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/quick_tour/sqla_demo/development.ini
@@ -27,7 +27,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/quick_tour/sqla_demo/production.ini
@@ -18,7 +18,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/quick_tutorial/authentication/development.ini
@@ -7,4 +7,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/authorization/development.ini
@@ -7,4 +7,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/databases/development.ini
@@ -9,7 +9,8 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
# Begin logging configuration
docs/quick_tutorial/debugtoolbar/development.ini
@@ -5,4 +5,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/forms/development.ini
@@ -6,4 +6,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/functional_testing/development.ini
@@ -5,4 +5,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/ini/development.ini
@@ -3,4 +3,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/jinja2/development.ini
@@ -6,4 +6,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/json/development.ini
@@ -6,4 +6,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/logging/development.ini
@@ -6,7 +6,8 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
# Begin logging configuration
docs/quick_tutorial/more_view_classes/development.ini
@@ -6,4 +6,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/request_response/development.ini
@@ -6,4 +6,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/retail_forms/development.ini
@@ -6,4 +6,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/routing/development.ini
@@ -6,4 +6,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/scaffolds/development.ini
@@ -24,7 +24,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/quick_tutorial/scaffolds/production.ini
@@ -18,7 +18,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/quick_tutorial/sessions/development.ini
@@ -6,4 +6,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/static_assets/development.ini
@@ -6,4 +6,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/templating/development.ini
@@ -6,4 +6,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/unit_testing/development.ini
@@ -5,4 +5,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/view_classes/development.ini
@@ -6,4 +6,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/quick_tutorial/views/development.ini
@@ -5,4 +5,5 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
docs/tutorials/wiki/src/authorization/development.ini
@@ -29,7 +29,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki/src/authorization/production.ini
@@ -24,7 +24,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki/src/basiclayout/development.ini
@@ -29,7 +29,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki/src/basiclayout/production.ini
@@ -24,7 +24,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki/src/installation/development.ini
@@ -29,7 +29,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki/src/installation/production.ini
@@ -24,7 +24,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki/src/models/development.ini
@@ -29,7 +29,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki/src/models/production.ini
@@ -24,7 +24,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki/src/tests/development.ini
@@ -29,7 +29,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki/src/tests/production.ini
@@ -24,7 +24,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki/src/views/development.ini
@@ -29,7 +29,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki/src/views/production.ini
@@ -24,7 +24,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/authentication/development.ini
@@ -29,7 +29,8 @@
[server:main]
use = egg:waitress#main
list = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/authentication/production.ini
@@ -18,7 +18,8 @@
[server:main]
use = egg:waitress#main
list = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/authorization/development.ini
@@ -29,7 +29,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/authorization/production.ini
@@ -18,7 +18,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -27,7 +27,8 @@
[server:main]
use = egg:waitress#main
list = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -16,7 +16,8 @@
[server:main]
use = egg:waitress#main
list = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/installation/development.ini
@@ -27,7 +27,8 @@
[server:main]
use = egg:waitress#main
list = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/installation/production.ini
@@ -16,7 +16,8 @@
[server:main]
use = egg:waitress#main
list = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/models/development.ini
@@ -27,7 +27,8 @@
[server:main]
use = egg:waitress#main
list = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/models/production.ini
@@ -16,7 +16,8 @@
[server:main]
use = egg:waitress#main
list = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/tests/development.ini
@@ -29,7 +29,8 @@
[server:main]
use = egg:waitress#main
list = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/tests/production.ini
@@ -18,7 +18,8 @@
[server:main]
use = egg:waitress#main
list = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/views/development.ini
@@ -27,7 +27,8 @@
[server:main]
use = egg:waitress#main
list = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
docs/tutorials/wiki2/src/views/production.ini
@@ -16,7 +16,8 @@
[server:main]
use = egg:waitress#main
list = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
pyramid/scaffolds/alchemy/development.ini_tmpl
@@ -26,7 +26,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
pyramid/scaffolds/alchemy/production.ini_tmpl
@@ -16,7 +16,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
pyramid/scaffolds/starter/development.ini_tmpl
@@ -24,7 +24,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
pyramid/scaffolds/starter/production.ini_tmpl
@@ -18,7 +18,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
pyramid/scaffolds/zodb/development.ini_tmpl
@@ -29,7 +29,8 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543
host = 127.0.0.1
port = 6543
###
# logging configuration
pyramid/scaffolds/zodb/production.ini_tmpl
@@ -24,7 +24,8 @@
[server:main]
use = egg:waitress#main
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
###
# logging configuration
pyramid/tests/test_scaffolds/fixture_scaffold/development.ini_tmpl
@@ -11,7 +11,8 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
# Begin logging configuration
pyramid/tests/test_scaffolds/fixture_scaffold/production.ini_tmpl
@@ -10,7 +10,8 @@
[server:main]
use = egg:pyramid#wsgiref
listen = 0.0.0.0:6543
host = 0.0.0.0
port = 6543
# Begin logging configuration