Skip to content

Commit 1642875

Browse files
committed
Release 13.10.0.3 - See CHANGELOG.md
1 parent a6dd072 commit 1642875

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 13.10.0.3 2021-03-27 <dave at tiredofit dot ca>
2+
3+
### Added
4+
- Add IMAP_EXPUNGE option to delete messages from source mailbox after downloaded into Gitlab
5+
6+
17
## 13.10.2 2021-03-27 <dave at tiredofit dot ca>
28

39
### Added

install/assets/defaults/20-gitlab

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@ IMAP_SSL=${IMAP_SSL:-true}
289289
IMAP_STARTTLS=${IMAP_STARTTLS:-false}
290290
IMAP_MAILBOX=${IMAP_MAILBOX:-Inbox}
291291
IMAP_TIMEOUT=${IMAP_TIMEOUT:-60}
292+
IMAP_EXPUNGE=${IMAP_EXPUNGE:-true}
293+
292294

293295
if [ -n ${IMAP_USER} ]; then
294296
IMAP_ENABLED=${IMAP_ENABLED:-true}

install/assets/functions/20-gitlab

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,8 @@ gitlab_configure_mailroom() {
374374
IMAP_SSL \
375375
IMAP_STARTTLS \
376376
IMAP_MAILBOX \
377-
IMAP_TIMEOUT
377+
IMAP_TIMEOUT \
378+
IMAP_EXPUNGE
378379

379380
# enable/disable startup of mailroom
380381
echo "mail_room_enabled=${GITLAB_INCOMING_EMAIL_ENABLED}" >> /etc/default/gitlab

install/assets/gitlab/config/gitlabhq/gitlab.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ production: &base
164164
# The IDLE command timeout.
165165
idle_timeout: {{IMAP_TIMEOUT}}
166166

167+
# Delete after downloaded
168+
expunge_deleted: {{IMAP_EXPUNGE}}
169+
167170
## Build Artifacts
168171
artifacts:
169172
enabled: {{GITLAB_ARTIFACTS_ENABLED}}

0 commit comments

Comments
 (0)