/ - Diff - Synnefo - Greek Research and Technology Network's projects

Revision b83ebddd

     BASE_PATH = settings.ASTAKOS_BASE_PATH
     synnefo_services = settings.SYNNEFO_SERVICES
     # Set service name
     SITENAME = getattr(settings, 'ASTAKOS_SITENAME', synnefo_settings.SERVICE_NAME)
     ACCOUNTS_PREFIX = get_service_prefix(synnefo_services, 'astakos_account')
     VIEWS_PREFIX = get_service_prefix(synnefo_services, 'astakos_ui')
     KEYSTONE_PREFIX = get_service_prefix(synnefo_services, 'astakos_identity')
     WEBLOGIN_PREFIX = get_service_prefix(synnefo_services, 'astakos_weblogin')
     # Set the expiration time of newly created auth tokens
     # to be this many hours after their creation time.
     AUTH_TOKEN_DURATION = getattr(settings, 'ASTAKOS_AUTH_TOKEN_DURATION', 30 * 24)
     DEFAULT_USER_LEVEL = getattr(settings, 'ASTAKOS_DEFAULT_USER_LEVEL', 4)
     INVITATIONS_PER_LEVEL = getattr(settings, 'ASTAKOS_INVITATIONS_PER_LEVEL', {
 : 100,
 : 2,
 : 0,
 : 0,
 : 0
     })
     ADMINS = tuple(getattr(settings, 'ADMINS', ()))
     MANAGERS = tuple(getattr(settings, 'MANAGERS', ()))
     HELPDESK = tuple(getattr(settings, 'HELPDESK', ()))
     # These get annotated by snf-webproject
     ADMINS = settings.ADMINS
     MANAGERS = settings.MANAGERS
     HELPDESK = settings.HELPDESK
     CONTACT_EMAIL = settings.CONTACT_EMAIL
     SERVER_EMAIL = settings.SERVER_EMAIL
     SECRET_KEY = settings.SECRET_KEY
     SESSION_ENGINE = settings.SESSION_ENGINE
     # Identity Management enabled modules
     # Supported modules are: 'local', 'twitter' and 'shibboleth'
     IM_MODULES = getattr(settings, 'ASTAKOS_IM_MODULES', ['local'])
     # Set the astakos main functions logging severity (None to disable)
     from logging import INFO
     LOGGING_LEVEL = getattr(settings, 'ASTAKOS_LOGGING_LEVEL', INFO)
     # Force user profile verification
     FORCE_PROFILE_UPDATE = getattr(settings, 'ASTAKOS_FORCE_PROFILE_UPDATE', False)
     default_activation_redirect_url = join_urls('/', BASE_PATH, VIEWS_PREFIX,
                                                 "landing")
     ACTIVATION_REDIRECT_URL = getattr(settings, 'ASTAKOS_ACTIVATION_REDIRECT_URL',
                                       default_activation_redirect_url)
     #Enable invitations
     INVITATIONS_ENABLED = getattr(settings, 'ASTAKOS_INVITATIONS_ENABLED', False)
     # URL to redirect the user after successful login when no next parameter is set
     default_success_url = join_urls('/', BASE_PATH, VIEWS_PREFIX, "landing")
     LOGIN_SUCCESS_URL = getattr(settings, 'ASTAKOS_LOGIN_SUCCESS_URL',
                                 default_success_url)
     COOKIE_NAME = getattr(settings, 'ASTAKOS_COOKIE_NAME', '_pithos2_a')
     COOKIE_DOMAIN = getattr(settings, 'ASTAKOS_COOKIE_DOMAIN', None)
     COOKIE_SECURE = getattr(settings, 'ASTAKOS_COOKIE_SECURE', True)
+    #
     # Local defaults
+    #
     IM_STATIC_URL = getattr(settings, 'ASTAKOS_IM_STATIC_URL', '/static/im/')
     AUTH_TOKEN_DURATION = settings.ASTAKOS_AUTH_TOKEN_DURATION
     # If set to False and invitations not enabled newly created user
     # will be automatically accepted
     MODERATION_ENABLED = getattr(settings, 'ASTAKOS_MODERATION_ENABLED', True)
     IM_MODULES = settings.ASTAKOS_IM_MODULES
     # Set service name
     SITENAME = getattr(settings, 'ASTAKOS_SITENAME', synnefo_settings.SERVICE_NAME)
     COOKIE_DOMAIN = settings.ASTAKOS_COOKIE_DOMAIN
     COOKIE_NAME = settings.ASTAKOS_COOKIE_NAME
     COOKIE_SECURE = settings.ASTAKOS_COOKIE_SECURE
     # Set recaptcha keys
     RECAPTCHA_PUBLIC_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PUBLIC_KEY', '')
     RECAPTCHA_PRIVATE_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PRIVATE_KEY', '')
     RECAPTCHA_OPTIONS = getattr(settings, 'ASTAKOS_RECAPTCHA_OPTIONS',
                                 {'theme': 'custom',
                                  'custom_theme_widget': 'okeanos_recaptcha'})
     RECAPTCHA_USE_SSL = getattr(settings, 'ASTAKOS_RECAPTCHA_USE_SSL', True)
     RECAPTCHA_ENABLED = getattr(settings, 'ASTAKOS_RECAPTCHA_ENABLED', False)
     # Set where the user should be redirected after logout
     LOGOUT_NEXT = getattr(settings, 'ASTAKOS_LOGOUT_NEXT', '')
     # Set user email patterns that are automatically activated
     RE_USER_EMAIL_PATTERNS = getattr(
         settings, 'ASTAKOS_RE_USER_EMAIL_PATTERNS', [])
     # Messages to display on login page header
     # e.g. {'warning':
     #       'This warning message will be displayed on the top of login page'}
     LOGIN_MESSAGES = getattr(settings, 'ASTAKOS_LOGIN_MESSAGES', [])
     # Messages to display on login page header
     # e.g. {'warning':
     #       'This warning message will be displayed on the top of signup page'}
     SIGNUP_MESSAGES = getattr(settings, 'ASTAKOS_SIGNUP_MESSAGES', [])
     # Messages to display on login page header
     # e.g. {'warning':
     #       'This warning message will be displayed on the top of profile page'}
     PROFILE_MESSAGES = getattr(settings, 'ASTAKOS_PROFILE_MESSAGES', [])
     # Messages to display on all pages
     # e.g. {'warning':
     #       'This warning message will be displayed on the top of every page'}
     GLOBAL_MESSAGES = getattr(settings, 'ASTAKOS_GLOBAL_MESSAGES', [])
     # messages to display as extra actions in account forms
     # e.g. {'https://www.myhomepage.com': 'Back to <service_name>'}
     PROFILE_EXTRA_LINKS = getattr(settings, 'ASTAKOS_PROFILE_EXTRA_LINKS', {})
     # The number of unsuccessful login requests per minute allowed
     # for a specific user
     RATELIMIT_RETRIES_ALLOWED = getattr(
         settings, 'ASTAKOS_RATELIMIT_RETRIES_ALLOWED', 3)
     # If False the email change mechanism is disabled
     EMAILCHANGE_ENABLED = getattr(settings, 'ASTAKOS_EMAILCHANGE_ENABLED', False)
     # Set the expiration time (in days) of email change requests
     EMAILCHANGE_ACTIVATION_DAYS = getattr(
         settings, 'ASTAKOS_EMAILCHANGE_ACTIVATION_DAYS', 10)
     MODERATION_ENABLED = settings.ASTAKOS_MODERATION_ENABLED
     RE_USER_EMAIL_PATTERNS = settings.ASTAKOS_RE_USER_EMAIL_PATTERNS
     # Set the astakos main functions logging severity (None to disable)
     from logging import INFO
     LOGGING_LEVEL = getattr(settings, 'ASTAKOS_LOGGING_LEVEL', INFO)
     RECAPTCHA_ENABLED = settings.ASTAKOS_RECAPTCHA_ENABLED
     RECAPTCHA_PUBLIC_KEY = settings.ASTAKOS_RECAPTCHA_PUBLIC_KEY
     RECAPTCHA_PRIVATE_KEY = settings.ASTAKOS_RECAPTCHA_PRIVATE_KEY
     RECAPTCHA_OPTIONS = settings.ASTAKOS_RECAPTCHA_OPTIONS
     RECAPTCHA_USE_SSL = settings.ASTAKOS_RECAPTCHA_USE_SSL
     # Set how many objects should be displayed per page
     PAGINATE_BY = getattr(settings, 'ASTAKOS_PAGINATE_BY', 50)
     LOGIN_MESSAGES = settings.ASTAKOS_LOGIN_MESSAGES
     SIGNUP_MESSAGES = settings.ASTAKOS_SIGNUP_MESSAGES
     PROFILE_MESSAGES = settings.ASTAKOS_PROFILE_MESSAGES
     GLOBAL_MESSAGES = settings.ASTAKOS_GLOBAL_MESSAGES
     PROFILE_EXTRA_LINKS = settings.ASTAKOS_PROFILE_EXTRA_LINKS
     # Set how many objects should be displayed per page in show all projects page
     PAGINATE_BY_ALL = getattr(settings, 'ASTAKOS_PAGINATE_BY_ALL', 50)
     EMAILCHANGE_ENABLED = settings.ASTAKOS_EMAILCHANGE_ENABLED
     EMAILCHANGE_ACTIVATION_DAYS = settings.ASTAKOS_EMAILCHANGE_ACTIVATION_DAYS
     SKIP_EMAIL_VERIFICATION = settings.ASTAKOS_SKIP_EMAIL_VERIFICATION
     # Enforce token renewal on password change/reset
     NEWPASSWD_INVALIDATE_TOKEN = getattr(
         settings, 'ASTAKOS_NEWPASSWD_INVALIDATE_TOKEN', True)
     PAGINATE_BY = settings.ASTAKOS_PAGINATE_BY
     PAGINATE_BY_ALL = settings.ASTAKOS_PAGINATE_BY_ALL
     # Interval at which to update the user's available quota in astakos usage
     # profile view
     USAGE_UPDATE_INTERVAL = getattr(settings, 'ASTAKOS_USAGE_UPDATE_INTERVAL',
 )
     PROJECTS_VISIBLE = settings.ASTAKOS_PROJECTS_VISIBLE
     PROJECT_ADMINS = settings.ASTAKOS_PROJECT_ADMINS
     # Permit local account migration
     ENABLE_LOCAL_ACCOUNT_MIGRATION = getattr(
         settings, 'ASTAKOS_ENABLE_LOCAL_ACCOUNT_MIGRATION', True)
     SHIBBOLETH_REQUIRE_NAME_INFO = settings.ASTAKOS_SHIBBOLETH_REQUIRE_NAME_INFO
     # Strict shibboleth usage
     SHIBBOLETH_REQUIRE_NAME_INFO = getattr(settings,
                                            'ASTAKOS_SHIBBOLETH_REQUIRE_NAME_INFO',
                                            False)
     TWITTER_TOKEN = settings.ASTAKOS_TWITTER_TOKEN
     TWITTER_SECRET = settings.ASTAKOS_TWITTER_SECRET
     TWITTER_AUTH_FORCE_LOGIN = settings.ASTAKOS_TWITTER_AUTH_FORCE_LOGIN
     default_activation_redirect_url = join_urls('/', BASE_PATH, VIEWS_PREFIX,
                                                 "landing")
     ACTIVATION_REDIRECT_URL = getattr(settings, 'ASTAKOS_ACTIVATION_REDIRECT_URL',
                                       default_activation_redirect_url)
     GOOGLE_CLIENT_ID = settings.ASTAKOS_GOOGLE_CLIENT_ID
     GOOGLE_SECRET = settings.ASTAKOS_GOOGLE_SECRET
     # If true, this enables a ui compatibility layer for the introduction of UUIDs
     # in identity management. WARNING: Setting to True will break your installation
     TRANSLATE_UUIDS = getattr(settings, 'ASTAKOS_TRANSLATE_UUIDS', False)
     LINKEDIN_TOKEN = settings.ASTAKOS_LINKEDIN_TOKEN
     LINKEDIN_SECRET = settings.ASTAKOS_LINKEDIN_SECRET
     # Users that can approve or deny project applications from the web.
     PROJECT_ADMINS = getattr(settings, 'ASTAKOS_PROJECT_ADMINS', set())
     COMPONENTS_META = settings.ASTAKOS_COMPONENTS_META
     RESOURCES_META = settings.ASTAKOS_RESOURCES_META
     # OAuth2 Twitter credentials.
     TWITTER_TOKEN = getattr(settings, 'ASTAKOS_TWITTER_TOKEN', '')
     TWITTER_SECRET = getattr(settings, 'ASTAKOS_TWITTER_SECRET', '')
     TWITTER_AUTH_FORCE_LOGIN = getattr(
         settings, 'ASTAKOS_TWITTER_AUTH_FORCE_LOGIN', False)
     API_CLIENT_URL = settings.ASTAKOS_API_CLIENT_URL
     KAMAKI_CONFIG_CLOUD_NAME = settings.ASTAKOS_KAMAKI_CONFIG_CLOUD_NAME
     # OAuth2 Google credentials.
     GOOGLE_CLIENT_ID = getattr(settings, 'ASTAKOS_GOOGLE_CLIENT_ID', '')
     GOOGLE_SECRET = getattr(settings, 'ASTAKOS_GOOGLE_SECRET', '')
     RATELIMIT_RETRIES_ALLOWED = settings.ASTAKOS_RATELIMIT_RETRIES_ALLOWED
     # OAuth2 LinkedIn credentials.
     LINKEDIN_TOKEN = getattr(settings, 'ASTAKOS_LINKEDIN_TOKEN', '')
     LINKEDIN_SECRET = getattr(settings, 'ASTAKOS_LINKEDIN_SECRET', '')
     NEWPASSWD_INVALIDATE_TOKEN = settings.ASTAKOS_NEWPASSWD_INVALIDATE_TOKEN
     # URL to redirect the user after successful login when no next parameter is set
     default_success_url = join_urls('/', BASE_PATH, VIEWS_PREFIX, "landing")
     LOGIN_SUCCESS_URL = getattr(settings, 'ASTAKOS_LOGIN_SUCCESS_URL',
                                 default_success_url)
     USAGE_UPDATE_INTERVAL = settings.ASTAKOS_USAGE_UPDATE_INTERVAL
     REDIRECT_ALLOWED_SCHEMES = settings.ASTAKOS_REDIRECT_ALLOWED_SCHEMES
     # Whether or not to display projects in astakos menu
     PROJECTS_VISIBLE = getattr(settings, 'ASTAKOS_PROJECTS_VISIBLE', False)
     LOGOUT_NEXT = settings.ASTAKOS_LOGOUT_NEXT
     # A way to extend the components presentation metadata
     COMPONENTS_META = getattr(settings, 'ASTAKOS_COMPONENTS_META', {})
     IM_STATIC_URL = settings.ASTAKOS_IM_STATIC_URL
     # A way to extend the resources presentation metadata
     RESOURCES_META = getattr(settings, 'ASTAKOS_RESOURCES_META', {})
     # Do not require email verification for new users
     SKIP_EMAIL_VERIFICATION = getattr(settings,
                                       'ASTAKOS_SKIP_EMAIL_VERIFICATION', False)
+    #
     # Obsolete settings, should go away along with the relevant code.
+    #
     # Kamaki download url. Displayed in api access view
     API_CLIENT_URL = getattr(settings, 'ASTAKOS_API_CLIENT_URL',
                              'https://pypi.python.org/pypi/kamaki')
     INVITATIONS_ENABLED = settings.ASTAKOS_INVITATIONS_ENABLED
     DEFAULT_USER_LEVEL = settings.ASTAKOS_DEFAULT_USER_LEVEL
     INVITATIONS_PER_LEVEL = settings.ASTAKOS_INVITATIONS_PER_LEVEL
     KAMAKI_CONFIG_CLOUD_NAME = getattr(settings,
                                        'ASTAKOS_KAMAKI_CONFIG_CLOUD_NAME',
                                        None)
     FORCE_PROFILE_UPDATE = settings.ASTAKOS_FORCE_PROFILE_UPDATE
     REDIRECT_ALLOWED_SCHEMES = getattr(settings,
                                        'ASTAKOS_REDIRECT_ALLOWED_SCHEMES',
                                        ('pithos', 'pithosdev'))
     TRANSLATE_UUIDS = settings.ASTAKOS_TRANSLATE_UUIDS

     from synnefo.settings.setup import Setting, Mandatory, Default, Constant
     ASTAKOS_COOKIE_DOMAIN = Mandatory(
         example_value=".example.synnefo.org",
         description=(
             "The domain at which the astakos authentication cookie will be "
             "published. Warning: all websites under this domain can access the "
             "cookie and its secret authorization data."),
         category="misc",
+    )
     ASTAKOS_COOKIE_NAME = Constant(
         default_value='_pithos2_a',
         description="The astakos cookie name.",
+    )
     ASTAKOS_COOKIE_SECURE = Constant(
         default_value=True,
         description=("Whether to require an encrypted connection "
                      "to transmit the cookie."),
+    )
     # The following settings will replace the default django settings
     AUTHENTICATION_BACKENDS = (
         'astakos.im.auth_backends.EmailBackend',
         'astakos.im.auth_backends.TokenBackend')
     CUSTOM_USER_MODEL = 'astakos.im.AstakosUser'
     #SOUTH_TESTS_MIGRATE = False
     BROKER_URL = ''
     # INTERNAL_IPS = ('127.0.0.1',)
     # Copyright 2013 GRNET S.A. All rights reserved.
+    #
     # Redistribution and use in source and binary forms, with or
     # without modification, are permitted provided that the following
     # conditions are met:
+    #
     #   1. Redistributions of source code must retain the above
     #      copyright notice, this list of conditions and the following
     #      disclaimer.
+    #
     #   2. Redistributions in binary form must reproduce the above
     #      copyright notice, this list of conditions and the following
     #      disclaimer in the documentation and/or other materials
     #      provided with the distribution.
+    #
     # THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
     # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
     # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
     # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
     # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
     # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
     # USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
     # AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
     # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
     # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     # POSSIBILITY OF SUCH DAMAGE.
+    #
     # The views and conclusions contained in the software and
     # documentation are those of the authors and should not be
     # interpreted as representing official policies, either expressed
     # or implied, of GRNET S.A.
     from astakos.settings.default.settings import *

     from synnefo.settings.setup import Setting, Mandatory, Default, SubMandatory
+    #
     # Astakos configuration
+    #
     ASTAKOS_AUTH_TOKEN_DURATION = Default(
         default_value=30*24,
         description="Expiration time for newly created authentication tokens. "
             "Time is counted in hours.",
         category="snf-astakos-app-settings",
         export=True,
+    )
     ASTAKOS_IM_MODULES = Default(
         default_value=["local"],
         example_value=["local", "twitter", "google", "linkedin", "shibboleth"],
         description="Identity management enabled methods.",
         category="snf-astakos-app-settings",
         export=True,
+    )
     ASTAKOS_COOKIE_DOMAIN = Mandatory(
         example_value=".example.synnefo.org",
         description="The domain at which the Astakos authentication cookie will be "
             "published. Warning: all websites under this domain can access the "
             "and its secret authorization data.",
         category="snf-astakos-app-settings",
+    )
     ASTAKOS_COOKIE_NAME = Default(
         default_value="_pithos2_a",
         example_value="my_service_cookie_name_here",
         description="The astakos cookie name.",
         export=False,
+    )
     ASTAKOS_COOKIE_SECURE = Default(
         default_value=True,
         description="Whether to require an encrypted connection to transmit the "
             "cookie.",
         export=False,
+    )
+    #
     # User moderation configuration
+    #
     ASTAKOS_MODERATION_ENABLED = Default(
         default_value=True,
         description="Whether to moderate newly created users. If set to False all "
             "users that have signed up and verified their email address will get "
             "automatically accepted/activated. ",
         category="snf-astakos-app-settings",
         export=True,
+    )
     ASTAKOS_RE_USER_EMAIL_PATTERNS = Default(
         default_value=[],
         description="If a new user's email matches any regex in this list, the "
             "user will get automatically accepted/activated.",
         dependencies=[ASTAKOS_MODERATION_ENABLED],
         category="snf-astakos-app-settings",
         export=True,
+    )
+    #
     # reCAPTCHA configuration
+    #
     ASTAKOS_RECAPTCHA_ENABLED = Default(
         default_value=False,
         description="Whether to enable reCAPTCHA during sign up. ",
         category="snf-astakos-app-settings",
         export=True,
+    )
     ASTAKOS_RECAPTCHA_PUBLIC_KEY = SubMandatory(
         example_value="recaptcha_public_key_here",
         description="The reCAPTCHA public key.",
         dependencies=[ASTAKOS_RECAPTCHA_ENABLED],
+    )
     ASTAKOS_RECAPTCHA_PRIVATE_KEY = SubMandatory(
         example_value="recaptcha_private_key_here",
         description="The reCAPTCHA private key.",
         dependencies=[ASTAKOS_RECAPTCHA_ENABLED],
+    )
     ASTAKOS_RECAPTCHA_OPTIONS = Default(
         default_value={
             "theme": "custom",
             "custom_theme_widget": "okeanos_recaptcha"
         },
         description="Additional reCAPTCHA options. We define a custom theme here. ",
         dependencies=[ASTAKOS_RECAPTCHA_ENABLED],
         export=False,
+    )
     ASTAKOS_RECAPTCHA_USE_SSL = Default(
         default_value=True,
         description="Whether to use SSL.",
         dependencies=[ASTAKOS_RECAPTCHA_ENABLED],
         export=False,
+    )
+    #
     # UI messages configuration
+    #
     ASTAKOS_LOGIN_MESSAGES = Default(
         default_value=[],
         example_value=[{
             "warning": "This will be displayed on the top of the login page. "
         }],
         description="Type and body of the message to get displayed on the login "
             "page header. Types are color coded on the UI, valid keys are: "
             "'warning', 'success', 'error', 'info'",
         export=False,
+    )
     ASTAKOS_SIGNUP_MESSAGES = Default(
         default_value=[],
         example_value=[{
             "warning": "This will be displayed on the top of the signup page. "
         }],
         description="Type and body of the message to get displayed on the signup "
             "page header. Types are color coded on the UI, valid keys are: "
             "'warning', 'success', 'error', 'info'",
         export=False,
+    )
     ASTAKOS_PROFILE_MESSAGES = Default(
         default_value=[],
         example_value=[{
             "warning": "This will be displayed on the top of the profile page. "
         }],
         description="Type and body of the message to get displayed on the profile "
             "page header. Types are color coded on the UI, valid keys are: "
             "'warning', 'success', 'error', 'info'",
         export=False,
+    )
     ASTAKOS_GLOBAL_MESSAGES = Default(
         default_value=[],
         example_value=[{
             "warning": "This will be displayed on the top of every page. "
         }],
         description="Type and body of the message to get displayed on every "
             "page header. Types are color coded on the UI, valid keys are: "
             "'warning', 'success', 'error', 'info'",
         export=False,
+    )
     ASTAKOS_PROFILE_EXTRA_LINKS = Default(
         default_value={},
         example_value={
             "https://landingpage.example.synnefo.org": "Back to <service_name>"
         },
         description="Additional link to get displayed on the profile page.",
         export=False,
+    )
+    #
     # Email change/verify configuration
+    #
     ASTAKOS_EMAILCHANGE_ENABLED = Default(
         default_value=False,
         description="Whether the user can change his/her email on the profile "
             "page. ",
         category="snf-astakos-app-settings",
         export=True,
+    )
     ASTAKOS_EMAILCHANGE_ACTIVATION_DAYS = Default(
         default_value=10,
         description="Expiration time in days of email change requests. The user "
             "should verify his/her new email inside this period for it to switch "
             "to the new value.",
         dependencies=[ASTAKOS_EMAILCHANGE_ENABLED],
         category="snf-astakos-app-settings",
         export=True,
+    )
     ASTAKOS_SKIP_EMAIL_VERIFICATION = Default(
         default_value=False,
         description="If False, Astakos will verify the email of a newly created "
             "user, by sending him/her a verification email which will contain a "
             "verification URL.",
         export=False,
+    )
+    #
     # UI pagination configuration
+    #
     ASTAKOS_PAGINATE_BY = Default(
         default_value=50,
         description="How many objects should be displayed per page.",
         export=False,
+    )
     ASTAKOS_PAGINATE_BY_ALL = Default(
         default_value=50,
         description="How many objects should be displayed per page in the "
             "'show all' projects' page.",
         export=False,
+    )
+    #
     # Projects configuration
+    #
     ASTAKOS_PROJECTS_VISIBLE = Default(
         default_value=False,
         description="Whether to show Projects under the Astakos menu on the UI. ",
         category="snf-astakos-app-settings",
         export=True,
+    )
     ASTAKOS_PROJECT_ADMINS = Default(
         default_value=[],
         description="Users that can approve or deny project applications. List of "
             "user UUIDs.",
         category="snf-astakos-app-settings",
         export=True,
+    )
+    #
     # Auth methods configuration
+    #
     ASTAKOS_SHIBBOLETH_REQUIRE_NAME_INFO = Default(
         default_value=False,
         description="If True, require shibboleth IdP's to provide attributes that "
             "contain account name information. If no such attributes provided, "
             "users of that IdP won't be able to use their shibboleth credentials "
             "to create or login to their astakos account.",
         export=False,
+    )
     # FIXME: Mandatory with condition
     ASTAKOS_TWITTER_TOKEN = Default(
         default_value="",
         description="OAuth2 twitter token.",
         category="snf-astakos-app-authmethods",
         export=True,
+    )
     # FIXME: Mandatory with condition
     ASTAKOS_TWITTER_SECRET = Default(
         default_value="",
         description="0Auth2 twitter secret.",
         category="snf-astakos-app-authmethods",
         export=True,
+    )
     ASTAKOS_TWITTER_AUTH_FORCE_LOGIN = Default(
         default_value=False,
         description="If True, prevent Twitter automatic authentication for users "
             "who try to login using their Twitter account. This means that Twitter "
             "will always prompt users to login to their account even if an "
             "existing Twitter session exists.",
         export=False,
+    )
     # FIXME: Mandatory with condition
     ASTAKOS_GOOGLE_CLIENT_ID = Default(
         default_value="",
         description="OAuth google client id.",
         category="snf-astakos-app-authmethods",
         export=True,
+    )
     # FIXME: Mandatory with condition
     ASTAKOS_GOOGLE_SECRET = Default(
         default_value="",
         description="OAuth google sercret.",
         category="snf-astakos-app-authmethods",
         export=True,
+    )
     # FIXME: Mandatory with condition
     ASTAKOS_LINKEDIN_TOKEN = Default(
         default_value="",
         description="OAuth linkedin token.",
         category="snf-astakos-app-authmethods",
         export=True,
+    )
     # FIXME: Mandatory with condition
     ASTAKOS_LINKEDIN_SECRET = Default(
         default_value="",
         description="OAuth linkedin secret.",
         category="snf-astakos-app-authmethods",
         export=True,
+    )
+    #
     # UI presentation configuration
+    #
     ASTAKOS_COMPONENTS_META = Default(
         default_value={},
         example_value={
             "synnefo": {
                 "url": "http://example.synnefo.org",
                 "order": 1,
                 "dashboard": {
                     "order": 4,
                     "show": True,
                     "description": 'Synnefo homepage',
                     "icon": "/static/branding/images/synnefo-logo.png"
                 },
                 "cloudbar": {
                     "show": True,
                     "icon": "https://example.synnefo.org/static/branding/images/cloudbar_home.png"
+                }
             },
             "cyclades": {
                 "order": 2,
                 "dashboard": {
                     "order": 1,
                     },
             },
             "pithos": {
                 "order": 3,
                 "dashboard": {
                     "order": 2,
                 },
+            }
         },
         description="A way to extend the components presentation metadata on the "
             "UI.",
         export=False,
+    )
     ASTAKOS_RESOURCES_META = Default(
         default_value={},
         description="A way to extend the services presentation metadata on the UI.",
         export=False,
+    )
+    #
     # API access page links
+    #
     ASTAKOS_API_CLIENT_URL = Default(
         default_value="https://pypi.python.org/pypi/kamaki",
         description="URL to the official kamaki package. Displayed in the API "
             "access tab.",
         export=False,
+    )
     ASTAKOS_KAMAKI_CONFIG_CLOUD_NAME = Default(
         default_value=None,
         description="Override the cloud name in the suggested downloadable "
             "'.kamakirc' in the API access tab.",
         export=False,
+    )
+    #
     # Misc configuration
+    #
     ASTAKOS_RATELIMIT_RETRIES_ALLOWED = Default(
         default_value=3,
         description="The number of unsuccessful login requests per minute a user "
             "can issue.",
         export=False,
+    )
     ASTAKOS_NEWPASSWD_INVALIDATE_TOKEN = Default(
         default_value=True,
         description="Enforce token renewal on password change/reset.",
         export=False,
+    )
     ASTAKOS_USAGE_UPDATE_INTERVAL = Default(
         default_value=5000,
         description="Refresh the user's available quota in the Usage tab every "
             "that many milliseconds.",
         export=False,
+    )
     ASTAKOS_REDIRECT_ALLOWED_SCHEMES = Default(
         default_value=("pithos", "pithosdev"),
         description="Allowed schemes to be passed at the 'next' parameter during "
             "Astakos redirects.",
         export=False,
+    )
     ASTAKOS_LOGOUT_NEXT = Default(
         default_value="",
         example_value="http://landingpage.example.synnefo.org/welcome",
         description="URL that the user will get redirected to after logging out. ",
         export=False,
+    )
     ASTAKOS_IM_STATIC_URL = Default(
         default_value=MEDIA_URL + "im/",
         description="Base URL for Astakos static files.",
         dependencies=[MEDIA_URL],
         export=False,
+    )
+    #
     # FIXME: Document the following
+    #
     # The following settings will replace the default django settings
     AUTHENTICATION_BACKENDS = (
         'astakos.im.auth_backends.EmailBackend',
         'astakos.im.auth_backends.TokenBackend')
     CUSTOM_USER_MODEL = 'astakos.im.AstakosUser'
     #SOUTH_TESTS_MIGRATE = False
     BROKER_URL = ''
     # INTERNAL_IPS = ('127.0.0.1',)
+    #
     # Obsolete settings
+    #
     # FIXME: Invitations mechanism will be re-written if needed. Those have to go
     # for now along with the relevant code.
     ASTAKOS_INVITATIONS_ENABLED = Default(
         default_value=False,
         description="Whether to enable the invitations mechanism.",
         export=False,
+    )
     ASTAKOS_DEFAULT_USER_LEVEL = Default(
         default_value=4,
         description="The user's default invitation level.",
         export=False,
+    )
     ASTAKOS_INVITATIONS_PER_LEVEL = Default(
         default_value={
 : 100,
 : 2,
 : 0,
 : 0,
 : 0
         },
         description="Dict that maps how many are the available invitations for "
             "each invitation level. ",
         export=False,
+    )
     # FIXME: This is not needed any more, has to go along with relevant code.
     ASTAKOS_FORCE_PROFILE_UPDATE = Default(
         default_value=False,
         description="Force the user to update his/her profile page on the first "
             "successful login.",
         export=False,
+    )
     # FIXME: This was needed for transitional reasons, now needs to go away along
     # with the corresponding code.
     # This enables a ui compatibility layer for the introduction of UUIDs in
     # identity management.  WARNING: Setting to True will break your installation.
     ASTAKOS_TRANSLATE_UUIDS = Default(
         default_value=False,
         description="Transitional setting to allow UUID translations.",
         export=False,
+    )

Also available in: Unified diff