Update installation and update documentation with nodejs dependency

2 files changed, 77 insertions, 11 deletions

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 82d1317..421d0f2 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -19,9 +19,9 @@ up-to-date and install it.
     sudo apt-get upgrade
 
 **Note:**
-During this installation some files will need to be edited manually. If 
-you are familiar with vim set it as default editor with the commands 
-below. If you are not familiar with vim please skip this and keep using 
+During this installation some files will need to be edited manually. If
+you are familiar with vim set it as default editor with the commands
+below. If you are not familiar with vim please skip this and keep using
 the default editor.
 
     # Install vim
@@ -30,8 +30,8 @@ the default editor.
 
 Install the required packages:
 
-    sudo apt-get install wget curl gcc checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev libmysql++-dev make build-essential zlib1g-dev openssh-server git-core libyaml-dev postfix libpq-dev libicu-dev openssl
-    sudo apt-get install redis-server 
+    sudo apt-get install wget curl gcc checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev libmysql++-dev make build-essential zlib1g-dev openssh-server git-core libyaml-dev postfix libpq-dev libicu-dev openssl nodejs
+    sudo apt-get install redis-server
 
 # 2. Ruby
 
@@ -74,10 +74,10 @@ You can use either MySQL or PostgreSQL.
 
     # Grant proper permissions to the MySQL User
     mysql> GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON `gitlab_ci_production`.* TO 'gitlab_ci'@'localhost';
-    
+
     # Logout MYSQL
     mysql> exit;
-    
+
 ### PostgreSQL
 
     # Install the database packages
@@ -98,7 +98,7 @@ You can use either MySQL or PostgreSQL.
     # Try connecting to the new database with the new user
     sudo -u gitlab_ci -H psql -d gitlab_ci_production
 
-## 5. Get code 
+## 5. Get code
 
     cd /home/gitlab_ci/
 
@@ -128,7 +128,7 @@ You can use either MySQL or PostgreSQL.
     sudo chmod -R u+rwX  tmp/pids/
 
 ### Install gems
- 
+
     # For MySQL (note, the option says "without ... postgres")
     sudo -u gitlab_ci -H bundle install --without development test postgres --deployment
 
@@ -148,10 +148,10 @@ You can use either MySQL or PostgreSQL.
 
     # Setup tables
     sudo -u gitlab_ci -H bundle exec rake setup RAILS_ENV=production
-    
+
     # Setup schedules
     sudo -u gitlab_ci -H bundle exec whenever -w RAILS_ENV=production
-   
+
 
 ## 7. Install Init Script
 
diff --git a/doc/update/7.8-to-7.9.md b/doc/update/7.8-to-7.9.md
new file mode 100644
index 0000000..ef21800
--- /dev/null
+++ b/doc/update/7.8-to-7.9.md
@@ -0,0 +1,66 @@
+# Update from 7.8 to 7.9
+
+## Notice
+
+__GitLab CI 7.8 requires GitLab 7.8 or higher and GitLab CI Runner v5__
+
+### 1. stop CI server
+
+    sudo service gitlab_ci stop
+
+### 2. Switch to your gitlab_ci user
+
+```
+sudo su gitlab_ci
+cd /home/gitlab_ci/gitlab-ci
+```
+
+### 3. Get latest code
+
+```
+git fetch
+git checkout 7-8-stable
+```
+
+#### Redis config
+
+If you have `config/resque.yml` file - please update it with recent `config/resque.yml.example`
+
+### 4. Install libs, migrations etc
+
+
+```
+# Install nodejs dependency:
+sudo apt-get install nodejs
+
+# For MySQL users
+bundle install --without postgres development test --deployment
+
+# For Postgres users
+bundle install --without mysql development test --deployment
+
+# Run migrations
+bundle exec rake db:migrate RAILS_ENV=production
+```
+
+### 5. Update config
+GitLab CI 5.4 and above make use of the OAuth2 protocol for authentication with GitLab. This means that after updating GitLab (CI),
+you need to create an OAuth2 application in GitLab admin area, which gives you the APP_ID and APP_SECRET.
+
+For callback URL use: `http://ci.example.com/user_sessions/callback` if you use http, or `https://ci.example.com/user_sessions/callback` if you use https.
+
+You will have to add APP_ID and APP_SECRET to the GitLab CI config, as such:
+
+```
+production:
+  gitlab_server:
+    url: 'http://gitlab.example.com'
+    app_id: XXXXXX
+    app_secret: XXXXXX
+
+```
+
+
+### 6. Start web application
+
+    sudo service gitlab_ci start