From 8ab42575aaba08f471890aa0622e50653131f5cd Mon Sep 17 00:00:00 2001 From: Melissa Mcewen Date: Sat, 14 Mar 2015 16:26:04 -0500 Subject: [PATCH 1/4] changed method of installing mongodb and phantomjs in Vagrant file --- vagrant.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vagrant.sh b/vagrant.sh index a61831097e..15e2b59e62 100644 --- a/vagrant.sh +++ b/vagrant.sh @@ -41,12 +41,14 @@ apt-get install -qq graphicsmagick echo Installing phantomjs and dependency... apt-get install -qq libicu48 +npm install phantomjs + echo Installing requirements for grunt-spritesmith... apt-get install -qq pkg-config libcairo2-dev libjpeg-dev echo Installing Mongodb... -apt-get install -qq mongodb +sudo apt-get install -y mongodb-org echo Installing Git... apt-get install -qq git From fdc368adb7c972fbb92f5b8fec56838e3bb00978 Mon Sep 17 00:00:00 2001 From: Melissa Mcewen Date: Sat, 14 Mar 2015 16:26:04 -0500 Subject: [PATCH 2/4] changed method of installing mongodb and phantomjs in Vagrant file --- vagrant.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vagrant.sh b/vagrant.sh index a61831097e..15e2b59e62 100644 --- a/vagrant.sh +++ b/vagrant.sh @@ -41,12 +41,14 @@ apt-get install -qq graphicsmagick echo Installing phantomjs and dependency... apt-get install -qq libicu48 +npm install phantomjs + echo Installing requirements for grunt-spritesmith... apt-get install -qq pkg-config libcairo2-dev libjpeg-dev echo Installing Mongodb... -apt-get install -qq mongodb +sudo apt-get install -y mongodb-org echo Installing Git... apt-get install -qq git From d55ef965c74df08950831f6c6a8b949911039765 Mon Sep 17 00:00:00 2001 From: Melissa Date: Thu, 26 Mar 2015 16:54:28 -0500 Subject: [PATCH 3/4] issue #3852 change Mongodb installion --- vagrant.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/vagrant.sh b/vagrant.sh index 15e2b59e62..c662057a9c 100644 --- a/vagrant.sh +++ b/vagrant.sh @@ -30,6 +30,14 @@ echo cd /vagrant >> /home/vagrant/.bashrc # Prevent warnings: "dpkg-preconfigure: unable to re-open stdin ..." export DEBIAN_FRONTEND=noninteractive +# Import MongoDB public GPG key +# http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/ +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 + +# Create a list file for MongoDB +echo "deb http://repo.mongodb.org/apt/ubuntu "$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.0.list + + echo Updating repositories... apt-get update -qq @@ -41,8 +49,6 @@ apt-get install -qq graphicsmagick echo Installing phantomjs and dependency... apt-get install -qq libicu48 -npm install phantomjs - echo Installing requirements for grunt-spritesmith... apt-get install -qq pkg-config libcairo2-dev libjpeg-dev From d9193ad42417950e199b1081aa8136fce91479a8 Mon Sep 17 00:00:00 2001 From: Melissa Mcewen Date: Fri, 27 Mar 2015 14:25:41 -0500 Subject: [PATCH 4/4] issue #3852 change Mongodb installion to correct version --- vagrant.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/vagrant.sh b/vagrant.sh index c662057a9c..3a1ea76b0f 100644 --- a/vagrant.sh +++ b/vagrant.sh @@ -30,14 +30,6 @@ echo cd /vagrant >> /home/vagrant/.bashrc # Prevent warnings: "dpkg-preconfigure: unable to re-open stdin ..." export DEBIAN_FRONTEND=noninteractive -# Import MongoDB public GPG key -# http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/ -sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 - -# Create a list file for MongoDB -echo "deb http://repo.mongodb.org/apt/ubuntu "$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.0.list - - echo Updating repositories... apt-get update -qq @@ -53,8 +45,17 @@ apt-get install -qq libicu48 echo Installing requirements for grunt-spritesmith... apt-get install -qq pkg-config libcairo2-dev libjpeg-dev +# Import MongoDB public GPG key +# http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/ +apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 + +# Create a list file for MongoDB +echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list + echo Installing Mongodb... -sudo apt-get install -y mongodb-org +apt-get update +apt-get install mongodb-10gen +apt-get install -y mongodb-org=2.6.4 mongodb-org-server=2.6.4 mongodb-org-shell=2.6.4 mongodb-org-mongos=2.6.4 mongodb-org-tools=2.6.4 echo Installing Git... apt-get install -qq git