WMDE
/
wmdeit-cf-wmdelib
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: WMDE:7a6a4ae1333279de95e45ffadf29520a9044c312
Branches Tags
WMDE:main
..
compare: WMDE:dcf16d21b489614a90c507df667a4d3ef2813bf4
Branches Tags
WMDE:main

No commits in common. "7a6a4ae1333279de95e45ffadf29520a9044c312" and "dcf16d21b489614a90c507df667a4d3ef2813bf4" have entirely different histories.
7a6a4ae133 ... dcf16d21b4

4 changed files with 6 additions and 34 deletions
Show Stats Expand all files Collapse all files

5
lib.cf
View File

@ -196,7 +196,6 @@ reports:
bundle agent install_apt_repo(name,repo_src,key_src,key_name) bundle agent install_apt_repo(name,repo_src,key_src,key_name)
{ {
classes: classes:
@ -274,10 +273,6 @@ commands:
handle=>"system_repos_pkgs_installed"; handle=>"system_repos_pkgs_installed";
centos_8::
"/usr/bin/dnf"
inform => "false",
args => "config-manager --set-enabled powertools";
centos_9_and_later:: centos_9_and_later::
"/usr/bin/dnf" "/usr/bin/dnf"

24
rspamd.cf
View File

@ -4,7 +4,6 @@
bundle agent rspamd(cfg) bundle agent rspamd(cfg)
{ {
classes:
vars: vars:
"cfgfiles" slist => { "cfgfiles" slist => {
"local.d/milter_headers.conf", "local.d/milter_headers.conf",
@ -31,18 +30,9 @@ vars:
"root_user" string => "root"; "root_user" string => "root";
"root_group" string => "root"; "root_group" string => "root";
centos::
"pkgs" slist => {"rspamd"};
"cfg_dir" string => "/etc/rspamd";
"service_name" string => "rspamd";
"root_user" string => "root";
"root_group" string => "root";
methods: methods:
"any" usebundle => rspamd_install_yum_repo, handle => "rspamd_yum_repo_installed"; "any" usebundle => wmde_install_packages(@(pkgs),"rspamd");
"any" usebundle => wmde_install_packages(@(pkgs),"rspamd"),
depends_on => {"rspamd_yum_repo_installed"};
"any" usebundle => wmde_service("$(service_name)","rspamd_kept","rspamd_repaired"), "any" usebundle => wmde_service("$(service_name)","rspamd_kept","rspamd_repaired"),
depends_on => {"rspamd_cfgs_done"}; depends_on => {"rspamd_cfgs_done"};
files: files:
@ -68,16 +58,4 @@ reports:
} }
bundle agent rspamd_install_yum_repo
{
classes:
centos::
"install_yum_repo" expression => not(fileexists("/etc/yum.repos.d/rspamd.repo"));
commands:
install_yum_repo::
"wget"
args => "-qO /etc/yum.repos.d/rspamd.repo https://rspamd.com/rpm-stable/centos-8/rspamd.repo && rpm --import https://rspamd.com/rpm-stable/gpg.key && yum update -y",
contain => wmde_cmd_useshell;
}

8
sympa.cf
View File

@ -28,11 +28,11 @@ vars:
"var_lib_dir" string => "/var/lib/sympa"; "var_lib_dir" string => "/var/lib/sympa";
"share_dir" string => "/usr/share/sympa"; "share_dir" string => "/usr/share/sympa";
"conf_dir" string => "/etc/sympa"; "conf_dir" string => "/etc/sympa";
"sympa_conf" string => "$(conf_dir)/sympa.conf"; "sympa_conf" string => "$(conf_dir)/sympa/sympa.conf";
"service_name" string => "sympa"; "service_name" string => "sympa";
"wwservice_name" string => "wwsympa"; "wwservice_name" string => "wwsympa";
"wwsympa_socket" string => "/var/run/sympa/wwsympa.socket"; "wwsympa_socket" string => "/var/run/sympa/wwsympa.socket";
"sympa_pl_cmd" string => "/usr/sbin/sympa.pl"; "sympa_pl_cmd" string => "/usr/bin/sympa";
"pkgs" slist => { "pkgs" slist => {
"sympa" "sympa"
@ -243,9 +243,7 @@ vars:
"db_name":"$(cfg[db_settings][db_name])", "db_name":"$(cfg[db_settings][db_name])",
"db_host":"$(cfg[db_settings][db_host])", "db_host":"$(cfg[db_settings][db_host])",
"db_passwd":"$(cfg[db_settings][db_pass])", "db_passwd":"$(cfg[db_settings][db_pass])",
"db_user":"$(cfg[db_settings][db_user])", "db_user":"$(cfg[db_settings][db_user])"
"css_url":"/css-sympa",
"static_content_url":"/static-sympa"
}'; }';

3
vimbadmin.cf
View File

@ -29,7 +29,6 @@ vars:
"vsettings[server.email.address]" string => "$(cfg[server_email_address])"; "vsettings[server.email.address]" string => "$(cfg[server_email_address])";
"vsettings[resources.mail.transport.type]" string => "'smtp'"; "vsettings[resources.mail.transport.type]" string => "'smtp'";
"vsettings[resources.mail.transport.host]" string => "'127.0.0.1'"; "vsettings[resources.mail.transport.host]" string => "'127.0.0.1'";
"vsettings[defaults.mailbox.password_scheme]" string => "crypt:sha256";
# #
classes: classes:
"vimbadmin_checked_out" expression => fileexists("$(cfg[dst_dir])/.git"); "vimbadmin_checked_out" expression => fileexists("$(cfg[dst_dir])/.git");
@ -60,6 +59,8 @@ files:
perms => m(644), perms => m(644),
classes => if_repaired(vimbadmin_reconfigure); classes => if_repaired(vimbadmin_reconfigure);
"$(cfg[install_dir])/public/.htaccess" "$(cfg[install_dir])/public/.htaccess"
copy_from => seed_cp("$(cfg[install_dir])/public/.htaccess.dist"), copy_from => seed_cp("$(cfg[install_dir])/public/.htaccess.dist"),
perms => mog("644","root","root"), perms => mog("644","root","root"),