From ee2510e5187614f830eb0dafeb7083e5ba6ae115 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 5 Nov 2013 18:20:05 +0100
Subject: [PATCH 1/2] Update 6.2 update docs for EE

---
 doc/update/6.1-to-6.2.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/update/6.1-to-6.2.md b/doc/update/6.1-to-6.2.md
index e7f6c2a5ba..8c51d1cd3a 100644
--- a/doc/update/6.1-to-6.2.md
+++ b/doc/update/6.1-to-6.2.md
@@ -21,7 +21,7 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
 ```bash
 cd /home/git/gitlab
 sudo -u git -H git fetch
-sudo -u git -H git checkout 6-2-stable
+sudo -u git -H git checkout 6-2-stable-ee
 ```
 
 ### 3. Install additional packages
@@ -51,8 +51,8 @@ sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
 
 ### 5. Update config files
 
-* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/unicorn.rb.example but with your settings.
+* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/subscribers/gitlab-ee/blob/6-2-stable-ee/config/gitlab.yml.example but with your settings.
+* Make `/home/git/gitlab/config/unicorn.rb` same as https://gitlab.com/subscribers/gitlab-ee/blob/6-2-stable-ee/config/unicorn.rb.example but with your settings.
 * Copy rack attack middleware config
 ```bash
 sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
@@ -67,7 +67,7 @@ sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
 
 ```bash
 sudo rm /etc/init.d/gitlab
-sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-2-stable/lib/support/init.d/gitlab
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
 sudo chmod +x /etc/init.d/gitlab
 ```
 

From 7b0feec29deb287d4ebfc2a545ee42fcd4119209 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 8 Nov 2013 16:45:47 +0100
Subject: [PATCH 2/2] Add 6.2 CE to EE update docs

---
 doc/update/6.2-ce-to-ee.md | 86 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 doc/update/6.2-ce-to-ee.md

diff --git a/doc/update/6.2-ce-to-ee.md b/doc/update/6.2-ce-to-ee.md
new file mode 100644
index 0000000000..560e38f9b5
--- /dev/null
+++ b/doc/update/6.2-ce-to-ee.md
@@ -0,0 +1,86 @@
+# From Community Edition 6.2 to Enterprise Edition 6.2
+
+This guide assumes you have a correctly configured and tested installation of GitLab Community Edition 6.2.
+If you run into any trouble or if you have any questions please contact us at support@gitlab.com.
+
+### 0. Backup
+
+Make a backup just in case things go south:
+(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
+```
+
+### 1. Stop server
+
+    sudo service gitlab stop
+
+### 2. Get the EE code
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H git remote add ee https://gitlab.com/subscribers/gitlab-ee.git
+sudo -u git -H git fetch --all
+sudo -u git -H git checkout 6-2-stable-ee
+```
+
+### 3. Update config files
+
+* Make `/home/git/gitlab/config/gitlab.yml` same as /home/git/gitlab/config/gitlab.yml.example but with your settings.
+Note: Under LDAP settings fill in the `group_base` setting.
+* Make `/home/git/gitlab/config/unicorn.rb` same as /home/git/gitlab/config/unicorn.rb.example but with your settings.
+
+### 4. Install libs, migrations, etc.
+
+```bash
+cd /home/git/gitlab
+
+# MySQL
+sudo -u git -H bundle install --without development test postgres --deployment
+
+#PostgreSQL
+sudo -u git -H bundle install --without development test mysql --deployment
+
+sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+```
+
+### 5. Update Init script
+
+```bash
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+sudo chmod +x /etc/init.d/gitlab
+```
+
+### 6. Start application
+
+    sudo service gitlab start
+    sudo service nginx restart
+
+### 7. Check application status
+
+Check if GitLab and its environment are configured correctly:
+
+    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
+
+To make sure you didn't miss anything run a more thorough check with:
+
+    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
+
+If all items are green, then congratulations upgrade complete!
+
+## Things went wrong? Revert to previous version (Community Edition 6.2)
+
+### 1. Revert the code to the previous version
+```bash
+cd /home/git/gitlab
+sudo -u git -H git checkout 6-2-stable
+```
+
+### 2. Restore from the backup:
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
+```