Merge pull request #16 from Dijit/master

Updated to reflect the live settings.

Author: kylef

paste/forms.py

@@ -3,6 +3,7 @@
 from paste.models import Snippet
 
 EXPIRE_CHOICES = (
+    (600,        'In 10 minutes'),
     (3600,       'In one hour'),
     (3600*24,    'In one day'),
     (3600*24*7,  'In one week'),

pasteapp/settings.py

@@ -60,14 +60,12 @@
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = ''
+STATIC_ROOT = '/srv/snippt/static'
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
-if DEBUG:
-    STATIC_URL = '/static/'
-else:
-    STATIC_URL = 'http://dl.dropbox.com/u/2325654/paste/'
+STATIC_URL = '/static/'
+
 
 # URL prefix for admin static files -- CSS, JavaScript and images.
 # Make sure to use a trailing slash.