Merge pull request #585 from patthoyts/pt/omniauth-config

Move OmniAuth configuration details into a non-revision controlled file.

Merge pull request #585 from patthoyts/pt/omniauth-config
Move OmniAuth configuration details into a non-revision controlled file.
Valeriy Sizov
2 parents 341b6d54 6e27350a
Showing 3 changed files with 19 additions and 12 deletions Show diff stats
.gitignore
config/initializers/devise.rb
config/initializers/omniauth.rb.sample
@@ -16,4 +16,5 @@ Vagrantfile
 .vagrant
 config/gitlab.yml
 config/database.yml
+config/initializers/omniauth.rb
 db/data.yml
@@ -195,18 +195,9 @@ Devise.setup do |config|
   config.sign_out_via = :delete
  
   # ==> OmniAuth
-  # Add a new OmniAuth provider. Check the wiki for more information on setting
-  # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-
-  #config.omniauth :ldap, 
-  #    :host => 'YOUR_LDAP_SERVER',
-  #    :base => 'THE_BASE_WHERE_YOU_SEARCH_FOR_USERS',
-  #    :uid => 'sAMAccountName',
-  #    :port => 389,
-  #    :method => :plain,
-  #    :bind_dn => 'THE_FULL_DN_OF_THE_USER_YOU_WILL_BIND_WITH',
-  #    :password => 'THE_PASSWORD_OF_THE_BIND_USER'
+  # To configure a new OmniAuth provider copy and edit omniauth.rb.sample
+  # selecting the provider you require.
+  # Check the wiki for more information on setting up on your models
  
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or
@@ -0,0 +1,15 @@
+# Copy this file to 'omniauth.rb' and configure it as necessary.
+# The wiki has further details on configuring each provider.
+
+Devise.setup do |config|
+  # config.omniauth :github 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+
+  # config.omniauth :ldap, 
+  #     :host => 'YOUR_LDAP_SERVER',
+  #     :base => 'THE_BASE_WHERE_YOU_SEARCH_FOR_USERS',
+  #     :uid => 'sAMAccountName',
+  #     :port => 389,
+  #     :method => :plain,
+  #     :bind_dn => 'THE_FULL_DN_OF_THE_USER_YOU_WILL_BIND_WITH',
+  #     :password => 'THE_PASSWORD_OF_THE_BIND_USER'
+end
 \ No newline at end of file
...	...	@@ -16,4 +16,5 @@ Vagrantfile
16	16	.vagrant
17	17	config/gitlab.yml
18	18	config/database.yml
	19	+config/initializers/omniauth.rb
19	20	db/data.yml
...	...
...	...	@@ -195,18 +195,9 @@ Devise.setup do \|config\|
195	195	config.sign_out_via = :delete
196	196
197	197	# ==> OmniAuth
198		- # Add a new OmniAuth provider. Check the wiki for more information on setting
199		- # up on your models and hooks.
200		- # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
201		-
202		- #config.omniauth :ldap,
203		- # :host => 'YOUR_LDAP_SERVER',
204		- # :base => 'THE_BASE_WHERE_YOU_SEARCH_FOR_USERS',
205		- # :uid => 'sAMAccountName',
206		- # :port => 389,
207		- # :method => :plain,
208		- # :bind_dn => 'THE_FULL_DN_OF_THE_USER_YOU_WILL_BIND_WITH',
209		- # :password => 'THE_PASSWORD_OF_THE_BIND_USER'
	198	+ # To configure a new OmniAuth provider copy and edit omniauth.rb.sample
	199	+ # selecting the provider you require.
	200	+ # Check the wiki for more information on setting up on your models
210	201
211	202	# ==> Warden configuration
212	203	# If you want to use other strategies, that are not supported by Devise, or
...	...
...	...	@@ -0,0 +1,15 @@
	1	+# Copy this file to 'omniauth.rb' and configure it as necessary.
	2	+# The wiki has further details on configuring each provider.
	3	+
	4	+Devise.setup do \|config\|
	5	+ # config.omniauth :github 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
	6	+
	7	+ # config.omniauth :ldap,
	8	+ # :host => 'YOUR_LDAP_SERVER',
	9	+ # :base => 'THE_BASE_WHERE_YOU_SEARCH_FOR_USERS',
	10	+ # :uid => 'sAMAccountName',
	11	+ # :port => 389,
	12	+ # :method => :plain,
	13	+ # :bind_dn => 'THE_FULL_DN_OF_THE_USER_YOU_WILL_BIND_WITH',
	14	+ # :password => 'THE_PASSWORD_OF_THE_BIND_USER'
	15	+end
0	16	\ No newline at end of file
...	...