diff --git a/doc/install/installation.md b/doc/install/installation.md index d1d3833e3d2c7717b07c82707ae91c0b0d2f4cf3..90f93e84db6fabd7984fd6d5cb0b5df2db88b503 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -132,10 +132,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install cd /home/git/gitlab # Checkout to stable release - sudo -u git -H git checkout 5-0-stable + sudo -u git -H git checkout 5-1-stable **Note:** -You can change `5-0-stable` to `master` if you want the *bleeding edge* version, but +You can change `5-1-stable` to `master` if you want the *bleeding edge* version, but do so with caution! ## Configure it @@ -162,8 +162,8 @@ do so with caution! sudo -u git -H mkdir tmp/pids/ sudo chmod -R u+rwX tmp/pids/ - # Copy the example Unicorn config - sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb + # Copy the example Of Puma config + sudo -u git -H cp config/puma.rb.example config/puma.rb **Important Note:** Make sure to edit both files to match your setup. @@ -200,7 +200,7 @@ Make sure to update username/password in config/database.yml. Download the init script (will be /etc/init.d/gitlab): - sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab + sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/5-1-stable/init.d/gitlab sudo chmod +x /etc/init.d/gitlab Make GitLab start on boot: @@ -241,7 +241,7 @@ If you can't or don't want to use Nginx as your web server, have a look at the Download an example site config: - sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab + sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/5-1-stable/nginx/gitlab sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab Make sure to edit the config file to match your setup: diff --git a/doc/update/5.0-to-5.1.md b/doc/update/5.0-to-5.1.md index 438bc25672c86495da8930fecdb00ae2343a1392..5e10bf1669988aff2561dccbee1662db0fa5354a 100644 --- a/doc/update/5.0-to-5.1.md +++ b/doc/update/5.0-to-5.1.md @@ -10,15 +10,25 @@ ### 2. get latest code ``` - +cd /home/git/gitlab sudo -u git -H git fetch sudo -u git -H git checkout 5-1-stable ``` -### 3. Install libs, migrations etc +### 3. Update gitlab-shell + +``` +cd /home/git/gitlab-shell +sudo -u git -H git fetch +sudo -u git -H git checkout v1.3.0 +``` + +### 4. Install libs, migrations etc ``` +cd /home/git/gitlab +sudo rm tmp/sockets/gitlab.socket sudo -u git -H cp config/puma.rb.example config/puma.rb @@ -28,7 +38,7 @@ sudo -u git -H bundle exec rake migrate_merge_requests RAILS_ENV=production ``` -### 4. Update init.d script with a new one +### 5. Update init.d script with a new one ```bash # init.d @@ -37,6 +47,6 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-rec sudo chmod +x /etc/init.d/gitlab ``` -### 5. Start application +### 6. Start application sudo service gitlab start