enable configuration of OpenIdAuthentication.store (#14060)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11849 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/configuration.yml.example b/config/configuration.yml.example
index 27eb86f68a3f28b1ef8815264100dc93e7c8a9de..20f6790d26078ddd416922aab36a7338a20e45d5 100644 (file)
--- a/config/configuration.yml.example
+++ b/config/configuration.yml.example
@@ -197,6 +197,11 @@ default:
   # Maximum number of simultaneous AJAX uploads
   #max_concurrent_ajax_uploads: 2
 
+  # Configure OpenIdAuthentication.store
+  #
+  # allowed values: :memory, :file, :memcache
+  openid_authentication_store = :memory
+
 # specific configuration options for production environment
 # that overrides the default ones
 production:

diff --git a/config/initializers/30-redmine.rb b/config/initializers/30-redmine.rb
index 1018ca18c3456b983e7ba064e3259cf615e4fdfe..b0cc1f752677e70dade4f5fa56b88857b28b4b61 100644 (file)
--- a/config/initializers/30-redmine.rb
+++ b/config/initializers/30-redmine.rb
@@ -9,6 +9,13 @@ if secret.present?
   RedmineApp::Application.config.secret_token = secret
 end
 
+if Object.const_defined?(:OpenIdAuthentication)
+  openid_authentication_store = Redmine::Configuration['openid_authentication_store']
+  OpenIdAuthentication.store =
+    openid_authentication_store.present? ?
+      openid_authentication_store : :memory   
+end
+
 Redmine::Plugin.load
 unless Redmine::Configuration['mirror_plugins_assets_on_startup'] == false
   Redmine::Plugin.mirror_assets