Fixes for FreeBSD
This commit is contained in:
parent
215c81f3ee
commit
fcfe374832
11
opendkim.cf
11
opendkim.cf
|
@ -12,7 +12,6 @@ vars:
|
||||||
"uid" string => "opendkim";
|
"uid" string => "opendkim";
|
||||||
"gid" string => "opendkim";
|
"gid" string => "opendkim";
|
||||||
"cfg_file" string => "/etc/opendkim.conf";
|
"cfg_file" string => "/etc/opendkim.conf";
|
||||||
#"pid_file" string => "/var/run/opendkim.pid";
|
|
||||||
"pid_file" string => "/run/opendkim/opendkim.pid";
|
"pid_file" string => "/run/opendkim/opendkim.pid";
|
||||||
|
|
||||||
centos::
|
centos::
|
||||||
|
@ -20,7 +19,6 @@ vars:
|
||||||
"uid" string => "opendkim";
|
"uid" string => "opendkim";
|
||||||
"gid" string => "opendkim";
|
"gid" string => "opendkim";
|
||||||
"cfg_file" string => "/etc/opendkim.conf";
|
"cfg_file" string => "/etc/opendkim.conf";
|
||||||
#"pid_file" string => "/var/run/opendkim.pid";
|
|
||||||
"pid_file" string => "/run/opendkim/opendkim.pid";
|
"pid_file" string => "/run/opendkim/opendkim.pid";
|
||||||
|
|
||||||
freebsd::
|
freebsd::
|
||||||
|
@ -29,6 +27,7 @@ vars:
|
||||||
"gid" string => "mailnull";
|
"gid" string => "mailnull";
|
||||||
"cfg_file" string => "/usr/local/etc/mail/opendkim.conf";
|
"cfg_file" string => "/usr/local/etc/mail/opendkim.conf";
|
||||||
"pid_file" string => "/var/run/opendkim.pid";
|
"pid_file" string => "/var/run/opendkim.pid";
|
||||||
|
"service_name" string => "milter-opendkim";
|
||||||
|
|
||||||
any::
|
any::
|
||||||
|
|
||||||
|
@ -79,6 +78,14 @@ reports:
|
||||||
bundle agent opendkim_systemd_overrides
|
bundle agent opendkim_systemd_overrides
|
||||||
{
|
{
|
||||||
files:
|
files:
|
||||||
|
freebsd::
|
||||||
|
"/etc/rc.conf.d/milteropendkim"
|
||||||
|
create=>"true",
|
||||||
|
content=>'
|
||||||
|
milteropendkim_uid="$(opendkim.cfg[uid])"
|
||||||
|
milteropendkim_gid="$(opendkim.cfg[gid])"
|
||||||
|
';
|
||||||
|
|
||||||
centos::
|
centos::
|
||||||
|
|
||||||
"/etc/systemd/system/opendkim.service.d/override.conf"
|
"/etc/systemd/system/opendkim.service.d/override.conf"
|
||||||
|
|
Loading…
Reference in New Issue