Merge remote-tracking branch 'gitorious/master'

[mediagoblin.git] / mediagoblin.ini

diff --git a/mediagoblin.ini b/mediagoblin.ini
index 4d940e8062a08b9c012f25164940b0ac275b58e0..b85f22ea172886059af537ec73eebeb8303c057f 100644 (file)
--- a/mediagoblin.ini
+++ b/mediagoblin.ini
@@ -5,6 +5,7 @@ debug = true
 use = egg:Paste#urlmap
 / = mediagoblin
 /mgoblin_media/ = publicstore_serve
+/mgoblin_static/ = mediagoblin_static
 
 [app:mediagoblin]
 use = egg:mediagoblin#app
@@ -12,6 +13,10 @@ filter-with = beaker
 queuestore_base_dir = %(here)s/user_dev/media/queue
 publicstore_base_dir = %(here)s/user_dev/media/public
 publicstore_base_url = /mgoblin_media/
+direct_remote_path = /mgoblin_static/
+email_sender_address = "notice@mediagoblin.example.org"
+# set to false to enable sending notices
+email_debug_mode = true
 ## Uncomment this to put some user-overriding templates here
 #local_templates = %(here)s/user_dev/templates/
 
@@ -19,10 +24,9 @@ publicstore_base_url = /mgoblin_media/
 use = egg:Paste#static
 document_root = %(here)s/user_dev/media/public
 
-[server:main]
-use = egg:Paste#http
-host = 127.0.0.1
-port = 6543
+[app:mediagoblin_static]
+use = egg:Paste#static
+document_root = %(here)s/mediagoblin/static/
 
 [filter:beaker]
 use = egg:Beaker#beaker_session
@@ -31,3 +35,8 @@ 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:main]
+use = egg:Paste#http
+host = 127.0.0.1
+port = 6543