Add DB Mixin classes and use them

[mediagoblin.git] / paste.ini

diff --git a/paste.ini b/paste.ini
index 7eee528b4d98dfeb90b5936aca5fa2d573d785b1..c729e41d6d78dcdbf2f5064cdb9deeb7782e63b2 100644 (file)
--- 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
@@ -14,7 +17,7 @@ use = egg:Paste#urlmap
 [app:mediagoblin]
 use = egg:mediagoblin#app
 filter-with = beaker
-config = %(here)s/mediagoblin.ini
+config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini
 
 [app:publicstore_serve]
 use = egg:Paste#static
@@ -38,7 +41,38 @@ beaker.session.lock_dir = %(here)s/user_dev/beaker/sessions/lock
 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