summaryrefslogtreecommitdiffstats
path: root/snap-src
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2020-05-25 17:54:51 +0300
committerLauri Ojansivu <x@xet7.org>2020-05-25 17:54:51 +0300
commitd52affe65893f17bab59bb43aa9f5afbb54993d3 (patch)
tree82b88066d4fb8efb6610ed77177d3747d34f0480 /snap-src
parent23dcd084a49de4e6568527d8f97ed25adb04dafd (diff)
downloadwekan-d52affe65893f17bab59bb43aa9f5afbb54993d3.tar.gz
wekan-d52affe65893f17bab59bb43aa9f5afbb54993d3.tar.bz2
wekan-d52affe65893f17bab59bb43aa9f5afbb54993d3.zip
Move In Progress ostrio-files changes to separate branch, and revert ostrio-files changes, so that:
- Export to CSV/TSV with custom fields works - Attachments are not exported to disk - It is possible to build arm64/s390x versions again. Thanks to xet7 ! Related #3110
Diffstat (limited to 'snap-src')
-rwxr-xr-xsnap-src/bin/config4
-rwxr-xr-xsnap-src/bin/mongodb-control8
2 files changed, 7 insertions, 5 deletions
diff --git a/snap-src/bin/config b/snap-src/bin/config
index ec0d3a0b..065b8685 100755
--- a/snap-src/bin/config
+++ b/snap-src/bin/config
@@ -93,9 +93,11 @@ DEFAULT_ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW="15"
KEY_ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW="accounts-lockout-unknown-users-failure-window"
DESCRIPTION_ATTACHMENTS_STORE_PATH="Allow wekan ower to specify where uploaded files to store on the server instead of the mongodb"
-DEFAULT_ATTACHMENTS_STORE_PATH="/var/snap/wekan/common/uploads/"
+DEFAULT_ATTACHMENTS_STORE_PATH=""
KEY_ATTACHMENTS_STORE_PATH="attachments-store-path"
+# Example, not in use: /var/snap/wekan/common/uploads/
+
DESCRIPTION_MAX_IMAGE_PIXEL="Max image pixel: Allow to shrink attached/pasted image https://github.com/wekan/wekan/pull/2544"
DEFAULT_MAX_IMAGE_PIXEL=""
KEY_MAX_IMAGE_PIXEL="max-image-pixel"
diff --git a/snap-src/bin/mongodb-control b/snap-src/bin/mongodb-control
index 558aecd0..a78f7dfc 100755
--- a/snap-src/bin/mongodb-control
+++ b/snap-src/bin/mongodb-control
@@ -24,11 +24,11 @@ if test -f "$SNAP_COMMON/mongodb.log"; then
rm -f "$SNAP_COMMON/mongodb.log"
fi
-# If uploads directory does not exist, create it.
+# Not in use. If uploads directory does not exist, create it.
# Wekan will store attachments there.
-if [ ! -d "$SNAP_COMMON/uploads" ]; then
- mkdir "$SNAP_COMMON/uploads"
-fi
+#if [ ! -d "$SNAP_COMMON/uploads" ]; then
+# mkdir "$SNAP_COMMON/uploads"
+#fi
# Alternative: When starting MongoDB, and using logfile, truncate log to last 1000 lines of text.
# 1) If file exists: