Skip to content

Commit 5cef9f0

Browse files
feimingfeiming
committed
Restore original way of referencing pillar.
1 parent 0a916bc commit 5cef9f0

File tree

2 files changed

+122
-121
lines changed

2 files changed

+122
-121
lines changed

‎dovecot/init.sls‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ dovecot_packages:
99
/etc/dovecot/{{ dovecot.config.filename }}.conf:
1010
file.managed:
1111
- contents: |
12-
{{ salt['pillar.get']('dovecot:config:local','# managed by salt') | indent(8) }}
12+
{{ dovecot.config.local | indent(8) }}
1313
- backup: minion
1414
- watch_in:
1515
- service: dovecot_service
1616
- require:
1717
- pkg: dovecot_packages
1818
19-
{% for name, content in salt['pillar.get']('dovecot:config:dovecotext',{}).items() %}
19+
{% for name, content in dovecot.config.dovecotext.items() %}
2020
/etc/dovecot/dovecot-{{ name }}.conf.ext:
2121
file.managed:
2222
- contents: |
@@ -28,7 +28,7 @@ dovecot_packages:
2828
- pkg: dovecot_packages
2929
{% endfor %}
3030
31-
{% for name, content in salt['pillar.get']('dovecot:config:conf',{}).items() %}
31+
{% for name, content in dovecot.config.conf.items() %}
3232
/etc/dovecot/conf.d/{{ name }}.conf:
3333
file.managed:
3434
- contents: |
@@ -40,7 +40,7 @@ dovecot_packages:
4040
- pkg: dovecot_packages
4141
{% endfor %}
4242
43-
{% for name, content in salt['pillar.get']('dovecot:config:confext',{}).items() %}
43+
{% for name, content in dovecot.config.confext.items() %}
4444
/etc/dovecot/conf.d/{{ name }}.conf.ext:
4545
file.managed:
4646
- contents: |
@@ -52,7 +52,7 @@ dovecot_packages:
5252
- pkg: dovecot_packages
5353
{% endfor %}
5454
55-
{% for name, content in salt['pillar.get']('dovecot:config:ssl_certs',{}).items() %}
55+
{% for name, content in dovecot.config.ssl_certs.items() %}
5656
{{ dovecot.config.ssl_certs_dir }}/dovecot-{{ name }}.crt:
5757
file.managed:
5858
- contents: |
@@ -67,7 +67,7 @@ dovecot_packages:
6767
- pkg: dovecot_packages
6868
{% endfor %}
6969
70-
{% for name, content in salt['pillar.get']('dovecot:config:ssl_keys',{}).items() %}
70+
{% for name, content in dovecot.config.ssl_keys.items() %}
7171
{{ dovecot.config.ssl_keys_dir }}/dovecot-{{ name }}.key:
7272
file.managed:
7373
- contents: |
@@ -90,7 +90,7 @@ dovecot_service:
9090
- pkg: dovecot_packages
9191
- require:
9292
- pkg: dovecot_packages
93-
{% if 'enable_service_control' in salt['pillar.get']('dovecot') and salt['pillar.get']('dovecot:enable_service_control') == false %}
93+
{% if 'enable_service_control' in dovecot and dovecot.enable_service_control == false %}
9494
# never run this state
9595
- onlyif:
9696
- /bin/false

‎pillar.example‎

Lines changed: 115 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,121 @@
11
dovecot:
2-
enable_service_control: True
3-
config:
4-
local: |
5-
# main
6-
listen = *
7-
login_trusted_networks = 192.168.100.0/24
8-
shutdown_clients = yes
9-
10-
# auth
11-
disable_plaintext_auth = yes
12-
auth_cache_size = 10M
13-
auth_cache_ttl = 1 hour
14-
auth_mechanisms = plain
15-
!include conf.d/auth-system.conf.ext
16-
17-
# logging
18-
log_timestamp = "%Y-%m-%d %H:%M:%S "
19-
20-
# mail (for non-virtual users)
21-
mail_location = maildir:~/Maildir
22-
mail_privileged_group = mail
23-
first_valid_uid = 1000
24-
last_valid_uid = 2000
25-
26-
# master
27-
service imap-login {
28-
inet_listener imap {
29-
address = 127.0.0.1
30-
port = 143
2+
lookup:
3+
enable_service_control: True
4+
config:
5+
local: |
6+
# main
7+
listen = *
8+
login_trusted_networks = 192.168.100.0/24
9+
shutdown_clients = yes
10+
11+
# auth
12+
disable_plaintext_auth = yes
13+
auth_cache_size = 10M
14+
auth_cache_ttl = 1 hour
15+
auth_mechanisms = plain
16+
!include conf.d/auth-system.conf.ext
17+
18+
# logging
19+
log_timestamp = "%Y-%m-%d %H:%M:%S "
20+
21+
# mail (for non-virtual users)
22+
mail_location = maildir:~/Maildir
23+
mail_privileged_group = mail
24+
first_valid_uid = 1000
25+
last_valid_uid = 2000
26+
27+
# master
28+
service imap-login {
29+
inet_listener imap {
30+
address = 127.0.0.1
31+
port = 143
32+
}
33+
inet_listener imaps {
34+
port = 993
35+
ssl = yes
36+
}
37+
}
38+
39+
# lda
40+
postmaster_address = postmaster@example.com
41+
hostname = example.com
42+
protocol lda {
43+
mail_plugins = $mail_plugins sieve
3144
}
32-
inet_listener imaps {
33-
port = 993
34-
ssl = yes
45+
46+
# imap
47+
protocols = imap
48+
mail_max_userip_connections = 50
49+
50+
# managesieve
51+
service managesieve-login {
52+
inet_listener sieve_deprecated {
53+
address = 0.0.0.0
54+
port = 2000
55+
}
3556
}
36-
}
37-
38-
# lda
39-
postmaster_address = postmaster@example.com
40-
hostname = example.com
41-
protocol lda {
42-
mail_plugins = $mail_plugins sieve
43-
}
44-
45-
# imap
46-
protocols = imap
47-
mail_max_userip_connections = 50
48-
49-
# managesieve
50-
service managesieve-login {
51-
inet_listener sieve_deprecated {
52-
address = 0.0.0.0
53-
port = 2000
57+
58+
# sieve
59+
plugin {
60+
sieve = ~/.dovecot.sieve
61+
sieve_dir = ~/sieve
5462
}
55-
}
56-
57-
# sieve
58-
plugin {
59-
sieve = ~/.dovecot.sieve
60-
sieve_dir = ~/sieve
61-
}
62-
63-
# ssl
64-
ssl_cipher_list = EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA
65-
ssl_cert = </etc/ssl/private/dovecot-one.crt
66-
ssl_key = </etc/ssl/private/dovecot-one.key
6763

68-
dovecotext:
69-
ldap: |
70-
hosts = 0.0.0.0
71-
base = dc=example, dc=com
72-
scope = subtree
73-
pass_attrs = uid=user,userPassword=password,\
74-
homeDirectory=userdb_home,uidNumber=userdb_uid,gidNumber=userdb_gid
75-
pass_filter = (&(objectClass=posixAccount)(uid=%u))
76-
default_pass_scheme = SSHA
77-
dict-sql: |
78-
# Managed by salt
79-
80-
conf:
81-
10-mail: |
82-
mail_location = maildir:~/Maildir
64+
# ssl
65+
ssl_cipher_list = EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA
66+
ssl_cert = </etc/ssl/private/dovecot-one.crt
67+
ssl_key = </etc/ssl/private/dovecot-one.key
8368

84-
confext:
85-
auth-deny: |
86-
passdb {
87-
driver = passwd-file
88-
deny = yes
89-
90-
# File contains a list of usernames, one per line
91-
args = /etc/dovecot/deny-users
92-
}
93-
94-
ssl_certs:
95-
one: |
96-
-----BEGIN CERTIFICATE-----
97-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
98-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
99-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
100-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
101-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
102-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
103-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
104-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
105-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
106-
-----END CERTIFICATE-----
107-
108-
ssl_keys:
109-
one |
110-
-----BEGIN RSA PRIVATE KEY-----
111-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
112-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
113-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
114-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
115-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
116-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
117-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
118-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
119-
-----END RSA PRIVATE KEY-----
120-
69+
dovecotext:
70+
ldap: |
71+
hosts = 0.0.0.0
72+
base = dc=example, dc=com
73+
scope = subtree
74+
pass_attrs = uid=user,userPassword=password,\
75+
homeDirectory=userdb_home,uidNumber=userdb_uid,gidNumber=userdb_gid
76+
pass_filter = (&(objectClass=posixAccount)(uid=%u))
77+
default_pass_scheme = SSHA
78+
dict-sql: |
79+
# Managed by salt
80+
81+
conf:
82+
10-mail: |
83+
mail_location = maildir:~/Maildir
84+
85+
confext:
86+
auth-deny: |
87+
passdb {
88+
driver = passwd-file
89+
deny = yes
90+
91+
# File contains a list of usernames, one per line
92+
args = /etc/dovecot/deny-users
93+
}
94+
95+
ssl_certs:
96+
one: |
97+
-----BEGIN CERTIFICATE-----
98+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
99+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
100+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
101+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
102+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
103+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
104+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
105+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
106+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
107+
-----END CERTIFICATE-----
108+
109+
ssl_keys:
110+
one |
111+
-----BEGIN RSA PRIVATE KEY-----
112+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
113+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
114+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
115+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
116+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
117+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
118+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
119+
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
120+
-----END RSA PRIVATE KEY-----
121+

0 commit comments

Comments
 (0)