Commit 896f4758f31ab1ea79cb8c743d869befb7a3ab16
1 parent
3e52c099
Exists in
branch_test
and in
1 other branch
Added settings for Remote user
Showing
2 changed files
with
18 additions
and
1 deletions
Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
| @@ -136,6 +136,16 @@ default['gitlab']['gitlab-rails']['smtp_domain'] = nil | @@ -136,6 +136,16 @@ default['gitlab']['gitlab-rails']['smtp_domain'] = nil | ||
| 136 | default['gitlab']['gitlab-rails']['smtp_authentication'] = nil | 136 | default['gitlab']['gitlab-rails']['smtp_authentication'] = nil |
| 137 | default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil | 137 | default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil |
| 138 | 138 | ||
| 139 | + | ||
| 140 | +#### | ||
| 141 | +# Remote user settings | ||
| 142 | +#### | ||
| 143 | +default['gitlab']['gitlab-rails']['env_enable'] = false | ||
| 144 | +default['gitlab']['gitlab-rails']['env_database_name'] = nil | ||
| 145 | +default['gitlab']['gitlab-rails']['env_database_host'] = nil | ||
| 146 | +default['gitlab']['gitlab-rails']['env_database_user'] = nil | ||
| 147 | +default['gitlab']['gitlab-rails']['env_database_password'] = nil | ||
| 148 | + | ||
| 139 | #### | 149 | #### |
| 140 | # Unicorn | 150 | # Unicorn |
| 141 | #### | 151 | #### |
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
| @@ -160,7 +160,14 @@ production: &base | @@ -160,7 +160,14 @@ production: &base | ||
| 160 | # Ex. ou=Groups,dc=gitlab,dc=example | 160 | # Ex. ou=Groups,dc=gitlab,dc=example |
| 161 | # | 161 | # |
| 162 | group_base: <%= single_quote(@ldap_group_base) %> | 162 | group_base: <%= single_quote(@ldap_group_base) %> |
| 163 | - | 163 | + <% if @env_enable %> |
| 164 | + env: | ||
| 165 | + enabled: <%= @env_enable %> | ||
| 166 | + database_name: <%= single_quote(@env_database_name) %> | ||
| 167 | + host: <%= single_quote(@env_database_host) %> | ||
| 168 | + user: <%= single_quote(@env_database_user) %> | ||
| 169 | + password: <%= single_quote(@env_database_password) %> | ||
| 170 | + <% end %> | ||
| 164 | 171 | ||
| 165 | ## OmniAuth settings | 172 | ## OmniAuth settings |
| 166 | omniauth: | 173 | omniauth: |