dovecot.cf

@@ -122,10 +122,10 @@ files:
 	
 
 reports:
-#	use_ssl::
+	use_ssl::
-#		"USE_SSL: TRUE";
+		"USE_SSL: TRUE";
-#	!use_ssl::
+	!use_ssl::
-#		"USE_SSL: FALSE";
+		"USE_SSL: FALSE";
 	
 #	"IMAP_CERT: $(imap_cert)";
 #
@@ -180,6 +180,7 @@ commands:
 #		args => "$(filename)",
 #		depends_on => { "global_sieve_$(filename)_created" };
 reports:
+	"FILENAME: $(filename)";
 
 }
 

lib.cf

@@ -327,14 +327,12 @@ commands:
 		inform => "true";
 		
 		"/usr/bin/true"
-		inform => "false",
 		depends_on => {"$(cls)_downloaded"},
 		classes => if_repaired("$(cls)_kept");
 			
 		
 	(!run_wget)&(wget)::
 		"/usr/bin/true"
-		inform => "false",
 		classes => if_repaired("$(cls)_kept");
 			
 
@@ -344,6 +342,20 @@ files:
 		depends_on => {"$(cls)_downloaded"};
 		
 reports:
+	!run_wget::
+		"Not run wget";
+	run_wget::
+		"Run wget";
+
+	"$(cls)_repaired"::
+		"$(cls) repaired"; 
+	"!($(cls)_repaired)"::
+		"$(cls) not repaired"; 
+
+	"$(cls)_kept"::
+		"$(cls) kept"; 
+	"!($(cls)_kept)"::
+		"$(cls) not kept"; 
 }
 
 

php.cf

@@ -133,7 +133,7 @@ bundle agent php_install_centos_repos
 {
 classes:
 	centos::
-	"switch_repo" expression => not(returnszero("cat /etc/dnf/modules.d/php.module | grep -q '^stream.*=.*remi-$(php.version)' >/dev/null 2>&1","useshell"));
+	"switch_repo" expression => not(returnszero("cat /etc/dnf/modules.d/php.module | grep -q '^stream.*=.*remi-$(php.version)'","useshell"));
 	"install_remi" expression => not(returnszero("rpm -q remi-release > /dev/null","useshell"));
 	"install_epel" expression => not(returnszero("rpm -q epel-release > /dev/null","useshell"));
 

roundcube.cf

@@ -39,10 +39,10 @@ vars:
 		"dlsrc" string => "https://github.com/roundcube/roundcubemail/releases/download/$(cfg[version])/$(tgzname)";
 
 reports:
-#	dlbyversion::
+	dlbyversion::
-#		"dl by version";
+		"dl by version";
-#	!dlbyversion::
+	!dlbyversion::
-#		"not dl by version";
+		"not dl by version";
 	
 files:
 	"$(dldir)/."
@@ -52,8 +52,8 @@ files:
 methods:
 	"any" usebundle => download_file("$(dltype)","$(dlsrc)","$(dlfile)","roundcube_tgz_file",'{}'),
 	handle => "roundcube_tgz_copied",
-	depends_on => {"roundcube_agent_dir_created"};
+	depends_on => {"roundcube_agent_dir_created"},
-#	classes => if_repaired ("roundcube_untar");
+	classes => if_repaired ("roundcube_untar");
 
 
     #    "$(dlfile)"
@@ -77,20 +77,21 @@ files:
 		"$(cfg[backup_dir])/config.inc.php"
 		copy_from => local_dcp("$(install_sub_dir)/config/config.inc.php"),
 		depends_on => {"roundcube_untarred"};	
+
 methods:
 	"any" usebundle => mysql_table_exists(@(cfg),"users");
 	
-	config_exists|roundcube_config_repaired::
+	config_exists|roundcube_configr_repaired::
 		"any" usebundle => rm_rf ("$(install_sub_dir)/installer");
 
 commands:
-	roundcube_untar|roundcube_tgz_file_repaired::
+	roundcube_untar::
 		"/usr/bin/tar"
 		args => "xzf $(dlfile) -C $(cfg[install_dir]) && chown -R $(cfg[www_user]):$(cfg[www_group]) $(cfg[install_dir])",
 		depends_on => {"roundcube_tgz_copied"},
 		contain => wmde_cmd_useshell,
 		handle => "roundcube_untarred";
-	(!roundcube_untar)&(!roundcube_tgz_file_repaired)::
+	!roundcube_untar::
 		"/usr/bin/true"
 		inform => "false",
 		depends_on => {"roundcube_tgz_copied"},

rspamd.cf

@@ -76,7 +76,7 @@ classes:
 commands:
 	install_yum_repo::
 	"wget"
-	args => "-qO /etc/yum.repos.d/rspamd.repo https://rspamd.com/rpm-stable/centos-$(sys.os_version_major)/rspamd.repo && rpm --import https://rspamd.com/rpm-stable/gpg.key ",
+	args => "-qO /etc/yum.repos.d/rspamd.repo https://rspamd.com/rpm-stable/centos-$(sys.os_version_major)/rspamd.repo && rpm --import https://rspamd.com/rpm-stable/gpg.key && yum update -y",
 	contain => wmde_cmd_useshell;