X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=paste.ini;h=ce3f01e85d7b8e8d0a47cd5a984151cd46d1b047;hb=91a7b1226cb95a8d61f7cc19be56ae472289639c;hp=13c152094898d66a29edad64754be1cd7bfa3c85;hpb=73079ac4b8a8b3b355867a1e98aca63313597ad0;p=mediagoblin.git

diff --git a/paste.ini b/paste.ini
index 13c15209..ce3f01e8 100644
--- a/paste.ini
+++ b/paste.ini
@@ -6,18 +6,17 @@
 debug = false
 
 [pipeline:main]
-pipeline = errors routing
-
-[composite:routing]
-use = egg:Paste#urlmap
-/ = mediagoblin
-/mgoblin_media/ = publicstore_serve
-/mgoblin_static/ = mediagoblin_static
+# pipeline = errors mediagoblin
+pipeline = mediagoblin
 
 [app:mediagoblin]
 use = egg:mediagoblin#app
-filter-with = beaker
 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
@@ -41,24 +40,6 @@ formatter = generic
 [formatter_generic]
 format = %(asctime)s %(levelname)-7.7s [%(name)s] %(message)s
 
-[app:publicstore_serve]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/media/public/
-cache_max_age = 604800
-
-[app:mediagoblin_static]
-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
-
 [filter:errors]
 use = egg:mediagoblin#errors
 debug = false
@@ -71,9 +52,14 @@ debug = false
 # 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
@@ -84,7 +70,7 @@ port = 6543
 # Use this if you want to run on port 6543 and have MediaGoblin be
 # viewable externally
 [server:broadcast]
-use = egg:Paste#http
+use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 
@@ -95,6 +81,6 @@ host = %(fcgi_host)s
 port = %(fcgi_port)s
 
 [server:http]
-use = egg:Paste#http
+use = egg:waitress#main
 host = %(http_host)s
 port = %(http_port)s