From 0fb3f0d1058d139a5c94869ca7bd6a824e192fc6 Mon Sep 17 00:00:00 2001
From: Arturs Sosins <ar2rsawseen@gmail.com>
Date: Fri, 16 Dec 2016 19:40:02 +0200
Subject: [PATCH] [scripts] install mongodb after nodejs and dependencies

---
 bin/countly.install_rhel.sh   | 6 +++---
 bin/countly.install_travis.sh | 6 +++---
 bin/countly.install_ubuntu.sh | 6 +++---
 bin/countly.user.install.sh   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bin/countly.install_rhel.sh b/bin/countly.install_rhel.sh
index aa3f17c4ef6..3f627a38d56 100755
--- a/bin/countly.install_rhel.sh
+++ b/bin/countly.install_rhel.sh
@@ -33,9 +33,6 @@ gpgcheck=0
 enabled=1" > /etc/yum.repos.d/nginx.repo
 fi
 
-#install mongodb
-bash $DIR/scripts/mongodb.install.sh
-
 #install nodejs
 curl -sL https://rpm.nodesource.com/setup_6.x | bash -
 yum install -y nodejs
@@ -74,6 +71,9 @@ service sendmail start
 #install grunt
 ( cd $DIR/.. ; npm install -g grunt-cli --unsafe-perm )
 
+#install mongodb
+bash $DIR/scripts/mongodb.install.sh
+
 #configure and start nginx
 cp $DIR/config/nginx.server.conf /etc/nginx/conf.d/default.conf
 service nginx restart
diff --git a/bin/countly.install_travis.sh b/bin/countly.install_travis.sh
index affe42d2ea2..ee7ce3e6055 100644
--- a/bin/countly.install_travis.sh
+++ b/bin/countly.install_travis.sh
@@ -37,9 +37,6 @@ wget -qO- https://deb.nodesource.com/setup_6.x | bash -
 #update g++ to 4.8
 add-apt-repository ppa:ubuntu-toolchain-r/test -y
 
-#install mongodb
-#bash $DIR/scripts/mongodb.install.sh
-
 #update once more after adding new repos
 apt-get update
 
@@ -66,6 +63,9 @@ apt-get -y install supervisor || (echo "Failed to install supervisor." ; exit)
 #install grunt & npm modules
 ( cd $DIR/.. ; npm install -g grunt-cli --unsafe-perm ; npm install )
 
+#install mongodb
+#bash $DIR/scripts/mongodb.install.sh
+
 #configure and start nginx
 cp /etc/nginx/sites-enabled/default $DIR/config/nginx.default.backup
 cp $DIR/config/nginx.server.conf /etc/nginx/sites-enabled/default
diff --git a/bin/countly.install_ubuntu.sh b/bin/countly.install_ubuntu.sh
index 7fee8c61dc0..6bcafcf2f4e 100644
--- a/bin/countly.install_ubuntu.sh
+++ b/bin/countly.install_ubuntu.sh
@@ -31,9 +31,6 @@ fi
 #echo | apt-add-repository ppa:chris-lea/node.js
 wget -qO- https://deb.nodesource.com/setup_6.x | bash -
 
-#install mongodb
-bash $DIR/scripts/mongodb.install.sh
-
 #update once more after adding new repos
 apt-get update
 
@@ -56,6 +53,9 @@ apt-get -y install sendmail
 #install grunt & npm modules
 ( cd $DIR/.. ; npm install -g grunt-cli --unsafe-perm ; npm install )
 
+#install mongodb
+bash $DIR/scripts/mongodb.install.sh
+
 #configure and start nginx
 cp /etc/nginx/sites-enabled/default $DIR/config/nginx.default.backup
 cp $DIR/config/nginx.server.conf /etc/nginx/sites-enabled/default
diff --git a/bin/countly.user.install.sh b/bin/countly.user.install.sh
index 1304f5c3f31..db0eb4e4274 100755
--- a/bin/countly.user.install.sh
+++ b/bin/countly.user.install.sh
@@ -31,9 +31,6 @@ fi
 #echo | apt-add-repository ppa:chris-lea/node.js
 wget -qO- https://deb.nodesource.com/setup_6.x | bash -
 
-#install mongodb
-bash $DIR/scripts/mongodb.install.sh
-
 #update once more after adding new repos
 apt-get update
 
@@ -53,6 +50,9 @@ apt-get -y install sendmail
 #install grunt & npm modules
 ( cd $DIR/.. ; npm install -g grunt-cli --unsafe-perm ; npm install )
 
+#install mongodb
+bash $DIR/scripts/mongodb.install.sh
+
 #configure and start nginx
 cp /etc/nginx/sites-enabled/default $DIR/config/nginx.default.backup
 cp $DIR/config/nginx.server.conf /etc/nginx/sites-enabled/default