ngageoint
diff --git a/‎docker/README.md
Lines changed: 0 additions & 1 deletion b/‎docker/README.md
Lines changed: 0 additions & 1 deletion
diff --git a/‎instance/config.js
Lines changed: 2 additions & 1 deletion b/‎instance/config.js
Lines changed: 2 additions & 1 deletion
diff --git a/‎mongo-ssl-x509/0-init.sh
100644100755
Lines changed: 3 additions & 2 deletions b/‎mongo-ssl-x509/0-init.sh
100644100755
Lines changed: 3 additions & 2 deletions
diff --git a/‎mongo-ssl-x509/mongo.Dockerfile
Lines changed: 7 additions & 4 deletions b/‎mongo-ssl-x509/mongo.Dockerfile
Lines changed: 7 additions & 4 deletions
diff --git a/‎mongo-ssl-x509/mongod.conf
Lines changed: 6 additions & 6 deletions b/‎mongo-ssl-x509/mongod.conf
Lines changed: 6 additions & 6 deletions
diff --git a/‎plugins/epic/attachments.js
Lines changed: 1 addition & 1 deletion b/‎plugins/epic/attachments.js
Lines changed: 1 addition & 1 deletion
@@ -68,7 +68,6 @@ You can use [`docker-compose logs <service>`](https://docs.docker.com/engine/ref
 $ docker compose logs mage-server
 mage-server_1  | 2018-04-26T23:30:30.684Z - info: Starting MAGE Server ...
 mage-server_1  | 2018-04-26T23:30:31.403Z - info: setting up provision uid
-mage-server_1  | (node:1) DeprecationWarning: Mongoose: mpromise (mongoose's default promise library) is deprecated, plug in your own promise library instead: http://mongoosejs.com/docs/promises.html
 mage-server_1  | 2018-04-26T23:30:31.861Z - info: Using '/var/lib/mage/attachments' as base directory for feature attachments.
 mage-server_1  | 2018-04-26T23:30:31.861Z - info: Using '/var/lib/mage/icons' as base directory for MAGE icons.
 # etc., etc.
 
@@ -20,7 +20,8 @@ module.exports = {
       url: 'mongodb://127.0.0.1:27017/magedb',
       connTimeout: 300,
       connRetryDelay: 5,
-      poolSize: 5,
+      minPoolSize: 5,
+      maxPoolSize: 5,
       ssl: false,
       user: undefined,
       password: undefined,
 
@@ -1,4 +1,5 @@
 
-user_server=$(openssl x509 -subject -nameopt RFC2253 -in /etc/ssl/certs/mage-server.crt.pem | head -1 | sed 's/^subject= //')
-mongo --eval "db.getSiblingDB('\$external').createUser({ user: '$user_server', roles: [{ role: 'readWrite', db: 'magedb' }]})"
 
+user_server=$(openssl x509 -subject -nameopt RFC2253 -in /etc/ssl/certs/mage-server.crt.pem | head -1 | sed 's/^subject= //' | sed 's/^subject=//')
+echo 'Adding user to mongo' $user_server
+mongo --eval "db.getSiblingDB('\$external').createUser({ user: '$user_server', roles: [{ role: 'readWrite', db: 'mage' }]})"
@@ -2,15 +2,18 @@
 # From this directory, run 
 # $ docker build -t mage-mongo:ssl -f mongo.Dockerfile .
 # $ docker run -d --name mage-mongo-ssl -p 27017:27017 mage-mongo:ssl
+# You can verify mongo is up by running the following from this directory:
+# $ mongosh --tls --tlsCertificateKeyFile ./server.pem --tlsCAFile ./ca.crt.pem --tlsAllowInvalidHostnames
 # You can then start a local MAGE server with proper environment configuration pointing to the certificates in this directory.
 
-FROM mongo:3.6-jessie
+
+FROM mongo:4.2
 
 COPY 0-init.sh /docker-entrypoint-initdb.d/
 COPY ca.crt.pem /etc/ssl/certs/mage-ca.crt.pem
 COPY db.pem /etc/ssl/certs/mage-db.pem
 COPY server.crt.pem /etc/ssl/certs/mage-server.crt.pem
 
-CMD [ "mongod", "--sslMode", "requireSSL", "--auth", \
-  "--sslPEMKeyFile", "/etc/ssl/certs/mage-db.pem", \
-  "--sslCAFile", "/etc/ssl/certs/mage-ca.crt.pem" ]
+CMD [ "mongod", "--tlsMode", "requireTLS", "--tlsAllowInvalidHostnames", \
+  "--tlsCertificateKeyFile", "/etc/ssl/certs/mage-db.pem", \
+  "--tlsCAFile", "/etc/ssl/certs/mage-ca.crt.pem" ]
@@ -27,14 +27,14 @@ processManagement:
 net:
   port: 27017
 #  bindIp: 127.0.0.1
-  ssl:
-    mode: requireSSL
+  tls:
+    mode: requireTLS
     CAFile: /etc/ssl/mage-ca.crt.pem
-    PEMKeyFile: /etc/ssl/mage-db.pem
-#    PEMKeyPassword:
+    certificateKeyFile: /etc/ssl/mage-db.pem
+    allowInvalidHostnames: true
 
-security:
-  authorization: enabled
+#security:
+#  authorization: enabled
 
 #operationProfiling:
 
 
@@ -105,7 +105,7 @@ function pushAttachments(done) {
         var project = {"$project": {esriId: true, lastModified: true, attachments: true}};
         var unwind = {"$unwind": "$attachments"};
         var sort = {"$sort": { "attachments.lastModified": 1 }};
-        Observation.observationModel(event).aggregate({"$match": observationMatch}, project, sort, unwind, function(err, aggregate) {
+        Observation.observationModel(event).aggregate([{"$match": observationMatch}], project, sort, unwind, function(err, aggregate) {
           if (err) return done(err);
           log.info(aggregate.length + ' have changed');