Revision fe243425

b/pithos/settings.d/00-apps.conf
6 6

  
7 7
MIDDLEWARE_CLASSES = (
8 8
    'django.middleware.common.CommonMiddleware',
9
    'pithos.middleware.URLEncodedHeadersMiddleware',
9 10
    'pithos.middleware.LoggingConfigMiddleware',
10 11
    'pithos.middleware.AuthMiddleware'
11 12
)
......
21 22
INSTALLED_APPS = (
22 23
    'pithos.api',
23 24
    'pithos.im',
24
    'pithos.public',
25
    'pithos.ui'
25
    'pithos.ui',
26
    'south'
26 27
)
b/pithos/settings.d/00-deploy.conf
3 3

  
4 4
TEST = False
5 5

  
6
# Bypass authentication for user administration.
7
BYPASS_ADMIN_AUTH = False
8

  
9 6
ADMINS = (
10 7
    # ('Your Name', 'your_email@domain.com'),
11 8
)
......
15 12
# Make this unique, and don't share it with anybody.
16 13
SECRET_KEY = '$j0cdrfm*0sc2j+e@@2f-&3-_@2=^!z#+b-8o4_i10@2%ev7si'
17 14

  
18
# Address to use for outgoing emails
19
DEFAULT_FROM_EMAIL = 'Pithos <no-reply@grnet.gr>'
20
DEFAULT_CONTACT_EMAIL = 'support@pithos.grnet.gr'
21

  
22
FEEDBACK_FROM_EMAIL = DEFAULT_FROM_EMAIL
23
FEEDBACK_CONTACT_EMAIL = DEFAULT_CONTACT_EMAIL
24

  
25 15
# Use to log to a file.
26 16
LOGFILE = None
27 17

  
b/pithos/settings.d/20-im.conf
2 2
# to be this many hours after their creation time.
3 3
AUTH_TOKEN_DURATION = 30 * 24
4 4

  
5
# Bypass authentication for user administration.
6
BYPASS_ADMIN_AUTH = False
7

  
8
# Show these many users per page in admin interface.
9
ADMIN_PAGE_LIMIT = 100
10

  
5 11
# Authenticate via Twitter.
6 12
TWITTER_KEY = ''
7 13
TWITTER_SECRET = ''
......
16 22

  
17 23
SERVICE_NAME = 'Pithos'
18 24

  
25
# Address to use for outgoing emails
26
DEFAULT_FROM_EMAIL = 'Pithos <no-reply@grnet.gr>'
27
DEFAULT_CONTACT_EMAIL = 'support@pithos.grnet.gr'
28

  
19 29
# Where users should login with their invitation code
20 30
INVITATION_LOGIN_TARGET = '%s/im/login/invitation?code=%d&next=%s'
21 31

  
/dev/null
1
# Show these many users per page in admin interface.
2
ADMIN_PAGE_LIMIT = 100
b/pithos/settings.d/30-ui.conf
1
FEEDBACK_FROM_EMAIL = DEFAULT_FROM_EMAIL
2
FEEDBACK_CONTACT_EMAIL = DEFAULT_CONTACT_EMAIL

Also available in: Unified diff