wip
This commit is contained in:
parent
3baaf8f1e9
commit
301e12297c
4 changed files with 10 additions and 4 deletions
|
@ -9,7 +9,7 @@ smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
|
||||||
smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
|
smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
|
||||||
</%text>
|
</%text>
|
||||||
smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
|
smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
|
||||||
myhostname = debian-2gb-nbg1-1
|
myhostname = ${hostname}
|
||||||
alias_maps = hash:/etc/aliases
|
alias_maps = hash:/etc/aliases
|
||||||
alias_database = hash:/etc/aliases
|
alias_database = hash:/etc/aliases
|
||||||
myorigin = /etc/mailname
|
myorigin = /etc/mailname
|
||||||
|
|
|
@ -15,6 +15,9 @@ file_options = {
|
||||||
files = {
|
files = {
|
||||||
'/etc/postfix/main.cf': {
|
'/etc/postfix/main.cf': {
|
||||||
'content_type': 'mako',
|
'content_type': 'mako',
|
||||||
|
'context': {
|
||||||
|
'hostname': node.metadata.get('mailserver/hostname'),
|
||||||
|
},
|
||||||
**file_options,
|
**file_options,
|
||||||
},
|
},
|
||||||
'/etc/postfix/master.cf': {
|
'/etc/postfix/master.cf': {
|
||||||
|
|
|
@ -46,7 +46,7 @@ $config['default_host'] = 'localhost';
|
||||||
// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
|
// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
|
||||||
// %z - IMAP domain (IMAP hostname without the first part)
|
// %z - IMAP domain (IMAP hostname without the first part)
|
||||||
// For example %n = mail.domain.tld, %t = domain.tld
|
// For example %n = mail.domain.tld, %t = domain.tld
|
||||||
$config['smtp_server'] = '';
|
$config['smtp_server'] = 'tls://localhost';
|
||||||
|
|
||||||
// SMTP username (if required) if you use %u as the username Roundcube
|
// SMTP username (if required) if you use %u as the username Roundcube
|
||||||
// will use the current username for login
|
// will use the current username for login
|
||||||
|
|
|
@ -35,14 +35,17 @@
|
||||||
'ckn.li': {
|
'ckn.li': {
|
||||||
'A': ['162.55.188.157'],
|
'A': ['162.55.188.157'],
|
||||||
'AAAA': ['2a01:4f8:1c1c:4121::2'],
|
'AAAA': ['2a01:4f8:1c1c:4121::2'],
|
||||||
}
|
},
|
||||||
|
'freibrief.net': {
|
||||||
|
'A': ['162.55.188.157'],
|
||||||
|
'AAAA': ['2a01:4f8:1c1c:4121::2'],
|
||||||
|
},
|
||||||
},
|
},
|
||||||
'letsencrypt': {
|
'letsencrypt': {
|
||||||
'domains': {
|
'domains': {
|
||||||
'ckn.li': {},
|
'ckn.li': {},
|
||||||
'sublimity.de': {},
|
'sublimity.de': {},
|
||||||
'freibrief.net': {},
|
'freibrief.net': {},
|
||||||
'naeder.net': {},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'network': {
|
'network': {
|
||||||
|
|
Loading…
Reference in a new issue