浏览代码

Update mongodb-control

Fixes for mongosh to allow snap packages to update to the edge/candidate version
lorodoes 1 年之前
父节点
当前提交
bbd7765432
共有 1 个文件被更改,包括 9 次插入6 次删除
  1. 9 6
      snap-src/bin/mongodb-control

+ 9 - 6
snap-src/bin/mongodb-control

@@ -80,14 +80,17 @@ if [ -z "$MONGO_URL" ]; then
 
     # start mongo deamon
     BIND_OPTIONS=""
+    SH_BIND_OPTIONS=""
     if [ "nill" != "$MONGODB_BIND_UNIX_SOCKET" ] && [ "x" != "x${MONGODB_BIND_UNIX_SOCKET}" ]; then
         BIND_OPTIONS+=" --unixSocketPrefix  $MONGODB_BIND_UNIX_SOCKET"
     fi
     if [ "x" != "x${MONGODB_BIND_IP}" ]; then
         BIND_OPTIONS+=" --bind_ip $MONGODB_BIND_IP"
+        SH_BIND_OPTIONS+=" --host $MONGODB_BIND_IP"
     fi
     if [ "x" != "x${MONGODB_PORT}" ]; then
         BIND_OPTIONS+=" --port $MONGODB_PORT"
+        SH_BIND_OPTIONS+=" --port $MONGODB_PORT"
     fi
     echo "mongodb bind options: $BIND_OPTIONS"
 
@@ -109,16 +112,16 @@ if [ -z "$MONGO_URL" ]; then
 
 
     # Disable MongoDB telemetry and free monitoring
-    mongosh wekan --eval 'disableTelemetry();' $BIND_OPTIONS
-    mongosh wekan --eval 'db.disableFreeMonitoring();' $BIND_OPTIONS
+    mongosh wekan --eval 'disableTelemetry();' $SH_BIND_OPTIONS
+    mongosh wekan --eval 'db.disableFreeMonitoring();' $SH_BIND_OPTIONS
     # Snap: Disable apparmor="DENIED" at syslog
     # https://github.com/wekan/wekan/issues/4855
-    mongosh wekan --eval 'db.adminCommand({ setParameter: 1, diagnosticDataCollectionEnabled: false});' $BIND_OPTIONS
+    mongosh wekan --eval 'db.adminCommand({ setParameter: 1, diagnosticDataCollectionEnabled: false});' $SH_BIND_OPTIONS
     # Drop indexes on database upgrade, when starting MongoDB
-    #mongosh wekan --eval "db.getCollectionNames().forEach(function(col_name) { var coll = db.getCollection(col_name); coll.dropIndexes(); });" $BIND_OPTIONS
-    mongosh wekan --eval 'db.adminCommand({ setFeatureCompatibilityVersion: "4.4" });' $BIND_OPTIONS
+    #mongosh wekan --eval "db.getCollectionNames().forEach(function(col_name) { var coll = db.getCollection(col_name); coll.dropIndexes(); });" $SH_BIND_OPTIONS
+    mongosh wekan --eval 'db.adminCommand({ setFeatureCompatibilityVersion: "4.4" });' $SH_BIND_OPTIONS
     # Delete incomplete uploads so that they would not prevent starting WeKan
-    mongosh wekan --eval 'db.getCollection("cfs.attachments.filerecord").find( { "uploadedAt": { "$exists": true }, "copies.attachments" : null,"failures.copies.attachments.doneTrying" : {"$ne" : true}});' $BIND_OPTIONS
+    mongosh wekan --eval 'db.getCollection("cfs.attachments.filerecord").find( { "uploadedAt": { "$exists": true }, "copies.attachments" : null,"failures.copies.attachments.doneTrying" : {"$ne" : true}});' $SH_BIND_OPTIONS
 
 else