infrastructure/mailstack
Watch
2
0
Fork
You've already forked mailstack
 0
Code Issues 11 Pull requests 2 Projects Releases Packages Wiki Activity

Add support for StartTLS in LDAP server #46

Open
david wants to merge 1 commit from feature/ldap-starttls into develop
pull from: feature/ldap-starttls
merge into: infrastructure:develop
Conversation 3 Commits 1 Files changed 5 +22 -2
david commented 2019-09-30 15:15:31 +00:00 (Migrated from dev.cryptec.at)

And partly for implicit TLS

And partly for implicit TLS
root commented 2020-01-31 14:42:23 +00:00 (Migrated from dev.cryptec.at)

added 4 commits

  • 7cbb605a...74c51b65 - 3 commits from branch develop
  • 52313ad7 - Add support for StartTLS in LDAP server

Compare with previous version

added 4 commits <ul><li>7cbb605a...74c51b65 - 3 commits from branch <code>develop</code></li><li>52313ad7 - Add support for StartTLS in LDAP server</li></ul> [Compare with previous version](/infrastructure/mailstack/merge_requests/27/diffs?diff_id=485&start_sha=7cbb605a28703546b3baf469269806f9a84b5499)
root commented 2020-01-31 14:47:09 +00:00 (Migrated from dev.cryptec.at) 
      DOVECOT_LDAP_STARTTLS: "{{ .ldap.starttls }}"

The option ldap.tls was renamed to ldap.starttls. Is this an artifact from his change?

```suggestion:-0+0 DOVECOT_LDAP_STARTTLS: "{{ .ldap.starttls }}" ``` The option `ldap.tls` was renamed to `ldap.starttls`. Is this an artifact from his change?
root commented 2020-01-31 14:51:10 +00:00 (Migrated from dev.cryptec.at)

added 4 commits

  • 52313ad7...a4a192e0 - 3 commits from branch develop
  • d2731922 - Add support for StartTLS in LDAP server

Compare with previous version

added 4 commits <ul><li>52313ad7...a4a192e0 - 3 commits from branch <code>develop</code></li><li>d2731922 - Add support for StartTLS in LDAP server</li></ul> [Compare with previous version](/infrastructure/mailstack/merge_requests/27/diffs?diff_id=488&start_sha=52313ad7282271cf6e386a2031a939acd94dd8c3)
This pull request has changes conflicting with the target branch.
  • docker-compose.template.yml
  • dovecot/files/dovecot/dovecot-ldap.conf.ext
  • postfix/files/postfix/ldap_virtual_recipients.cf
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'feature/ldap-starttls:feature/ldap-starttls'
git switch 'feature/ldap-starttls'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'develop'
git merge --no-ff 'feature/ldap-starttls'
git switch 'feature/ldap-starttls'
git rebase 'develop'
git switch 'develop'
git merge --ff-only 'feature/ldap-starttls'
git switch 'feature/ldap-starttls'
git rebase 'develop'
git switch 'develop'
git merge --no-ff 'feature/ldap-starttls'
git switch 'develop'
git merge --squash 'feature/ldap-starttls'
git switch 'develop'
git merge --ff-only 'feature/ldap-starttls'
git switch 'develop'
git merge 'feature/ldap-starttls'
git push origin 'develop'
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Bug

   
Doing

   
Dovecot
Issues regarding the dovecot Container

  
Improvement

   
To Do
No labels
Bug
Doing
Dovecot
Improvement
To Do
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
infrastructure/mailstack!46
No description provided.