From ac2b8a6121c128d50cdb1665db38879be9a36ef0 Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Mon, 10 Dec 2012 18:22:19 +0200 Subject: [PATCH] Fix conf --- .../conf/20-snf-astakos-app-settings.conf | 2 +- .../conf/20-snf-astakos-app-settings.conf~ | 84 -------------------- 2 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 snf-astakos-app/conf/20-snf-astakos-app-settings.conf~ diff --git a/snf-astakos-app/conf/20-snf-astakos-app-settings.conf b/snf-astakos-app/conf/20-snf-astakos-app-settings.conf index b0f2291..4e808bb 100644 --- a/snf-astakos-app/conf/20-snf-astakos-app-settings.conf +++ b/snf-astakos-app/conf/20-snf-astakos-app-settings.conf @@ -112,4 +112,4 @@ #ASTAKOS_PASSWORD_RESET_EMAIL_SUBJECT = 'Password reset on %s alpha2 testing' % SITENAME # Enforce token renewal on password change/reset -NEWPASSWD_INVALIDATE_TOKEN = getattr(settings, 'ASTAKOS_NEWPASSWD_INVALIDATE_TOKEN', True) \ No newline at end of file +#NEWPASSWD_INVALIDATE_TOKEN = getattr(settings, 'ASTAKOS_NEWPASSWD_INVALIDATE_TOKEN', True) diff --git a/snf-astakos-app/conf/20-snf-astakos-app-settings.conf~ b/snf-astakos-app/conf/20-snf-astakos-app-settings.conf~ deleted file mode 100644 index 50e2407..0000000 --- a/snf-astakos-app/conf/20-snf-astakos-app-settings.conf~ +++ /dev/null @@ -1,84 +0,0 @@ -# Set the expiration time of newly created auth tokens -# to be this many hours after their creation time. -#ASTAKOS_AUTH_TOKEN_DURATION = 30 * 24 - -# Authenticate via Twitter. -#ASTAKOS_TWITTER_KEY = '' -#ASTAKOS_TWITTER_SECRET = '' - -#ASTAKOS_DEFAULT_USER_LEVEL = 4 - -#ASTAKOS_INVITATIONS_PER_LEVEL = { -# 0 : 100, -# 1 : 2, -# 2 : 0, -# 3 : 0, -# 4 : 0 -#} - -# Address to use for outgoing emails -#ASTAKOS_DEFAULT_FROM_EMAIL = 'GRNET Cloud ' -#ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@cloud.grnet.gr' -#ASTAKOS_DEFAULT_ADMIN_EMAIL = 'admin@cloud.grnet.gr' - -# Identity Management enabled modules -#ASTAKOS_IM_MODULES = ['local', 'twitter', 'shibboleth'] - -# Force user profile verification -#ASTAKOS_FORCE_PROFILE_UPDATE = True - -#Enable invitations -#ASTAKOS_INVITATIONS_ENABLED = True - -#ASTAKOS_COOKIE_NAME = '_pithos2_a' -#ASTAKOS_COOKIE_DOMAIN = None -#ASTAKOS_COOKIE_SECURE = True - -#ASTAKOS_IM_STATIC_URL = '/static/im/' - -# If set to False and invitations not enabled newly created user will be -# automatically accepted -#ASTAKOS_MODERATION_ENABLED = True - -# Set baseurl -#ASTAKOS_BASEURL = 'http://pithos.dev.grnet.gr' - -# Set service name -#ASTAKOS_SITENAME = 'GRNET Cloud' - -# Set cloud services appear in the horizontal bar -#ASTAKOS_CLOUD_SERVICES = ( -# { 'url':'/', 'name':'grnet cloud', 'id':'cloud', 'icon':'home-icon.png' }, -# { 'url':'/okeanos.html', 'name':'~okeanos', 'id':'okeanos' }, -# { 'url':'/ui/', 'name':'pithos+', 'id':'pithos' }) -# - -# Set recaptcha keys -# http://www.google.com/recaptcha/whyrecaptcha -#ASTAKOS_RECAPTCHA_PUBLIC_KEY = '' -#ASTAKOS_RECAPTCHA_PRIVATE_KEY = '' -ASTAKOS_RECAPTCHA_OPTIONS = {'theme':'clean'} -#ASTAKOS_RECAPTCHA_USE_SSL = True -#ASTAKOS_RECAPTCHA_ENABLED = True - -# set AstakosUser fields to propagate in the billing system -#ASTAKOS_BILLING_FIELDS = ['is_active'] - -# Queue for billing. -#'rabbitmq://guest:guest@localhost:5672/astakos' -#QUEUE_CONNECTION = None - -# Set where the user should be redirected after logout -#ASTAKOS_LOGOUT_NEXT = '' - -# Set user email patterns that are automatically activated -#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'} -#ASTAKOS_LOGIN_MESSAGES = {} - -# messages to display as extra actions in account forms -# e.g. {'https://cms.okeanos.grnet.gr/': 'Back to ~okeanos'} -#ASTAKOS_PROFILE_EXTRA_LINKS = {} - -- 1.7.10.4