diff options
| author | 3kami3 <github@yumimix.org> | 2016-01-19 22:17:21 +0900 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-08 18:26:29 +0100 |
| commit | cdcedd5b26fcabba451747f37fd2942fe6775410 (patch) | |
| tree | c4a0445090ba3fd83a45ea73a2d725bab486b600 | |
| parent | 66fe68ac7c29fedfd000373b99e6f9616d72ff8e (diff) | |
| download | gitlab-ce-3kami3/gitlab-ce-root_email.tar.gz | |
Add an option to supply root email through an environmental variable.3kami3/gitlab-ce-root_email
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | db/fixtures/production/001_admin.rb | 4 | ||||
| -rw-r--r-- | doc/install/installation.md | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 983a219703a..488b68000df 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 8.5.0 (unreleased) - Ensure rake tasks that don't need a DB connection can be run without one - Update New Relic gem to 3.14.1.311 (Stan Hu) - Add "visibility" flag to GET /projects api endpoint + - Add an option to supply root email through an environmental variable (Koichiro Mikami) - Ignore binary files in code search to prevent Error 500 (Stan Hu) - Render sanitized SVG images (Stan Hu) - Support download access by PRIVATE-TOKEN header (Stan Hu) diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb index b0c0b6450f6..308b0528c9b 100644 --- a/db/fixtures/production/001_admin.rb +++ b/db/fixtures/production/001_admin.rb @@ -6,8 +6,10 @@ else expire_time = nil end +email = ENV['GITLAB_ROOT_EMAIL'].presence || 'admin@example.com' + admin = User.create( - email: "admin@example.com", + email: email, name: "Administrator", username: 'root', password: password, diff --git a/doc/install/installation.md b/doc/install/installation.md index 3eb9b1767c5..39c9b12ade9 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -373,9 +373,9 @@ 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/root password by supplying it in environmental variable `GITLAB_ROOT_PASSWORD` as seen below. If you don't set the password (and it is set to the default one) please wait with exposing GitLab to the public internet until the installation is done and you've logged into the server the first time. During the first login you'll be forced to change the default password. +**Note:** You can set the Administrator/root password and e-mail by supplying them in environmental variables, `GITLAB_ROOT_PASSWORD` and `GITLAB_ROOT_EMAIL` respectively, as seen below. If you don't set the password (and it is set to the default one) please wait with exposing GitLab to the public internet until the installation is done and you've logged into the server the first time. During the first login you'll be forced to change the default password. - sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PASSWORD=yourpassword + sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PASSWORD=yourpassword GITLAB_ROOT_EMAIL=youremail ### Secure secrets.yml |