From 0083215ea3955a950d345d44a8663e5b05e8f00f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 26 Aug 2019 22:27:45 +0300 Subject: Default to BIGEVENTS_PATTERN=NONE so that Wekan sends less email notifications. Thanks to rinnaz and xet7 ! Closes #2646, closes #2617 --- Dockerfile | 2 +- docker-compose.yml | 6 ++-- releases/virtualbox/start-wekan.sh | 6 ++-- sandstorm-pkgdef.capnp | 1 + snap-src/bin/config | 4 +-- start-wekan.bat | 6 ++-- start-wekan.sh | 6 ++-- torodb-postgresql/docker-compose.yml | 60 ++++++++++++++++++++++++++++++++++++ 8 files changed, 76 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2b74eb2d..cb4901a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 g++ build-essential ATTACHMENTS_STORE_PATH="" \ MAX_IMAGE_PIXEL="" \ IMAGE_COMPRESS_RATIO="" \ - BIGEVENTS_PATTERN="" \ + BIGEVENTS_PATTERN=NONE \ NOTIFY_DUE_DAYS_BEFORE_AND_AFTER="" \ NOTIFY_DUE_AT_HOUR_OF_DAY="" \ EMAIL_NOTIFICATION_TIMEOUT=30000 \ diff --git a/docker-compose.yml b/docker-compose.yml index 48c4870e..6e1f9bb4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -251,19 +251,19 @@ services: #--------------------------------------------------------------- # ==== BIGEVENTS DUE ETC NOTIFICATIONS ===== # https://github.com/wekan/wekan/pull/2541 - # Introduced a system env var BIGEVENTS_PATTERN default as "due", + # Introduced a system env var BIGEVENTS_PATTERN default as "NONE", # so any activityType matches the pattern, system will send out # notifications to all board members no matter they are watching # or tracking the board or not. Owner of the wekan server can # disable the feature by setting this variable to "NONE" or # change the pattern to any valid regex. i.e. '|' delimited # activityType names. - # a) Default + # a) Example #- BIGEVENTS_PATTERN=due # b) All #- BIGEVENTS_PATTERN=received|start|due|end # c) Disabled - #- BIGEVENTS_PATTERN=NONE + - BIGEVENTS_PATTERN=NONE #--------------------------------------------------------------- # ==== EMAIL DUE DATE NOTIFICATION ===== # https://github.com/wekan/wekan/pull/2536 diff --git a/releases/virtualbox/start-wekan.sh b/releases/virtualbox/start-wekan.sh index 733b6b67..ded310fe 100755 --- a/releases/virtualbox/start-wekan.sh +++ b/releases/virtualbox/start-wekan.sh @@ -50,19 +50,19 @@ #--------------------------------------------------------------- # ==== BIGEVENTS DUE ETC NOTIFICATIONS ===== # https://github.com/wekan/wekan/pull/2541 - # Introduced a system env var BIGEVENTS_PATTERN default as "due", + # Introduced a system env var BIGEVENTS_PATTERN default as "NONE", # so any activityType matches the pattern, system will send out # notifications to all board members no matter they are watching # or tracking the board or not. Owner of the wekan server can # disable the feature by setting this variable to "NONE" or # change the pattern to any valid regex. i.e. '|' delimited # activityType names. - # a) Default + # a) Example #export BIGEVENTS_PATTERN=due # b) All #export BIGEVENTS_PATTERN=received|start|due|end # c) Disabled - #export BIGEVENTS_PATTERN=NONE + export BIGEVENTS_PATTERN=NONE #--------------------------------------------------------------- # ==== EMAIL DUE DATE NOTIFICATION ===== # https://github.com/wekan/wekan/pull/2536 diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 0707eb84..560e8aa2 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -240,6 +240,7 @@ const myCommand :Spk.Manifest.Command = ( (key = "WITH_API", value = "true"), (key = "RICHER_CARD_COMMENT_EDITOR", value="true"), (key = "CARD_OPENED_WEBHOOK_ENABLED", value="false"), + (key = "BIGEVENTS_PATTERN", value="NONE"), (key = "MATOMO_ADDRESS", value=""), (key = "MATOMO_SITE_ID", value=""), (key = "MATOMO_DO_NOT_TRACK", value="true"), diff --git a/snap-src/bin/config b/snap-src/bin/config index aba15f63..855caa32 100755 --- a/snap-src/bin/config +++ b/snap-src/bin/config @@ -104,8 +104,8 @@ DESCRIPTION_IMAGE_COMPRESS_RATIO="Image compress ratio: Allow to shrink attached DEFAULT_IMAGE_COMPRESS_RATIO="" KEY_IMAGE_COMPRESS_RATIO="image-compress-ratio" -DESCRIPTION_BIGEVENTS_PATTERN="Big events pattern: Notify always due etc regardless of notification settings. Default: due, All: received|start|due|end, Disabled: NONE" -DEFAULT_BIGEVENTS_PATTERN="" +DESCRIPTION_BIGEVENTS_PATTERN="Big events pattern: Notify always due etc regardless of notification settings. Default: NONE, All: received|start|due|end, Disabled: NONE" +DEFAULT_BIGEVENTS_PATTERN="NONE" KEY_BIGEVENTS_PATTERN="bigevents-pattern" DESCRIPTION_NOTIFY_DUE_DAYS_BEFORE_AND_AFTER="Notify due days, default 2 days before and after. 0 = due notifications disabled. Default: 2" diff --git a/start-wekan.bat b/start-wekan.bat index d4628ee7..063c752a 100755 --- a/start-wekan.bat +++ b/start-wekan.bat @@ -45,19 +45,19 @@ REM SET ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 REM # ==== BIGEVENTS DUE ETC NOTIFICATIONS ===== REM # https://github.com/wekan/wekan/pull/2541 -REM # Introduced a system env var BIGEVENTS_PATTERN default as "due", +REM # Introduced a system env var BIGEVENTS_PATTERN default as "NONE", REM # so any activityType matches the pattern, system will send out REM # notifications to all board members no matter they are watching REM # or tracking the board or not. Owner of the wekan server can REM # disable the feature by setting this variable to "NONE" or REM # change the pattern to any valid regex. i.e. '|' delimited REM # activityType names. -REM # a) Default +REM # a) Example REM SET BIGEVENTS_PATTERN=due REM # b) All REM SET BIGEVENTS_PATTERN=received|start|due|end REM # c) Disabled -REM SET BIGEVENTS_PATTERN=NONE +SET BIGEVENTS_PATTERN=NONE REM # ==== EMAIL DUE DATE NOTIFICATION ===== REM # https://github.com/wekan/wekan/pull/2536 diff --git a/start-wekan.sh b/start-wekan.sh index 41d41208..5c319311 100755 --- a/start-wekan.sh +++ b/start-wekan.sh @@ -51,19 +51,19 @@ #--------------------------------------------------------------- # ==== BIGEVENTS DUE ETC NOTIFICATIONS ===== # https://github.com/wekan/wekan/pull/2541 - # Introduced a system env var BIGEVENTS_PATTERN default as "due", + # Introduced a system env var BIGEVENTS_PATTERN default as "NONE", # so any activityType matches the pattern, system will send out # notifications to all board members no matter they are watching # or tracking the board or not. Owner of the wekan server can # disable the feature by setting this variable to "NONE" or # change the pattern to any valid regex. i.e. '|' delimited # activityType names. - # a) Default + # a) Example #export BIGEVENTS_PATTERN=due # b) All #export BIGEVENTS_PATTERN=received|start|due|end # c) Disabled - #export BIGEVENTS_PATTERN=NONE + export BIGEVENTS_PATTERN=NONE #--------------------------------------------------------------- # ==== EMAIL DUE DATE NOTIFICATION ===== # https://github.com/wekan/wekan/pull/2536 diff --git a/torodb-postgresql/docker-compose.yml b/torodb-postgresql/docker-compose.yml index 4a6a745d..550752a5 100644 --- a/torodb-postgresql/docker-compose.yml +++ b/torodb-postgresql/docker-compose.yml @@ -211,6 +211,66 @@ services: # https://github.com/wekan/wekan-gogs # If you disable Wekan API with false, Export Board does not work. - WITH_API=true + #--------------------------------------------------------------- + # ==== PASSWORD BRUTE FORCE PROTECTION ==== + #https://atmospherejs.com/lucasantoniassi/accounts-lockout + #Defaults below. Uncomment to change. wekan/server/accounts-lockout.js + #- ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 + #- ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 + #- ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15 + #- ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3 + #- ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 + #- ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 + #--------------------------------------------------------------- + # ==== STORE ATTACHMENT ON SERVER FILESYSTEM INSTEAD OF MONGODB ==== + # https://github.com/wekan/wekan/pull/2603 + #- ATTACHMENTS_STORE_PATH = # pathname can be relative or fullpath + #--------------------------------------------------------------- + # ==== RICH TEXT EDITOR IN CARD COMMENTS ==== + # https://github.com/wekan/wekan/pull/2560 + - RICHER_CARD_COMMENT_EDITOR=true + #--------------------------------------------------------------- + # ==== CARD OPENED, SEND WEBHOOK MESSAGE ==== + # https://github.com/wekan/wekan/issues/2518 + - CARD_OPENED_WEBHOOK_ENABLED=false + #--------------------------------------------------------------- + # ==== Allow to shrink attached/pasted image ==== + # https://github.com/wekan/wekan/pull/2544 + #-MAX_IMAGE_PIXEL=1024 + #-IMAGE_COMPRESS_RATIO=80 + #--------------------------------------------------------------- + # ==== BIGEVENTS DUE ETC NOTIFICATIONS ===== + # https://github.com/wekan/wekan/pull/2541 + # Introduced a system env var BIGEVENTS_PATTERN default as "NONE", + # so any activityType matches the pattern, system will send out + # notifications to all board members no matter they are watching + # or tracking the board or not. Owner of the wekan server can + # disable the feature by setting this variable to "NONE" or + # change the pattern to any valid regex. i.e. '|' delimited + # activityType names. + # a) Example + #- BIGEVENTS_PATTERN=due + # b) All + #- BIGEVENTS_PATTERN=received|start|due|end + # c) Disabled + - BIGEVENTS_PATTERN=NONE + #--------------------------------------------------------------- + # ==== EMAIL DUE DATE NOTIFICATION ===== + # https://github.com/wekan/wekan/pull/2536 + # System timelines will be showing any user modification for + # dueat startat endat receivedat, also notification to + # the watchers and if any card is due, about due or past due. + # + # Notify due days, default 2 days before and after. 0 = due notifications disabled. Default: 2 + #- NOTIFY_DUE_DAYS_BEFORE_AND_AFTER=2 + # + # Notify due at hour of day. Default every morning at 8am. Can be 0-23. + # If env variable has parsing error, use default. Notification sent to watchers. + #- NOTIFY_DUE_AT_HOUR_OF_DAY=8 + #----------------------------------------------------------------- + # ==== EMAIL NOTIFICATION TIMEOUT, ms ===== + # Defaut: 30000 ms = 30s + #- EMAIL_NOTIFICATION_TIMEOUT=30000 #----------------------------------------------------------------- # ==== CORS ===== # CORS: Set Access-Control-Allow-Origin header. Example: * -- cgit v1.2.3-1-g7c22