Merge branch 'root_password_configurable' into 'master'

Root password configurable through environmental variable

Fixes #1522

See merge request !1084

db/fixtures/production/001_admin.rb

+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

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`):