zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/install_couchbase_update into lp:zorba/couchbase-module.

Commit message:
Updated install script for Couchbase 2.0.1 and Ubuntu 12.04; some cleanup

Requested reviews:
  Juan Zacarias (juan457)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/install_couchbase_update/+merge/171023
-- 
https://code.launchpad.net/~zorba-coders/zorba/install_couchbase_update/+merge/171023
Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module.

=== modified file 'install_couchbase/install.cmake'
--- install_couchbase/install.cmake	2012-12-18 09:14:39 +0000
+++ install_couchbase/install.cmake	2013-06-24 07:02:28 +0000
@@ -30,21 +30,22 @@
 ENDIF(SKIP_COUCHBASE_DOWNLOAD)
 
 #Couchbase Configure
-  #Check what version of couchbase server to download
-  IF(system)
-    SET(DOWNLOAD_PATH "http://packages.couchbase.com/releases/2.0.0-beta";)
-    IF (${system} STREQUAL "ubuntu32")
-      SET(COUCHBASE_DEB_NAME "couchbase-server-community_x86_2.0.0-beta.deb")
-    ELSE (${system} STREQUAL "ubuntu32")
-      IF (${system} STREQUAL "ubuntu64")
-        SET(COUCHBASE_DEB_NAME "couchbase-server-community_x86_64_2.0.0-beta.deb")
-      ELSE (${system} STREQUAL "ubuntu64")
-        MESSAGE(FATAL_ERROR "Invalid value for system (available values ubuntu32 and ubuntu64")
-      ENDIF (${system} STREQUAL "ubuntu64")
-    ENDIF (${system} STREQUAL "ubuntu32")  
-  ELSE(system)
-    MESSAGE(FATAL_ERROR "the variable 'system' must be set")
-  ENDIF(system)
+#Check what version of couchbase server to download
+SET (COUCHBASE_VER "2.0.1")
+IF(system)
+  SET(DOWNLOAD_PATH "http://packages.couchbase.com/releases/${COUCHBASE_VER}";)
+  IF (${system} STREQUAL "ubuntu32")
+    SET(COUCHBASE_DEB_NAME
+      "couchbase-server-enterprise_x86_${COUCHBASE_VER}.deb")
+  ELSEIF (${system} STREQUAL "ubuntu64")
+    SET(COUCHBASE_DEB_NAME
+      "couchbase-server-enterprise_x86_64_${COUCHBASE_VER}.deb")
+  ELSE (${system} STREQUAL "ubuntu32")
+    MESSAGE(FATAL_ERROR "Invalid value for system (available values ubuntu32 and ubuntu64")
+  ENDIF (${system} STREQUAL "ubuntu32")  
+ELSE(system)
+  MESSAGE(FATAL_ERROR "the variable 'system' must be set")
+ENDIF(system)
 
 #Couchbase Download
 IF(COUCHBASE_DOWNLOAD)
@@ -59,12 +60,12 @@
 
 #Couchbase Install
 MESSAGE(STATUS "Installing Couchbase Server...")
+EXECUTE_PROCESS(COMMAND sudo apt-get install libssl0.9.8)
 EXECUTE_PROCESS(COMMAND sudo dpkg -i ${COUCHBASE_DEB_NAME})
-EXECUTE_PROCESS(COMMAND sudo apt-get install -f)
 
 #Couchbase C SDK Install
 MESSAGE(STATUS "Installing Couchbase C SDK...")
-EXECUTE_PROCESS(COMMAND sudo "${WGET}" -O/etc/apt/sources.list.d/couchbase.list http://packages.couchbase.com/ubuntu/couchbase-ubuntu1110.list)
+EXECUTE_PROCESS(COMMAND sudo "${WGET}" -O/etc/apt/sources.list.d/couchbase.list http://packages.couchbase.com/ubuntu/couchbase-ubuntu1204.list)
 EXECUTE_PROCESS(COMMAND "${WGET}" -O- http://packages.couchbase.com/ubuntu/couchbase.key
   COMMAND sudo apt-key add -)
 EXECUTE_PROCESS(COMMAND apt-get update)