Merge remote-tracking branch 'origin/0.12' into devel-0.13

[astakos] / 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 2bdd694..1c72a46 100644 (file)
--- a/snf-astakos-app/conf/20-snf-astakos-app-settings.conf
+++ b/snf-astakos-app/conf/20-snf-astakos-app-settings.conf
@@ -22,13 +22,14 @@
 #ASTAKOS_DEFAULT_ADMIN_EMAIL = 'admin@cloud.grnet.gr'
 
 # Identity Management enabled modules
-#ASTAKOS_IM_MODULES = ['local', 'twitter', 'shibboleth']
+# Supported modules are: 'local', 'twitter' and 'shibboleth'
+#ASTAKOS_IM_MODULES = ['local']
 
 # Force user profile verification
 #ASTAKOS_FORCE_PROFILE_UPDATE = True
 
 #Enable invitations
-#ASTAKOS_INVITATIONS_ENABLED = True
+#ASTAKOS_INVITATIONS_ENABLED = False
 
 #ASTAKOS_COOKIE_NAME = '_pithos2_a'
 #ASTAKOS_COOKIE_DOMAIN = None
@@ -52,7 +53,7 @@
 #ASTAKOS_RECAPTCHA_PRIVATE_KEY = ''
 #ASTAKOS_RECAPTCHA_OPTIONS = {'theme':'white'}
 #ASTAKOS_RECAPTCHA_USE_SSL = True
-#ASTAKOS_RECAPTCHA_ENABLED = True
+#ASTAKOS_RECAPTCHA_ENABLED = False
 
 # set AstakosUser fields to propagate in the billing system
 #ASTAKOS_BILLING_FIELDS = ['is_active']
@@ -129,4 +130,7 @@
 #PAGINATE_BY = getattr(settings, 'ASTAKOS_PAGINATE_BY', 10)
 
 # 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)
+
+# Permit local account migration
+# ENABLE_LOCAL_ACCOUNT_MIGRATION = getattr(settings, 'ASTAKOS_ENABLE_LOCAL_ACCOUNT_MIGRATION', True)