Compare commits

..

No commits in common. "71bef3b692cd4f22190abfe5738e5987484cb431" and "4635b346e182aeda7608bbcb21295d65d006a591" have entirely different histories.

2 changed files with 9 additions and 56 deletions

View File

@ -47,8 +47,6 @@ vars:
"postmap_cmd" string => "/usr/sbin/postmap";
any::
"data_dir" string => "$(db_dir)/postfix";
"maps_dir" string => "$(cfg_dir)/maps";
users:
debian::
@ -71,12 +69,6 @@ files:
create => "true",
perms => m(755);
"$(maps_dir)/."
create => "true",
perms => m("755");
"$(postfix.db_dir)/."
create => "true",
perms => mog("755","root","root"),
@ -180,15 +172,15 @@ vars:
"idx" slist => getindices("file");
"maps_dir" string => "$(postfix.cfg_dir)/maps";
"sql_dir" string => "$(postfix.cfg_dir)/sql";
"$(idx)" string => "$(maps_dir)/$(idx).sql";
"$(idx)" string => "$(sql_dir)/$(idx).sql";
files:
"$(maps_dir)/."
"$(sql_dir)/."
create => "true",
perms => m("755");
"$(maps_dir)/$(idx).sql"
"$(sql_dir)/$(idx).sql"
create=>"true",
perms=>m("644"),
content=>"

View File

@ -140,45 +140,6 @@ reports:
}
bundle agent sympa_create_postfix_general_maps(cfg,dest_file)
{
vars:
"dl" slist => getindices(@(cfg[domains]));
"cnt" string => string_mustache("
#
# Managed by CFEngine
#
{{#dl}}
sympa@{{.}} sympa:sympa@{{.}}(dl)
listmaster@{{.}}(dl) sympa:listmaster@{{.}}(dl)
bounce@{{.}}(dl) sympa:bounce@{{.}}(dl)
abuse-feedback-report@{{.}} sympa:abuse-feedback-report@{{.}}
{{/dl}}
",
bundlestate("$(this.bundle)"));
classes:
"postfix_repaired" expression => not(fileexists("$(dest_file).db")),
scope => "namespace";
files:
"$(dest_file)"
perms => m("644"),
create => "true",
content => "$(cnt)
",
classes => if_repaired("postfix_repaired"),
handle => "sympa_postfix_general_maps_created" ;
commands:
postfix_repaired::
"$(postfix.postmap_cmd)"
args => "$(dest_file)",
inform => "true",
depends_on => {"sympa_postfix_general_maps_created"};
reports:
}
bundle agent sympa_postfix_sql(cfg)
{
vars:
@ -191,14 +152,14 @@ vars:
"idx" slist => getindices("file");
"maps_dir" string => "$(postfix.cfg_dir)/sql";
"$(idx)" string => "$(maps_dir)/$(idx).sql";
"sql_dir" string => "$(postfix.cfg_dir)/sql";
"$(idx)" string => "$(sql_dir)/$(idx).sql";
files:
"$(maps_dir)/."
"$(sql_dir)/."
create => "true",
perms => m("755");
"$(maps_dir)/$(idx).sql"
"$(sql_dir)/$(idx).sql"
create=>"true",
perms=>m("644"),
content=>"
@ -321,7 +282,7 @@ methods:
};
# "any" usebundle => install_sympa_domain("@(cfg[domains][$(domains_idx)])");
"any" usebundle => install_sympa_domains(@(cfg[domains]));
"any" usebundle => install_sympa_domains(@(cfg[domains2]));
reports:
# "IDX $(domains_idx)";
# "DOMCONF: $(cfg[$(idx)])";