From 09e64ae605914656e2b928dad0dce5df28b6f9a2 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Thu, 11 Sep 2014 10:04:58 +0200 Subject: Add an option to supply root password through an environmental variable. --- db/fixtures/production/001_admin.rb | 12 +++++++++--- doc/install/installation.md | 4 ++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb index c00ba3c10ba..21c10f31923 100644 --- a/db/fixtures/production/001_admin.rb +++ b/db/fixtures/production/001_admin.rb @@ -1,9 +1,15 @@ +password = if ENV['GITLAB_ROOT_PASSWORD'].nil? || ENV['GITLAB_ROOT_PASSWORD'].empty? + "5iveL!fe" + else + ENV['GITLAB_ROOT_PASSWORD'] + end + admin = User.create( email: "admin@example.com", name: "Administrator", username: 'root', - password: "5iveL!fe", - password_confirmation: "5iveL!fe", + password: password, + password_confirmation: password, password_expires_at: Time.now, theme_id: Gitlab::Theme::MARS @@ -19,6 +25,6 @@ puts %q[ Administrator account created: login.........root -password......5iveL!fe +password......#{password} ] end diff --git a/doc/install/installation.md b/doc/install/installation.md index 7a0b4e1f934..5ad8392fb63 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -244,6 +244,10 @@ GitLab Shell is an SSH access and repository management software developed speci # When done you see 'Administrator account created:' +**Note:** You can set the Administrator password by supplying it in environmental variable `GITLAB_ROOT_PASSWORD`, eg.: + + sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PASSWORD=newpassword + ### Install Init Script Download the init script (will be `/etc/init.d/gitlab`): -- cgit v1.2.1