Update default settings.

Refs #1590

diff --git a/pithos/settings.d/00-apps.conf b/pithos/settings.d/00-apps.conf
index ad74524..e2be3ac 100644 (file)
--- a/pithos/settings.d/00-apps.conf
+++ b/pithos/settings.d/00-apps.conf
@@ -6,6 +6,7 @@ TEMPLATE_LOADERS = (
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
+    'pithos.middleware.URLEncodedHeadersMiddleware',
     'pithos.middleware.LoggingConfigMiddleware',
     'pithos.middleware.AuthMiddleware'
 )
@@ -21,6 +22,6 @@ TEMPLATE_DIRS = (
 INSTALLED_APPS = (
     'pithos.api',
     'pithos.im',
-    'pithos.public',
-    'pithos.ui'
+    'pithos.ui',
+    'south'
 )

diff --git a/pithos/settings.d/00-deploy.conf b/pithos/settings.d/00-deploy.conf
index 9cfadad..2db03a7 100644 (file)
--- a/pithos/settings.d/00-deploy.conf
+++ b/pithos/settings.d/00-deploy.conf
@@ -3,9 +3,6 @@ TEMPLATE_DEBUG = DEBUG
 
 TEST = False
 
-# Bypass authentication for user administration.
-BYPASS_ADMIN_AUTH = False
-
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
@@ -15,13 +12,6 @@ MANAGERS = ADMINS
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '$j0cdrfm*0sc2j+e@@2f-&3-_@2=^!z#+b-8o4_i10@2%ev7si'
 
-# Address to use for outgoing emails
-DEFAULT_FROM_EMAIL = 'Pithos <no-reply@grnet.gr>'
-DEFAULT_CONTACT_EMAIL = 'support@pithos.grnet.gr'
-
-FEEDBACK_FROM_EMAIL = DEFAULT_FROM_EMAIL
-FEEDBACK_CONTACT_EMAIL = DEFAULT_CONTACT_EMAIL
-
 # Use to log to a file.
 LOGFILE = None
 

diff --git a/pithos/settings.d/20-im.conf b/pithos/settings.d/20-im.conf
index eb90ba6..2854bcd 100644 (file)
--- a/pithos/settings.d/20-im.conf
+++ b/pithos/settings.d/20-im.conf
@@ -2,6 +2,12 @@
 # to be this many hours after their creation time.
 AUTH_TOKEN_DURATION = 30 * 24
 
+# Bypass authentication for user administration.
+BYPASS_ADMIN_AUTH = False
+
+# Show these many users per page in admin interface.
+ADMIN_PAGE_LIMIT = 100
+
 # Authenticate via Twitter.
 TWITTER_KEY = ''
 TWITTER_SECRET = ''
@@ -16,6 +22,10 @@ INVITATIONS_PER_LEVEL = {
 
 SERVICE_NAME = 'Pithos'
 
+# Address to use for outgoing emails
+DEFAULT_FROM_EMAIL = 'Pithos <no-reply@grnet.gr>'
+DEFAULT_CONTACT_EMAIL = 'support@pithos.grnet.gr'
+
 # Where users should login with their invitation code
 INVITATION_LOGIN_TARGET = '%s/im/login/invitation?code=%d&next=%s'
 

diff --git a/pithos/settings.d/30-admin.conf b/pithos/settings.d/30-admin.conf
deleted file mode 100644 (file)
index cb425f6..0000000
--- a/pithos/settings.d/30-admin.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Show these many users per page in admin interface.
-ADMIN_PAGE_LIMIT = 100

diff --git a/pithos/settings.d/30-ui.conf b/pithos/settings.d/30-ui.conf
new file mode 100644 (file)
index 0000000..f8041f0
--- /dev/null
+++ b/pithos/settings.d/30-ui.conf
@@ -0,0 +1,2 @@
+FEEDBACK_FROM_EMAIL = DEFAULT_FROM_EMAIL
+FEEDBACK_CONTACT_EMAIL = DEFAULT_CONTACT_EMAIL