From d52affe65893f17bab59bb43aa9f5afbb54993d3 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 25 May 2020 17:54:51 +0300 Subject: 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 --- snap-src/bin/config | 4 +++- snap-src/bin/mongodb-control | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'snap-src') 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: -- cgit v1.2.3-1-g7c22