diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/install/installation.md | 6 | ||||
-rw-r--r-- | doc/install/requirements.md | 5 | ||||
-rw-r--r-- | doc/raketasks/backup_restore.md | 15 | ||||
-rw-r--r-- | doc/release/monthly.md | 3 | ||||
-rw-r--r-- | doc/update/6.4-to-6.5.md | 2 | ||||
-rw-r--r-- | doc/update/upgrader.md | 12 |
6 files changed, 30 insertions, 13 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 0d7f126167b..575f776de58 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -94,8 +94,8 @@ Is the system packaged Git too old? Remove it and compile from source. # Download and compile from source cd /tmp - curl --progress https://git-core.googlecode.com/files/git-1.8.4.1.tar.gz | tar xz - cd git-1.8.4.1/ + curl --progress https://git-core.googlecode.com/files/git-1.8.5.2.tar.gz | tar xz + cd git-1.8.5.2/ make prefix=/usr/local all # Install into /usr/local/bin @@ -270,7 +270,7 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production - # Type 'yes' to create the database. + # Type 'yes' to create the database tables. # When done you see 'Administrator account created:' diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 0a1539fb0d6..a263e9361e1 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -37,9 +37,8 @@ Please consider using a virtual machine to run GitLab. # Ruby versions GitLab requires Ruby (MRI) 1.9.3 or 2.0+. -While it is generally possible to use other Rubies -(like [JRuby](http://jruby.org/) or [Rubinius](http://rubini.us/)) -it might require some work since GitLab uses several Gems that have native extensions. +You will have to use the standard MRI implementation of Ruby. +We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab needs several Gems that have native extensions. # Hardware requirements diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index d2da64f3d3c..bdff6ad5da8 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -78,3 +78,18 @@ Restoring repositories: - Restoring repository abcd... [DONE] Deleting tmp directories...[DONE] ``` + +### Configure cron to make daily backups + +``` +cd /home/git/gitlab +sudo -u git -H editor config/gitlab.yml # Enable keep_time in the backup section to automatically delete old backups +sudo -u git crontab -e # Edit the crontab for the git user +``` + +Add the following lines at the bottom: + +``` +# Create a full backup of the GitLab repositories and SQL database every day at 2am +0 2 * * * cd /home/git/gitlab && PATH=/usr/local/bin:/usr/bin:/bin bundle exec rake gitlab:backup:create RAILS_ENV=production +``` diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 17f69915d10..62bb0f7b40a 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -65,6 +65,9 @@ After making the release branch new commits are cherry-picked from master. When * 21st: optional release candidate 2 (x.x.0.rc2, only if rc1 had problems) * 22nd: release (VERSION x.x.0, create x-x-stable branch, tag, blog and tweet) * 23nd: optional patch releases (x.x.1, x.x.2, etc., only if there are serious problems) +* 24-end of month: release Enterprise Edition and upgrade GitLab Cloud +* 1-7th: official merge window (see contributing guide) +* 8-16th: bugfixes and sponsored features # Write a blog post diff --git a/doc/update/6.4-to-6.5.md b/doc/update/6.4-to-6.5.md index 5dcfd15fe1e..2b1fa2744fe 100644 --- a/doc/update/6.4-to-6.5.md +++ b/doc/update/6.4-to-6.5.md @@ -55,7 +55,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab sudo service gitlab start sudo service nginx restart -### 8. Check application status +### 6. Check application status Check if GitLab and its environment are configured correctly: diff --git a/doc/update/upgrader.md b/doc/update/upgrader.md index 1f51005a8e9..1eec5a8f396 100644 --- a/doc/update/upgrader.md +++ b/doc/update/upgrader.md @@ -1,10 +1,11 @@ # GitLab Upgrader -GitLab Upgrader - ruby script that allows you easily upgrade GitLab to latest minor version. -Ex. it can update your application from 6.4 to latest GitLab 6 version (like 6.5.1). -You still need to create backup and manually restart GitLab but all other operations can be done by upgrade tool. +GitLab Upgrader - a ruby script that allows you easily upgrade GitLab to latest minor version. +For example it can update your application from 6.4 to latest GitLab 6 version (like 6.6.1). +You still need to create a a backup and manually restart GitLab after runnning the script but all other operations are done by this upgrade script. +If you have local changes to your GitLab repository the script will stash them and you need to use `git stash pop` after running the script. -__GitLab Upgrader is available only for version 6.4.2 or higher__ +__GitLab Upgrader is available only for GitLab version 6.4.2 or higher__ ### 0. Backup @@ -20,9 +21,8 @@ __GitLab Upgrader is available only for version 6.4.2 or higher__ cd /home/git/gitlab sudo -u git -H ruby script/upgrade.rb - # it also supports -y option to avouid user input + # it also supports -y option to avoid waiting for user input # sudo -u git -H ruby script/upgrade.rb -y - ### 3. Start application |