40a5248ff4
apply some fixes OBS-URL: https://build.opensuse.org/request/show/904448 OBS-URL: https://build.opensuse.org/package/show/server:mail/opendkim?expand=0&rev=21
84 lines
2.5 KiB
Diff
84 lines
2.5 KiB
Diff
Index: opendkim/opendkim.conf.sample
|
|
===================================================================
|
|
--- opendkim/opendkim.conf.sample.orig
|
|
+++ opendkim/opendkim.conf.sample
|
|
@@ -109,7 +109,7 @@
|
|
## operation. Thus, cores will be dumped here and configuration files
|
|
## are read relative to this location.
|
|
|
|
-# BaseDirectory /var/run/opendkim
|
|
+BaseDirectory /run/opendkim
|
|
|
|
## BodyLengthDB dataset
|
|
## default (none)
|
|
@@ -160,7 +160,7 @@
|
|
## Specify for which domain(s) signing should be done. No default; must
|
|
## be specified for signing.
|
|
|
|
-Domain example.com
|
|
+# Domain example.com
|
|
|
|
## DomainKeysCompat { yes | no }
|
|
## default "no"
|
|
@@ -245,7 +245,7 @@ Domain example.com
|
|
## SigningTable and KeyTable are used. No default; must be specified for
|
|
## signing if SigningTable/KeyTable are not in use.
|
|
|
|
-KeyFile /var/db/dkim/example.private
|
|
+# KeyFile /etc/opendkim/keys/example.private
|
|
|
|
## KeyTable dataset
|
|
## default (none)
|
|
@@ -432,7 +432,8 @@ KeyFile /var/db/dkim/example.private
|
|
## Name of the file where the filter should write its pid before beginning
|
|
## normal operations.
|
|
|
|
-# PidFile filename
|
|
+# DO NOT CHANGE IT IS REFERENCED IN THE INIT SCRIPTS.
|
|
+PidFile /run/opendkim/opendkim.pid
|
|
|
|
## POPDBFile dataset
|
|
## default (none)
|
|
@@ -570,7 +571,7 @@ KeyFile /var/db/dkim/example.private
|
|
## The name of the selector to use when signing. No default; must be
|
|
## specified for signing.
|
|
|
|
-Selector my-selector-name
|
|
+Selector default
|
|
|
|
## SenderHeaders dataset
|
|
## default (none)
|
|
@@ -658,7 +659,7 @@ Selector my-selector-name
|
|
## inet:port to listen on all interfaces
|
|
## local:/path/to/socket to listen on a UNIX domain socket
|
|
|
|
-Socket inet:port@localhost
|
|
+Socket local:/run/opendkim/opendkim.sock
|
|
|
|
## SoftwareHeader { yes | no }
|
|
## default "no"
|
|
@@ -749,7 +750,7 @@ Syslog Yes
|
|
## DNS queries and applying the DNSSEC protocol. See the Unbound documentation
|
|
## at http://unbound.net for the expected format of this file.
|
|
|
|
-# TrustAnchorFile /var/named/trustanchor
|
|
+TrustAnchorFile /var/lib/unbound/root.key
|
|
|
|
## UMask mask
|
|
## default (none)
|
|
@@ -758,7 +759,7 @@ Syslog Yes
|
|
## The system has its own default which will be used (usually 022).
|
|
## See the umask(2) man page for more information.
|
|
|
|
-# UMask 022
|
|
+UMask 002
|
|
|
|
# UnboundConfigFile /var/named/unbound.conf
|
|
|
|
@@ -768,4 +769,4 @@ Syslog Yes
|
|
## Change to user "userid" before starting normal operation? May include
|
|
## a group ID as well, separated from the userid by a colon.
|
|
|
|
-# UserID userid
|
|
+UserID opendkim:opendkim
|