Skip to content
Snippets Groups Projects
Commit 98504d8e authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Change the root_password setting to initial_root_password.

parent 7358cb32
No related branches found
No related tags found
No related merge requests found
......@@ -55,6 +55,6 @@
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
......@@ -59,6 +59,6 @@
```ruby
gitlab_rails['root_password'] = 'nonstandardpassword'
gitlab_rails['initial_root_password'] = 'nonstandardpassword'
```
and then run the `gitlab:setup` command.
......
......@@ -148,8 +148,10 @@
# 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 #
......
......@@ -172,7 +172,7 @@
default['gitlab']['gitlab-rails']['webhook_timeout'] = nil
default['gitlab']['gitlab-rails']['root_password'] = nil
default['gitlab']['gitlab-rails']['initial_root_password'] = nil
####
# Unicorn
......
......@@ -15,7 +15,7 @@
# 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"
......@@ -19,7 +19,7 @@
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment