gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'change_the_name_of_initial_password_option' into 'master' 

Change the name of initial password option

Fixes #389

See merge request !274
This commit is contained in:
Marin Jankovski 2015-01-16 19:38:53 +00:00
parent 79e6833045 a941f5a35a
commit 577a4b7b89
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/settings/database.md
View File

@ -55,10 +55,10 @@ You can manually seed the GitLab CI database with the following command:
sudo gitlab-ci-rake setup
```
If you want to specify a password for the default `root` user, in `gitlab.rb` specify the `root_password` setting:
If you want to specify a password for the default `root` user, in `gitlab.rb` specify the `initial_root_password` setting:
```ruby
gitlab_rails['root_password'] = 'nonstandardpassword'
gitlab_rails['initial_root_password'] = 'nonstandardpassword'
```
and then run the `gitlab:setup` command.

6
files/gitlab-config-template/gitlab.rb.template
View File

@ -148,8 +148,10 @@ external_url 'GENERATED_EXTERNAL_URL'
# gitlab_rails['rate_limit_requests_per_period'] = 10
# gitlab_rails['rate_limit_period'] = 60
# Change the default admin password.
# gitlab_rails['root_password'] = "password"
# Change the initial default admin password.
# Only applicable on inital setup, changing this setting after database is created and seeded
# won't yield any change.
# gitlab_rails['initial_root_password'] = "password"
############################
# GitLab database settings #

2
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -172,7 +172,7 @@ default['gitlab']['gitlab-rails']['smtp_openssl_verify_mode'] = nil
default['gitlab']['gitlab-rails']['webhook_timeout'] = nil
default['gitlab']['gitlab-rails']['root_password'] = nil
default['gitlab']['gitlab-rails']['initial_root_password'] = nil
####
# Unicorn

4
files/gitlab-cookbooks/gitlab/recipes/database_migrations.rb
View File

@ -15,11 +15,11 @@
# limitations under the License.
#
root_password = node['gitlab']['gitlab-rails']['root_password']
initial_root_password = node['gitlab']['gitlab-rails']['initial_root_password']
execute "initialize gitlab-rails database" do
command "/opt/gitlab/bin/gitlab-rake db:schema:load db:seed_fu"
environment ({'GITLAB_ROOT_PASSWORD' => root_password }) if root_password
environment ({'GITLAB_ROOT_PASSWORD' => initial_root_password }) if initial_root_password
action :nothing
end