X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=paste.ini;h=3c7eb177921cf990da5050cb1f50ee6ec2eea518;hb=0b1fcaebf5954bc1cc672145b1411b499ebb1bf7;hp=7eee528b4d98dfeb90b5936aca5fa2d573d785b1;hpb=e27396802caaab9a939c56d19c991339157c493f;p=mediagoblin.git

diff --git a/paste.ini b/paste.ini
index 7eee528b..3c7eb177 100644
--- a/paste.ini
+++ b/paste.ini
@@ -1,3 +1,6 @@
+# If you want to make changes to this file, first copy it to
+# paste_local.ini, then make the changes there.
+
 [DEFAULT]
 # Set to true to enable web-based debugging messages and etc.
 debug = false
@@ -10,11 +13,34 @@ use = egg:Paste#urlmap
 / = mediagoblin
 /mgoblin_media/ = publicstore_serve
 /mgoblin_static/ = mediagoblin_static
+/theme_static/ = theme_static
+/plugin_static/ = plugin_static
 
 [app:mediagoblin]
 use = egg:mediagoblin#app
-filter-with = beaker
-config = %(here)s/mediagoblin.ini
+config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini
+
+[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
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-7.7s [%(name)s] %(message)s
 
 [app:publicstore_serve]
 use = egg:Paste#static
@@ -26,19 +52,52 @@ use = egg:Paste#static
 document_root = %(here)s/mediagoblin/static/
 cache_max_age = 86400
 
-[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
+[app:theme_static]
+use = egg:Paste#static
+document_root = %(here)s/user_dev/theme_static/
+cache_max_age = 86400
+
+[app:plugin_static]
+use = egg:Paste#static
+document_root = %(here)s/user_dev/plugin_static/
+cache_max_age = 86400
 
 [filter:errors]
 use = egg:mediagoblin#errors
 debug = false
 
+
+##############################
+# Server configuration options
+##############################
+
+# The server that is run by default.
+# By default, should only be accessable locally
 [server:main]
 use = egg:Paste#http
 host = 127.0.0.1
 port = 6543
+
+#######################
+# 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:Paste#http
+host = 0.0.0.0
+port = 6543
+
+# Use this if you want to connect via fastcgi
+[server:fcgi]
+use = egg:flup#fcgi_fork
+host = %(fcgi_host)s
+port = %(fcgi_port)s
+
+[server:http]
+use = egg:Paste#http
+host = %(http_host)s
+port = %(http_port)s