diff --git a/doc/settings/database.md b/doc/settings/database.md index 7358cb326df57b4fc8ed6831e9afdd25c58603d8_ZG9jL3NldHRpbmdzL2RhdGFiYXNlLm1k..65ef980c1ffc0f53e2b753055c2dc6ceb3d648cc_ZG9jL3NldHRpbmdzL2RhdGFiYXNlLm1k 100644 --- a/doc/settings/database.md +++ b/doc/settings/database.md @@ -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. diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index 7358cb326df57b4fc8ed6831e9afdd25c58603d8_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..65ef980c1ffc0f53e2b753055c2dc6ceb3d648cc_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -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 # diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 7358cb326df57b4fc8ed6831e9afdd25c58603d8_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi..65ef980c1ffc0f53e2b753055c2dc6ceb3d648cc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -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 diff --git a/files/gitlab-cookbooks/gitlab/recipes/database_migrations.rb b/files/gitlab-cookbooks/gitlab/recipes/database_migrations.rb index 7358cb326df57b4fc8ed6831e9afdd25c58603d8_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy9kYXRhYmFzZV9taWdyYXRpb25zLnJi..65ef980c1ffc0f53e2b753055c2dc6ceb3d648cc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy9kYXRhYmFzZV9taWdyYXRpb25zLnJi 100644 --- a/files/gitlab-cookbooks/gitlab/recipes/database_migrations.rb +++ b/files/gitlab-cookbooks/gitlab/recipes/database_migrations.rb @@ -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