Explorar el Código

Try to fix Snap MongoDB.

Lauri Ojansivu hace 5 años
padre
commit
bb4fde6374
Se han modificado 4 ficheros con 29 adiciones y 15 borrados
  1. 0 0
      snap-src/bin/config
  2. 22 14
      snap-src/bin/mongodb-control
  3. 2 1
      snap-src/bin/mongodb-restore
  4. 5 0
      snap-src/bin/wekan-help

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
snap-src/bin/config


+ 22 - 14
snap-src/bin/mongodb-control

@@ -16,20 +16,28 @@ fi
 
 export LC_ALL=C
 
-# start mongo deamon
-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"
-fi
-if [ "x" != "x${MONGODB_PORT}" ]; then
-    BIND_OPTIONS+=" --port $MONGODB_PORT"
-fi
-echo "mongodb bind options: $BIND_OPTIONS"
+if [ -z "$MONGO_URL" ]; then
+
+    # start mongo deamon
+    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"
+    fi
+    if [ "x" != "x${MONGODB_PORT}" ]; then
+        BIND_OPTIONS+=" --port $MONGODB_PORT"
+    fi
+    echo "mongodb bind options: $BIND_OPTIONS"
 
-mongod --dbpath $SNAP_COMMON --logpath $SNAP_COMMON/mongodb.log --logappend --journal $BIND_OPTIONS --smallfiles
+    mongod --dbpath $SNAP_COMMON --logpath $SNAP_COMMON/mongodb.log --logappend --journal $BIND_OPTIONS --smallfiles
+
+else
+
+    mongod --dbpath $SNAP_COMMON --logpath $SNAP_COMMON/mongodb.log --logappend --journal $MONGO_URL --smallfiles
+
+fi
 
 # Drop indexes on database upgrade, when starting MongoDB
-mongo wekan --eval "db.getCollectionNames().forEach(function(col_name) { var coll = db.getCollection(col_name); coll.dropIndexes(); });" $BIND_OPTIONS
+#mongo wekan --eval "db.getCollectionNames().forEach(function(col_name) { var coll = db.getCollection(col_name); coll.dropIndexes(); });" $BIND_OPTIONS

+ 2 - 1
snap-src/bin/mongodb-restore

@@ -13,4 +13,5 @@ export LC_ALL=C
 # start mongodb backup
 [ "x" == "x${MONGODB_BIND_IP}" ] && MONGODB_BIND_IP="127.0.0.1"
 echo "using bind ip"
-mongorestore --host $MONGODB_BIND_IP --port $MONGODB_PORT -d wekan --noIndexRestore --gzip  --archive=$1
+mongorestore --host $MONGODB_BIND_IP --port $MONGODB_PORT -d wekan --gzip --archive=$1
+# --noIndexRestore

+ 5 - 0
snap-src/bin/wekan-help

@@ -15,6 +15,11 @@ echo -e "\t$ snap set $SNAP_NAME debug='true'"
 echo -e "\t-Disable the Debug of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME debug='false'"
 echo -e "\n"
+echo -e "To enable the MONGO_URL of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME mongo-url='...'"
+echo -e "\t-Disable the MONGO_URL of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME mongo-url=''"
+echo -e "\n"
 echo -e "Make sure you have connected all interfaces, check more by calling $ snap interfaces ${SNAP_NAME}"
 echo -e "\n"
 echo -e "${SNAP_NAME} has multiple services, to check status use systemctl"

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio