From d3189d55206417557b03fde732693aaffca54cf8 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sun, 29 Nov 2015 23:52:56 +0100
Subject: bugfix for mongo service and reshapping of ooconv

---
 Services/mongo/Dockerfile   |  5 +----
 Services/mongo/mongodb.conf | 24 ------------------------
 Services/mongo/run.sh       |  5 ++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 Services/mongo/mongodb.conf

(limited to 'Services/mongo')

diff --git a/Services/mongo/Dockerfile b/Services/mongo/Dockerfile
index f240622..98ec5f8 100644
--- a/Services/mongo/Dockerfile
+++ b/Services/mongo/Dockerfile
@@ -4,14 +4,11 @@ MAINTAINER Christophe LARUE <dev@startx.fr>
 USER root
 RUN dnf -y install mongodb mongodb-server libmongo-client rsyslog-mongodb  && \
     dnf clean all 
-ENV MONGOCONF=/etc/mongodb.conf \
-    STARTUPLOG=/data/logs/mongodb/startup.log \
+ENV STARTUPLOG=/data/logs/mongodb/startup.log \
     LOG_PATH=/data/logs/mongodb  \
     DATA_PATH=/data/mongodb
-COPY mongodb.conf $MONGOCONF
 COPY *.sh /bin/
 RUN chmod 775 /bin/run.sh && \
-    chmod ug+r $MONGOCONF && \
     mkdir -p $DATA_PATH && \
     mkdir -p $LOG_PATH && \
     touch $STARTUPLOG
diff --git a/Services/mongo/mongodb.conf b/Services/mongo/mongodb.conf
deleted file mode 100644
index 0fe4d13..0000000
--- a/Services/mongo/mongodb.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-bind_ip = 127.0.0.1
-port = 27017
-fork = true
-pidfilepath = /var/run/mongodb/mongodb.pid
-logpath = /data/logs/mongodb/mongodb.log
-dbpath =/data/mongodb
-journal = true
-
-# Turn on/off security.  Off is currently the default
-#noauth = true
-#auth = true
-
-# Verbose logging output.
-#verbose = true
-
-# Disable the HTTP interface (Defaults to port+1000).
-#nohttpinterface = true
-
-# Accout token for Mongo monitoring server.
-#mms-token = <token>
-#mms-name = container-sv-mongo
-#mms-interval = 2
-
-# Replication Options
diff --git a/Services/mongo/run.sh b/Services/mongo/run.sh
index 195100e..60b82c8 100644
--- a/Services/mongo/run.sh
+++ b/Services/mongo/run.sh
@@ -75,9 +75,8 @@ function start_daemon {
     echo "=> Starting mongodb daemon ..." | tee -a $STARTUPLOG
     su mongodb
     display_container_started | tee -a $STARTUPLOG
-    exec /usr/bin/mongod --config $MONGOCONF --logappend --logpath $LOG_PATH \
-    --dbpath $DATA_PATH --journal --httpinterface \
-    --rest --master --storageEngine mmapv1
+    /usr/bin/mongod --logappend --logpath $LOG_PATH/mongodb.log --dbpath $DATA_PATH --journal --fork
+    exec tail -f $LOG_PATH/mongodb.log 
 }
 
 
-- 
cgit v1.2.3