Merge lp:~flepied/charms/precise/mongodb/trunk into lp:charms/mongodb

[Frederic Lepied]

fix hardcoded DEFAULT_PORT in install hook

[Juan L. Negron (negronjl)]

Thanks for the updates Fred.

Approved.

-Juan

review: Approve

[Clint Byrum (clint-fewbar)]

Pushed into precise, this should also be pushed to oneiric but this bug is blocking that:

https://bugs.launchpad.net/charms/+bug/991980

=== modified file 'hooks/install'
--- hooks/install	2012-01-27 17:32:55 +0000
+++ hooks/install	2012-04-30 06:10:22 +0000
@@ -39,7 +39,7 @@
 # set.  In our case, we have defaulted to "myset".
 ############################################################################################################
 # Web Admin UI
-if [ "$WEB_ADMIN_UI" == "True" ]; then
+if [ "$WEB_ADMIN_UI" == "yes" ]; then
 	sed -i -e "s/ -- / -- --rest /" /etc/init/mongodb.conf
 fi
 
@@ -75,7 +75,7 @@
 ############################################################################################################
 # Register the port
 ############################################################################################################
-[ -x /usr/bin/open-port ] && open-port 27017/TCP
-if [ "$WEB_ADMIN_UI" == "True" ]; then
-	[ -x /usr/bin/open-port ] && open-port 28017/TCP
+[ -x /usr/bin/open-port ] && open-port ${DEFAULT_PORT}/TCP
+if [ "$WEB_ADMIN_UI" == "yes" ]; then
+    [ -x /usr/bin/open-port ] && open-port $((${DEFAULT_PORT} + 1000))/TCP
 fi