X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=paste.ini;h=cbc37bba210feb2d7dc02ec1c81aaf55321a6478;hb=e94f94e639a8401cc558b301f3f818bc8a9d5968;hp=73fbe8e8de09b9a5ab1045d9ed3c5c09d27aa441;hpb=41f965c59d0f0673ac6e9f373e60226b3e768559;p=mediagoblin.git

diff --git a/paste.ini b/paste.ini
index 73fbe8e8..cbc37bba 100644
--- a/paste.ini
+++ b/paste.ini
@@ -1,34 +1,80 @@
+# If you want to make changes to this file, first copy it to
+# paste_local.ini, then make the changes there.
+
 [DEFAULT]
-debug = true
+# Set to true to enable web-based debugging messages and etc.
+debug = false
 
-[composite:main]
-use = egg:Paste#urlmap
-/ = mediagoblin
-/mgoblin_media/ = publicstore_serve
-/mgoblin_static/ = mediagoblin_static
+[pipeline:main]
+# pipeline = errors mediagoblin
+pipeline = mediagoblin
 
 [app:mediagoblin]
 use = egg:mediagoblin#app
-filter-with = beaker
-config = %(here)s/mediagoblin.ini
+config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini
+# static paths
+/mgoblin_media = %(here)s/user_dev/media/public
+/mgoblin_static = %(here)s/mediagoblin/static
+/theme_static = %(here)s/user_dev/theme_static
+/plugin_static = %(here)s/user_dev/plugin_static
+
+[loggers]
+keys = root
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
 
-[app:publicstore_serve]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/media/public/
+[formatter_generic]
+format = %(asctime)s %(levelname)-7.7s [%(name)s] %(message)s
 
-[app:mediagoblin_static]
-use = egg:Paste#static
-document_root = %(here)s/mediagoblin/static/
+[filter:errors]
+use = egg:mediagoblin#errors
+debug = false
 
-[filter:beaker]
-use = egg:Beaker#beaker_session
-cache_dir = %(here)s/user_dev/beaker
-beaker.session.key = mediagoblin
-# beaker.session.secret = somesupersecret
-beaker.session.data_dir = %(here)s/user_dev/beaker/sessions/data
-beaker.session.lock_dir = %(here)s/user_dev/beaker/sessions/lock
 
+##############################
+# Server configuration options
+##############################
+
+# The server that is run by default.
+# By default, should only be accessable locally
 [server:main]
-use = egg:Paste#http
+use = egg:waitress#main
 host = 127.0.0.1
 port = 6543
+# # Gunicorn settings. See http://docs.gunicorn.org/en/19.0/settings.html
+# # for more information about configuring Gunicorn
+# proc_name = gmg
+# reload = true
+# accesslog = -
+
+#######################
+# Helper server configs
+# ---------------------
+#   If you are configuring the paste config manually, you can remove
+#   these.
+
+# Use this if you want to run on port 6543 and have MediaGoblin be
+# viewable externally
+[server:broadcast]
+use = egg:waitress#main
+host = 0.0.0.0
+port = 6543
+
+[server:http]
+use = egg:waitress#main
+host = %(http_host)s
+port = %(http_port)s