Browse Source

Update MongoDB to 2.6 (latest)

This is required if we want to merge #933
Hamilton Turner 11 years ago
parent
commit
9def6938cb
2 changed files with 7 additions and 2 deletions
  1. 1 1
      toolset/setup/linux/installer.py
  2. 6 1
      toolset/setup/linux/prerequisites.sh

+ 1 - 1
toolset/setup/linux/installer.py

@@ -181,7 +181,7 @@ class Installer:
     sudo cp 10gen.list /etc/apt/sources.list.d/10gen.list
     sudo cp 10gen.list /etc/apt/sources.list.d/10gen.list
     sudo apt-get -y update
     sudo apt-get -y update
     sudo apt-get -y remove mongodb-clients
     sudo apt-get -y remove mongodb-clients
-    sudo apt-get -y install mongodb-10gen
+    sudo apt-get -y install mongodb-org
 
 
     sudo stop mongodb
     sudo stop mongodb
     sudo mv /etc/mongodb.conf /etc/mongodb.conf.orig
     sudo mv /etc/mongodb.conf /etc/mongodb.conf.orig

+ 6 - 1
toolset/setup/linux/prerequisites.sh

@@ -6,6 +6,11 @@ RETCODE=$(fw_exists fwbm_prereqs_installed)
   return 0; 
   return 0; 
 }
 }
 
 
+
+# Use a more recent version of Mongo shell
+sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
+echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list
+
 sudo apt-get -y update
 sudo apt-get -y update
 sudo apt-get -y upgrade
 sudo apt-get -y upgrade
 
 
@@ -18,7 +23,7 @@ sudo apt-get -y install \
   libpcre3 libpcre3-dev libpcrecpp0 `# Regular expression support` \
   libpcre3 libpcre3-dev libpcrecpp0 `# Regular expression support` \
   libssl-dev libcurl4-openssl-dev   `# SSL libraries` \
   libssl-dev libcurl4-openssl-dev   `# SSL libraries` \
   libmysqlclient-dev \
   libmysqlclient-dev \
-  mongodb-clients \
+  mongodb-org-shell \
   libsqlite3-dev sqlite3            `# Database libraries` \
   libsqlite3-dev sqlite3            `# Database libraries` \
   zlib1g-dev python-software-properties \
   zlib1g-dev python-software-properties \
   libreadline6-dev \
   libreadline6-dev \