Revision f46c95c4 snf-astakos-app/astakos/im/settings.py

b/snf-astakos-app/astakos/im/settings.py
103 103
LOGGING_LEVEL = getattr(settings, 'ASTAKOS_LOGGING_LEVEL', INFO)
104 104

  
105 105
# Configurable email subjects
106
INVITATION_EMAIL_SUBJECT = getattr(settings, 'ASTAKOS_INVITATION_EMAIL_SUBJECT',
107
        'Invitation to %s alpha2 testing' % SITENAME)
106
INVITATION_EMAIL_SUBJECT = getattr(
107
    settings, 'ASTAKOS_INVITATION_EMAIL_SUBJECT',
108
    'Invitation to %s alpha2 testing' % SITENAME)
108 109
GREETING_EMAIL_SUBJECT = getattr(settings, 'ASTAKOS_GREETING_EMAIL_SUBJECT',
109
        'Welcome to %s alpha2 testing' % SITENAME)
110
                                 'Welcome to %s alpha2 testing' % SITENAME)
110 111
FEEDBACK_EMAIL_SUBJECT = getattr(settings, 'ASTAKOS_FEEDBACK_EMAIL_SUBJECT',
111
        'Feedback from %s alpha2 testing' % SITENAME)
112
VERIFICATION_EMAIL_SUBJECT = getattr(settings, 'ASTAKOS_VERIFICATION_EMAIL_SUBJECT',
113
        '%s alpha2 testing account activation is needed' % SITENAME)
114
ADMIN_NOTIFICATION_EMAIL_SUBJECT = getattr(settings, 'ASTAKOS_ADMIN_NOTIFICATION_EMAIL_SUBJECT',
115
        '%s alpha2 testing account created (%%(user)s)' % SITENAME)
116
HELPDESK_NOTIFICATION_EMAIL_SUBJECT = getattr(settings, 'ASTAKOS_HELPDESK_NOTIFICATION_EMAIL_SUBJECT',
117
        '%s alpha2 testing account activated (%%(user)s)' % SITENAME)
118
EMAIL_CHANGE_EMAIL_SUBJECT = getattr(settings, 'ASTAKOS_EMAIL_CHANGE_EMAIL_SUBJECT',
119
        'Email change on %s alpha2 testing' % SITENAME)
120
PASSWORD_RESET_EMAIL_SUBJECT = getattr(settings, 'ASTAKOS_PASSWORD_RESET_EMAIL_SUBJECT',
121
        'Password reset on %s alpha2 testing' % SITENAME)
112
                                 'Feedback from %s alpha2 testing' % SITENAME)
113
VERIFICATION_EMAIL_SUBJECT = getattr(
114
    settings, 'ASTAKOS_VERIFICATION_EMAIL_SUBJECT',
115
    '%s alpha2 testing account activation is needed' % SITENAME)
116
ACCOUNT_CREATION_SUBJECT = getattr(
117
    settings, 'ASTAKOS_ACCOUNT_CREATION_SUBJECT',
118
    '%s alpha2 testing account created (%%(user)s)' % SITENAME)
119
GROUP_CREATION_SUBJECT = getattr(settings, 'ASTAKOS_GROUP_CREATION_SUBJECT',
120
                                 '%s alpha2 testing group created (%%(group)s)' % SITENAME)
121
HELPDESK_NOTIFICATION_EMAIL_SUBJECT = getattr(
122
    settings, 'ASTAKOS_HELPDESK_NOTIFICATION_EMAIL_SUBJECT',
123
    '%s alpha2 testing account activated (%%(user)s)' % SITENAME)
124
EMAIL_CHANGE_EMAIL_SUBJECT = getattr(
125
    settings, 'ASTAKOS_EMAIL_CHANGE_EMAIL_SUBJECT',
126
    'Email change on %s alpha2 testing' % SITENAME)
127
PASSWORD_RESET_EMAIL_SUBJECT = getattr(
128
    settings, 'ASTAKOS_PASSWORD_RESET_EMAIL_SUBJECT',
129
    'Password reset on %s alpha2 testing' % SITENAME)
122 130

  
123 131
# Configurable email subjects
124 132
INVITATION_EMAIL_SUBJECT = getattr(settings, 'ASTAKOS_INVITATION_EMAIL_SUBJECT',
......
143 151

  
144 152
# Set the cloud service properties
145 153
SERVICES = getattr(settings, 'ASTAKOS_SERVICES',
146
                   {'cyclades': {'url':'https://node1.example.com/ui/',
154
                   {'cyclades': {'url': 'https://node1.example.com/ui/',
147 155
                                 'quota': {'vm': 2}},
148
                    'pithos+':  {'url':'https://node2.example.com/ui/',
149
                                 'quota': {'diskspace': 50 * 1024 * 1024 * 1024}}})
156
                    'pithos+': {'url': 'https://node2.example.com/ui/',
157
                                'quota': {'diskspace': 50 * 1024 * 1024 * 1024}}})
150 158

  
151 159
# Set the billing URI
152 160
AQUARIUM_URL = getattr(settings, 'ASTAKOS_AQUARIUM_URL', '')
153 161

  
154 162
# Set how many objects should be displayed per page
155
PAGINATE_BY = getattr(settings, 'ASTAKOS_PAGINATE_BY', 8)
163
PAGINATE_BY = getattr(settings, 'ASTAKOS_PAGINATE_BY', 8)
164

  
165
# Enforce token renewal on password change/reset
166
NEWPASSWD_INVALIDATE_TOKEN = getattr(
167
    settings, 'ASTAKOS_NEWPASSWD_INVALIDATE_TOKEN', True)

Also available in: Unified diff