diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-16 19:36:25 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-16 19:36:25 +0000 |
| commit | b39b156407f5ef1ea483dcd8d628d4835d02b2ff (patch) | |
| tree | f01bb912377cbae43d7bf5022c90cf9916d2ba59 | |
| parent | 2f237449799e3f0c98e18d974c2103e69e189e45 (diff) | |
| parent | 897e3a20b38d5badea5fa2935f248b27a8c9502d (diff) | |
| download | gitlab-ce-b39b156407f5ef1ea483dcd8d628d4835d02b2ff.tar.gz | |
Merge branch 'rs-install-guide' into 'master'
Change 7-14-stable to 8-0-stable in doc/install/installation.md
Also fixes sudo user from previous MR.
[ci skip]
See merge request !1320
| -rw-r--r-- | doc/install/installation.md | 8 | ||||
| -rw-r--r-- | doc/update/7.14-to-8.0.md | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 8936697b40e..3b074fc8467 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -207,9 +207,9 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da ### Clone the Source # Clone GitLab repository - sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 7-14-stable gitlab + sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-0-stable gitlab -**Note:** You can change `7-14-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! +**Note:** You can change `8-0-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! ### Configure It @@ -221,7 +221,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da # Update GitLab config file, follow the directions at top of file sudo -u git -H editor config/gitlab.yml - + # Copy the example secrets file sudo -u git -H cp config/secrets.yml.example config/secrets.yml sudo -u git -H chmod 0600 config/secrets.yml @@ -238,7 +238,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da # Make sure GitLab can write to the public/uploads/ directory sudo chmod -R u+rwX public/uploads - + # Change the permissions of the directory where CI build traces are stored sudo chmod -R u+rwX builds/ diff --git a/doc/update/7.14-to-8.0.md b/doc/update/7.14-to-8.0.md index 7736afb6df6..2c7003ed063 100644 --- a/doc/update/7.14-to-8.0.md +++ b/doc/update/7.14-to-8.0.md @@ -99,8 +99,8 @@ Don't store it in the same place as your database backups, otherwise your secrets are exposed if one of your backups is compromised. ``` -sudo -u gitlab -H cp config/secrets.yml.example config/secrets.yml -sudo -u gitlab -H chmod 0600 config/secrets.yml +sudo -u git -H cp config/secrets.yml.example config/secrets.yml +sudo -u git -H chmod 0600 config/secrets.yml ``` ### 7. Install libs, migrations, etc. |