Переглянути джерело

Override opendmarc defaults

This patch restores sovereign's configuration of opendmarc.
Mike Ashley 8 роки тому
джерело
коміт
4c830e1b07
1 змінених файлів з 11 додано та 12 видалено
  1. 11
    12
      roles/mailserver/templates/etc_opendmarc.conf.j2

+ 11
- 12
roles/mailserver/templates/etc_opendmarc.conf.j2 Переглянути файл

@@ -12,7 +12,7 @@
12 12
 ##  provided, the name of the host running the filter (as returned by the
13 13
 ##  gethostname(3) function) will be used.  
14 14
 #
15
-# AuthservID name
15
+AuthservID {{ mail_server_hostname }}
16 16
 
17 17
 ##  AuthservIDWithJobID { true | false }
18 18
 ##  	default "false"
@@ -163,13 +163,13 @@
163 163
 ##  rather periodically imported into a relational database from which the
164 164
 ##  aggregate reports can be extracted by a tool such as opendmarc-import(8).
165 165
 #
166
-# HistoryFile /var/run/opendmarc.dat
166
+HistoryFile /var/run/opendmarc/opendmarc.dat
167 167
 
168 168
 ##  IgnoreAuthenticatedClients { true | false }
169 169
 ##  	default "false"
170 170
 ##
171 171
 ##  If set, causes mail from authenticated clients (i.e., those that used
172
-##  SMTP AUTH) to be ignored by the filter.
172
+##  SMTP UATH) to be ignored by the filter.
173 173
 #
174 174
 # IgnoreAuthenticatedClients false
175 175
 
@@ -181,7 +181,7 @@
181 181
 ##  connections are to be ignored by the filter.  If not specified, defaults
182 182
 ##  to "127.0.0.1" only.
183 183
 #
184
-# IgnoreHosts /usr/local/etc/opendmarc/ignore.hosts
184
+IgnoreHosts /etc/opendmarc/ignore.hosts
185 185
 
186 186
 ##  IgnoreMailFrom domain[,...]
187 187
 ##  	default (none)
@@ -207,7 +207,7 @@
207 207
 ##  containing the process ID.
208 208
 ##
209 209
 #
210
-# PidFile /var/run/opendmarc.pid
210
+PidFile /var/run/opendmarc.pid
211 211
 
212 212
 ##  PublicSuffixList path
213 213
 ##  	default (none)
@@ -239,7 +239,7 @@
239 239
 ##  evaluation of the message.  Instead, an Authentication-Results header
240 240
 ##  field will be added.
241 241
 #
242
-# RejectFailures false
242
+RejectFailures false
243 243
 
244 244
 ##  ReportCommand string
245 245
 ##  	default "/usr/sbin/sendmail -t"
@@ -283,7 +283,7 @@
283 283
 ##  delivery.  The product's name, version, and the job ID are included in
284 284
 ##  the header field's contents.
285 285
 #
286
-# SoftwareHeader false
286
+SoftwareHeader true
287 287
 
288 288
 ##  SPFIgnoreResults { true | false }
289 289
 ##	default "false"
@@ -312,7 +312,7 @@
312 312
 ##
313 313
 ##  Log via calls to syslog(3) any interesting activity.
314 314
 #
315
-# Syslog false
315
+Syslog true
316 316
 
317 317
 ##  SyslogFacility facility-name
318 318
 ##  	default "mail"
@@ -338,8 +338,7 @@
338 338
 ##  with a comma.  The key word "HOSTNAME" will be replaced by the name of
339 339
 ##  the host running the filter as reported by the gethostname(3) function.
340 340
 #
341
-# TrustedAuthservIDs HOSTNAME
342
-
341
+TrustedAuthservIDs {{ mail_server_hostname }}
343 342
 
344 343
 ##  UMask mask
345 344
 ##  	default (none)
@@ -351,7 +350,7 @@
351 350
 ##  specific file mode on creation regardless of the process umask.  See
352 351
 ##  umask(2) for more information.
353 352
 #
354
-# UMask 077
353
+UMask 0002
355 354
 
356 355
 ##  UserID user[:group]
357 356
 ##  	default (none)
@@ -360,4 +359,4 @@
360 359
 ##  The process will be assigned all of the groups and primary group ID of
361 360
 ##  the named userid unless an alternate group is specified.
362 361
 #
363
-# UserID opendmarc
362
+UserID opendmarc:opendmarc

Завантаження…
Відмінити
Зберегти