aboutsummaryrefslogtreecommitdiffstats
path: root/paste.ini
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-06-29 04:23:50 +0300
committerBerker Peksag <berker.peksag@gmail.com>2014-06-29 04:23:50 +0300
commit19baab1b034b31a53a0dbddd17d3f31594ce5afc (patch)
tree6957ed3b06cfe5c0212ea0775860b64b2b32bc52 /paste.ini
parentf9d93c0e9a8b5c1958db8771afa84519d63f5b98 (diff)
downloadmediagoblin-19baab1b034b31a53a0dbddd17d3f31594ce5afc.tar.lz
mediagoblin-19baab1b034b31a53a0dbddd17d3f31594ce5afc.tar.xz
mediagoblin-19baab1b034b31a53a0dbddd17d3f31594ce5afc.zip
Remove Paste#http, Paste#urlmap and Paste#static dependencies.
Changes: * Paste#http -> Gunicorn * Paste#urlmap and Paste#static -> werkzeug.wsgi.SharedDataMiddleware
Diffstat (limited to 'paste.ini')
-rw-r--r--paste.ini66
1 files changed, 12 insertions, 54 deletions
diff --git a/paste.ini b/paste.ini
index 3c7eb177..b859251e 100644
--- a/paste.ini
+++ b/paste.ini
@@ -6,19 +6,16 @@
debug = false
[pipeline:main]
-pipeline = errors routing
-
-[composite:routing]
-use = egg:Paste#urlmap
-/ = mediagoblin
-/mgoblin_media/ = publicstore_serve
-/mgoblin_static/ = mediagoblin_static
-/theme_static/ = theme_static
-/plugin_static/ = plugin_static
+pipeline = errors mediagoblin
[app:mediagoblin]
use = egg:mediagoblin#app
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
@@ -42,26 +39,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
-
-[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
@@ -74,30 +51,11 @@ debug = false
# The server that is run by default.
# By default, should only be accessable locally
[server:main]
-use = egg:Paste#http
+use = egg:gunicorn
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
+# Gunicorn settings. See http://docs.gunicorn.org/en/19.0/settings.html
+# for more information about configuring Gunicorn
+proc_name = gmg
+reload = true
+accesslog = -