removed root, root mog

This commit is contained in:
Tube 2023-11-03 19:38:18 +01:00
parent c93f4581c4
commit bed7362475
2 changed files with 9 additions and 8 deletions

View File

@ -10,6 +10,7 @@ classes:
vars: vars:
freebsd:: freebsd::
"service_name" string => "dovecot";
"cfg_dir" string => "/usr/local/etc/dovecot"; "cfg_dir" string => "/usr/local/etc/dovecot";
"dovecot_conf" string => "$(cfg_dir)/dovecot.conf"; "dovecot_conf" string => "$(cfg_dir)/dovecot.conf";
@ -84,14 +85,14 @@ methods:
files: files:
"$(cfg_dir)/." "$(cfg_dir)/."
create => "true", create => "true",
perms => mog("755","root","root"), perms => m("755"),
depends_on => {"dovecot_pkgs_installed"}, depends_on => {"dovecot_pkgs_installed"},
handle => "dovecot_cfg_dir_created"; handle => "dovecot_cfg_dir_created";
"$(dovecot_conf)" "$(dovecot_conf)"
classes => if_repaired(dovecot_repaired), classes => if_repaired(dovecot_repaired),
create => "true", create => "true",
perms => mog("644","root","root"), perms => m("644"),
template_method => "mustache", template_method => "mustache",
depends_on => {"dovecot_pkgs_installed","dovecot_cfg_dir_created"}, depends_on => {"dovecot_pkgs_installed","dovecot_cfg_dir_created"},
handle => "dovecot_cfg_created", handle => "dovecot_cfg_created",
@ -103,25 +104,25 @@ files:
handle => "dovecot_imap_cert_installed", handle => "dovecot_imap_cert_installed",
classes => if_repaired(dovecot_repaired), classes => if_repaired(dovecot_repaired),
copy_from => local_dcp( execresult( "/usr/bin/readlink -qfn $(cfg[imap_cert])","noshell" )), copy_from => local_dcp( execresult( "/usr/bin/readlink -qfn $(cfg[imap_cert])","noshell" )),
perms => mog("600","root","root"); perms => m("600");
"$(imap_key)" "$(imap_key)"
handle => "dovecot_imap_key_installed", handle => "dovecot_imap_key_installed",
classes => if_repaired(dovecot_repaired), classes => if_repaired(dovecot_repaired),
copy_from => local_dcp( execresult( "/usr/bin/readlink -qfn $(cfg[imap_key])","noshell" )), copy_from => local_dcp( execresult( "/usr/bin/readlink -qfn $(cfg[imap_key])","noshell" )),
perms => mog("600","root","root"); perms => m("600");
"$(submission_cert)" "$(submission_cert)"
handle => "dovecot_submission_cert_installed", handle => "dovecot_submission_cert_installed",
classes => if_repaired(dovecot_repaired), classes => if_repaired(dovecot_repaired),
copy_from => local_dcp( execresult( "/usr/bin/readlink -qfn $(cfg[submission_cert])","noshell" )), copy_from => local_dcp( execresult( "/usr/bin/readlink -qfn $(cfg[submission_cert])","noshell" )),
perms => mog("600","root","root"); perms => m("600");
"$(submission_key)" "$(submission_key)"
handle => "dovecot_submission_key_installed", handle => "dovecot_submission_key_installed",
classes => if_repaired(dovecot_repaired), classes => if_repaired(dovecot_repaired),
copy_from => local_dcp( execresult( "/usr/bin/readlink -qfn $(cfg[submission_key])","noshell" )), copy_from => local_dcp( execresult( "/usr/bin/readlink -qfn $(cfg[submission_key])","noshell" )),
perms => mog("600","root","root"); perms => m("600");

View File

@ -8,7 +8,7 @@ vars:
freebsd:: freebsd::
"pkgs" slist => { "pkgs" slist => {
"postfix-sasl", "postfix-mysql",
}; };
"db_dir" string => "/var/db"; "db_dir" string => "/var/db";
"service_name" string => "postfix"; "service_name" string => "postfix";
@ -103,7 +103,7 @@ files:
"$(postfix.db_dir)/." "$(postfix.db_dir)/."
create => "true", create => "true",
perms => mog("755","root","root"), perms => m("755"),
handle => "postfix_db_dir_created"; handle => "postfix_db_dir_created";
"$(postfix.data_dir)/." "$(postfix.data_dir)/."