Compare commits
No commits in common. "1e20758f51beb46161a0fb0371169b5d8d85ba4f" and "066159cea7447beb384077e0c0aa277a5204a802" have entirely different histories.
1e20758f51
...
066159cea7
14
dovecot.cf
14
dovecot.cf
|
@ -75,13 +75,13 @@ files:
|
||||||
|
|
||||||
|
|
||||||
reports:
|
reports:
|
||||||
# "IMAP_CERT: $(imap_cert)";
|
"IMAP_CERT: $(imap_cert)";
|
||||||
#
|
|
||||||
# dovecot_kept::
|
dovecot_kept::
|
||||||
# "DOVECOT kept";
|
"DOVECOT kept";
|
||||||
#
|
|
||||||
# dovecot_repaired::
|
dovecot_repaired::
|
||||||
# "DOVECOT repaired";
|
"DOVECOT repaired";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
61
opendkim.cf
61
opendkim.cf
|
@ -1,61 +0,0 @@
|
||||||
#
|
|
||||||
# opendkim
|
|
||||||
#
|
|
||||||
|
|
||||||
bundle agent opendkim(cfg_param)
|
|
||||||
{
|
|
||||||
vars:
|
|
||||||
debian::
|
|
||||||
"pkgs" slist => {"opendkim"};
|
|
||||||
"uid" string => "opendkim";
|
|
||||||
"gid" string => "opendkim";
|
|
||||||
"cfg_file" string => "/etc/opendkim.conf";
|
|
||||||
#"pid_file" string => "/var/run/opendkim.pid";
|
|
||||||
"pid_file" string => "/run/opendkim/opendkim.pid";
|
|
||||||
freebsd::
|
|
||||||
"pkgs" slist => {"opendkim"};
|
|
||||||
"uid" string => "mailnull";
|
|
||||||
"gid" string => "mailnull";
|
|
||||||
"cfg_file" string => "/usr/local/etc/mail/opendkim.conf";
|
|
||||||
"pid_file" string => "/var/run/opendkim.pid";
|
|
||||||
|
|
||||||
any::
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
"default_cfg" data => '{
|
|
||||||
"uid": "$(uid)",
|
|
||||||
"gid": "$(gid)",
|
|
||||||
"milter_sock": "inet:4711@localhost",
|
|
||||||
"mynetworks": ["127.0.0.1"],
|
|
||||||
"pid_file": "$(pid_file)",
|
|
||||||
"domains":["*"]
|
|
||||||
}';
|
|
||||||
|
|
||||||
"cfg" data => mergedata(@(opendkim.default_cfg),@(opendkim.cfg_param));
|
|
||||||
"mynetworks_len" int => length(data_expand(@(cfg[mynetworks])));
|
|
||||||
"mynetworks_head" string => "$(cfg[mynetworks][0])";
|
|
||||||
"mynetworks_tail" slist => sublist(data_expand(@(cfg[mynetworks])),"tail",int(eval("$(mynetworks_len) - 1","math","infix")));
|
|
||||||
|
|
||||||
|
|
||||||
methods:
|
|
||||||
"any" usebundle => wmde_install_packages(@(opendkim.pkgs),"opendkim"),
|
|
||||||
handle => "opendkim_installed";
|
|
||||||
|
|
||||||
files:
|
|
||||||
"$(opendkim.cfg_file)"
|
|
||||||
create => "true",
|
|
||||||
edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/opendkim.conf.mustache",
|
|
||||||
template_method => "mustache",
|
|
||||||
template_data => bundlestate("opendkim");
|
|
||||||
# template_data => mergedata(@(opendkim.default_cfg),@(opendkim.cfg));
|
|
||||||
|
|
||||||
reports:
|
|
||||||
# "HALLO DIKM";
|
|
||||||
# "MYLEN: $(mynetworks_len)";
|
|
||||||
# "HEAD: $(mynetworks_head)";
|
|
||||||
# "TAIL: $(mynetworks_tail)";
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -18,9 +18,6 @@ vars:
|
||||||
"vsettings[resources.auth.oss.rememberme.salt]" string => "'$(cfg[rememberme_salt])'";
|
"vsettings[resources.auth.oss.rememberme.salt]" string => "'$(cfg[rememberme_salt])'";
|
||||||
"vsettings[defaults.mailbox.password_salt]" string => "'$(cfg[password_salt])'";
|
"vsettings[defaults.mailbox.password_salt]" string => "'$(cfg[password_salt])'";
|
||||||
"vsettings[skipInstallPingback]" string => "1";
|
"vsettings[skipInstallPingback]" string => "1";
|
||||||
"vsettings[server.email.name]" string => "$(cfg[server_email_name])";
|
|
||||||
"vsettings[server.email.address]" string => "$(cfg[server_email_address])";
|
|
||||||
|
|
||||||
classes:
|
classes:
|
||||||
"vimbadmin_checked_out" expression => fileexists("$(cfg[dst_dir])/.git");
|
"vimbadmin_checked_out" expression => fileexists("$(cfg[dst_dir])/.git");
|
||||||
"pull_it" expression => eval("1 == $(r)","class","infix"),
|
"pull_it" expression => eval("1 == $(r)","class","infix"),
|
||||||
|
|
Loading…
Reference in New Issue