summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/basiclayout/development.ini
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-11-20 22:47:52 -0500
committerChris McDonough <chrism@plope.com>2012-11-20 22:47:52 -0500
commitc6a575052ae14e515c288e77a452440030c1cdcd (patch)
tree7bf6dc6f2b929e5a206aae6d751b0cda5d96aefd /docs/tutorials/wiki2/src/basiclayout/development.ini
parent8f4fcc47c9405f20cfed3a40931f12534b3b7193 (diff)
parentb5e4443dd28f3d4ed6e767e06d658838575d159e (diff)
downloadpyramid-c6a575052ae14e515c288e77a452440030c1cdcd.tar.gz
pyramid-c6a575052ae14e515c288e77a452440030c1cdcd.tar.bz2
pyramid-c6a575052ae14e515c288e77a452440030c1cdcd.zip
Merge branch 'master' into sontek-fix_commands
Diffstat (limited to 'docs/tutorials/wiki2/src/basiclayout/development.ini')
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/development.ini20
1 files changed, 17 insertions, 3 deletions
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index eb2f878c5..a9d53b296 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -1,3 +1,8 @@
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
+###
+
[app:main]
use = egg:tutorial
@@ -12,12 +17,23 @@ pyramid.includes =
sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
+# By default, the toolbar only appears for clients from IP addresses
+# '127.0.0.1' and '::1'.
+# debugtoolbar.hosts = 127.0.0.1 ::1
+
+###
+# wsgi server configuration
+###
+
[server:main]
use = egg:waitress#main
host = 0.0.0.0
port = 6543
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
+###
[loggers]
keys = root, tutorial, sqlalchemy
@@ -53,5 +69,3 @@ formatter = generic
[formatter_generic]
format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration