Commit 5d043b88ddebc7dafac21737a4fefc7164c78a3f
1 parent
0aca6012
Exists in
r5_design
and in
1 other branch
gitlab authentication via Remote-User
Does not quite work yet.
Showing
2 changed files
with
4 additions
and
9 deletions
Show diff stats
cookbooks/gitlab/recipes/default.rb
| @@ -74,8 +74,6 @@ template '/etc/nginx/conf.d/gitlab.conf' do | @@ -74,8 +74,6 @@ template '/etc/nginx/conf.d/gitlab.conf' do | ||
| 74 | notifies :reload, 'service[nginx]' | 74 | notifies :reload, 'service[nginx]' |
| 75 | end | 75 | end |
| 76 | 76 | ||
| 77 | -# TODO: Remote-User authentication | ||
| 78 | - | ||
| 79 | service 'gitlab' do | 77 | service 'gitlab' do |
| 80 | action :enable | 78 | action :enable |
| 81 | supports :restart => true | 79 | supports :restart => true |
cookbooks/gitlab/templates/gitlab.yml.erb
| @@ -17,14 +17,11 @@ production: &base | @@ -17,14 +17,11 @@ production: &base | ||
| 17 | plain_url: "http://cdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon" | 17 | plain_url: "http://cdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon" |
| 18 | ssl_url: "https://seccdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon" | 18 | ssl_url: "https://seccdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon" |
| 19 | omniauth: | 19 | omniauth: |
| 20 | - # Allow login via Twitter, Google, etc. using OmniAuth providers | ||
| 21 | - enabled: false | ||
| 22 | - allow_single_sign_on: false | ||
| 23 | - block_auto_created_users: true | 20 | + enabled: true |
| 21 | + allow_single_sign_on: true | ||
| 22 | + block_auto_created_users: false | ||
| 24 | providers: | 23 | providers: |
| 25 | - # - { name: 'google_oauth2', app_id: 'YOUR APP ID', | ||
| 26 | - # app_secret: 'YOUR APP SECRET', | ||
| 27 | - # args: { access_type: 'offline', approval_prompt: '' } } | 24 | + - { name: 'RemoteUser' } |
| 28 | satellites: | 25 | satellites: |
| 29 | path: /var/lib/gitlab/satellites | 26 | path: /var/lib/gitlab/satellites |
| 30 | timeout: 30 | 27 | timeout: 30 |