From 7f1876ea5cdfc30e195c4edea79fb5c7aca7c796 Mon Sep 17 00:00:00 2001
From: Just van den Broecke <just@justobjects.nl>
Date: Thu, 3 Dec 2015 16:55:50 +0100
Subject: [PATCH] #24 fiware platform services update

---
 docs/server-inrichting.rst              |  4 +++
 src/fiware/docker/iotarush              |  5 ++--
 src/fiware/docker/iotarush.yaml         | 34 ++++++++++++++++++-------
 src/fiware/docker/sthcomet/subscribe.sh |  2 +-
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/docs/server-inrichting.rst b/docs/server-inrichting.rst
index 54121c8..9c78522 100644
--- a/docs/server-inrichting.rst
+++ b/docs/server-inrichting.rst
@@ -1381,4 +1381,8 @@ Zie http://mapproxy.org/docs/latest/install.html. ::
     $ mapproxy-util --version
     # Mapproxy 1.6.0
 
+MongoDB Beheer
+--------------
 
+Met http://www.phpmoadmin.com, wel eerst PHP5 MongoDB driver installeren: `` apt-get install php5-mongo``. Verder
+is beheer URL afgeschermd.
diff --git a/src/fiware/docker/iotarush b/src/fiware/docker/iotarush
index ed9d8e8..9e3c8fd 100755
--- a/src/fiware/docker/iotarush
+++ b/src/fiware/docker/iotarush
@@ -37,7 +37,7 @@ NAME=iotarush
 DESC=docker_composition
 # Docker-compose file
 CONF=/opt/geonovum/sospilot/git/src/fiware/docker/iotarush.yaml
-SERVICE_CONTAINERS="docker_iotacpp_1 docker_orion_1 docker_sthcomet_1"
+SERVICE_CONTAINERS="docker_iotacpp_1 docker_orion_1 docker_sthcomet_1 docker_mongodb_1"
 
 . /lib/lsb/init-functions
 
@@ -75,7 +75,7 @@ case "$1" in
   stop)
 	 log_daemon_msg "Stopping $DESC" "$NAME"
 	 stop_containers
-	 purge_services
+	 purge_all
 	 ;;
 	 
   restart)
@@ -93,6 +93,7 @@ case "$1" in
         log_warning_msg "Reinit of $NAME ; all mongodb data will be cleared!!!"
 		stop_containers
 		purge_all
+		/bin/rm -rf /var/lib/mongodb_docker/*
 		$0 start
         ;;
 
diff --git a/src/fiware/docker/iotarush.yaml b/src/fiware/docker/iotarush.yaml
index 8c1b240..59f394c 100644
--- a/src/fiware/docker/iotarush.yaml
+++ b/src/fiware/docker/iotarush.yaml
@@ -1,18 +1,34 @@
-mongodbdata:
-    image: mongo:2.6
-    volumes:
-        - /data/db
-    restart: "no"
-    command: /bin/echo "Data-only container for mongodb."
+#mongodbdata:
+#    image: mongo:2.6
+#    volumes:
+#        - /data/db
+#    restart: "no"
+#    command: /bin/echo "Data-only container for mongodb."
+
+#mongodb:
+#    image: mongo:2.6
+#    volumes_from:
+#        - mongodbdata
+#    expose:
+#        - "27017"
+#    command: --smallfiles
 
 mongodb:
     image: mongo:2.6
-    volumes_from:
-        - mongodbdata
+
+    # Port mapping: allow only access on local docker host
+    ports:
+      - "127.0.0.1:27017:27017"
     expose:
-        - "27017"
+      - "27017"
+
+    # Use storage on host file system
+    volumes:
+      - /var/lib/mongodb_docker:/data/db
     command: --smallfiles
 
+    # restart: always
+
 orion:
     image: geonovum/orionrush
     links:
diff --git a/src/fiware/docker/sthcomet/subscribe.sh b/src/fiware/docker/sthcomet/subscribe.sh
index 067cd5f..28820ff 100755
--- a/src/fiware/docker/sthcomet/subscribe.sh
+++ b/src/fiware/docker/sthcomet/subscribe.sh
@@ -67,7 +67,7 @@ curl ${ORION_HOST}:${ORION_PORT}/v1/subscribeContext -s -S\
     "notifyConditions": [
         {
             "type": "ONCHANGE",
-            "condValues": ["temperature"]
+            "condValues": ["temperature", "humidity", "pm10", "pm2_5"]
         }
     ],
     "throttling": "PT5S"