Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
103
Merge Requests
103
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
cb365038
Commit
cb365038
authored
May 17, 2023
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mail-server: use request dns entry domain instead of mail_domain parameter
parent
bb44e5d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
software/mail-server/buildout.hash.cfg
software/mail-server/buildout.hash.cfg
+1
-1
software/mail-server/instance-default.cfg.in
software/mail-server/instance-default.cfg.in
+2
-2
No files found.
software/mail-server/buildout.hash.cfg
View file @
cb365038
...
...
@@ -19,7 +19,7 @@ md5sum = 7ab3b606972e1b338d28fc1374617835
[template-default]
_update_hash_filename_ = instance-default.cfg.in
md5sum =
123a56ab69723d869bc52169fa5d530b
md5sum =
698104b7c3694a69575c965c21629f87
[dovecot.jinja2.conf]
_update_hash_filename_ = dovecot.jinja2.conf
...
...
software/mail-server/instance-default.cfg.in
View file @
cb365038
...
...
@@ -134,13 +134,13 @@ output = ${directory:etc-postfix}/master.cf
url = {{ postfix_vmailbox_template }}
output = ${directory:etc-postfix}/postfix-vmailbox
extra-context =
raw mail_domain {{ slapparameter_dict.get('mail_domain', '') }}
key mail_domain request-dns-entry:connection-domain
[postfix-virtual]
<= config-base
url = {{ postfix_virtual_template }}
output = ${directory:etc-postfix}/postfix-virtual
extra-context =
raw mail_domain {{ slapparameter_dict.get('mail_domain', '') }}
key mail_domain request-dns-entry:connection-domain
[dovecot-wrapper]
recipe = slapos.recipe.template
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment