Compare commits
	
		
			5 Commits
		
	
	
		
			fb7878aa8f
			...
			0d9b9a7cd5
		
	
	| Author | SHA1 | Date | 
|---|---|---|
| 
							
							
								
									
								
								 | 
						0d9b9a7cd5 | |
| 
							
							
								
									
								
								 | 
						9d120728de | |
| 
							
							
								
									
								
								 | 
						a1c32bca4b | |
| 
							
							
								
									
								
								 | 
						fa8287b865 | |
| 
							
							
								
									
								
								 | 
						3b1c73b73d | 
| 
						 | 
					@ -122,10 +122,10 @@ files:
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
 | 
					
 | 
				
			||||||
reports:
 | 
					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)";
 | 
					#	"IMAP_CERT: $(imap_cert)";
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -180,7 +180,6 @@ commands:
 | 
				
			||||||
#		args => "$(filename)",
 | 
					#		args => "$(filename)",
 | 
				
			||||||
#		depends_on => { "global_sieve_$(filename)_created" };
 | 
					#		depends_on => { "global_sieve_$(filename)_created" };
 | 
				
			||||||
reports:
 | 
					reports:
 | 
				
			||||||
	"FILENAME: $(filename)";
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										16
									
								
								lib.cf
								
								
								
								
							
							
						
						
									
										16
									
								
								lib.cf
								
								
								
								
							| 
						 | 
					@ -327,12 +327,14 @@ commands:
 | 
				
			||||||
		inform => "true";
 | 
							inform => "true";
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		"/usr/bin/true"
 | 
							"/usr/bin/true"
 | 
				
			||||||
 | 
							inform => "false",
 | 
				
			||||||
		depends_on => {"$(cls)_downloaded"},
 | 
							depends_on => {"$(cls)_downloaded"},
 | 
				
			||||||
		classes => if_repaired("$(cls)_kept");
 | 
							classes => if_repaired("$(cls)_kept");
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
	(!run_wget)&(wget)::
 | 
						(!run_wget)&(wget)::
 | 
				
			||||||
		"/usr/bin/true"
 | 
							"/usr/bin/true"
 | 
				
			||||||
 | 
							inform => "false",
 | 
				
			||||||
		classes => if_repaired("$(cls)_kept");
 | 
							classes => if_repaired("$(cls)_kept");
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -342,20 +344,6 @@ files:
 | 
				
			||||||
		depends_on => {"$(cls)_downloaded"};
 | 
							depends_on => {"$(cls)_downloaded"};
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
reports:
 | 
					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"; 
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								php.cf
								
								
								
								
							
							
						
						
									
										2
									
								
								php.cf
								
								
								
								
							| 
						 | 
					@ -133,7 +133,7 @@ bundle agent php_install_centos_repos
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
classes:
 | 
					classes:
 | 
				
			||||||
	centos::
 | 
						centos::
 | 
				
			||||||
	"switch_repo" expression => not(returnszero("cat /etc/dnf/modules.d/php.module | grep -q '^stream.*=.*remi-$(php.version)'","useshell"));
 | 
						"switch_repo" expression => not(returnszero("cat /etc/dnf/modules.d/php.module | grep -q '^stream.*=.*remi-$(php.version)' >/dev/null 2>&1","useshell"));
 | 
				
			||||||
	"install_remi" expression => not(returnszero("rpm -q remi-release > /dev/null","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"));
 | 
						"install_epel" expression => not(returnszero("rpm -q epel-release > /dev/null","useshell"));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										21
									
								
								roundcube.cf
								
								
								
								
							
							
						
						
									
										21
									
								
								roundcube.cf
								
								
								
								
							| 
						 | 
					@ -39,10 +39,10 @@ vars:
 | 
				
			||||||
		"dlsrc" string => "https://github.com/roundcube/roundcubemail/releases/download/$(cfg[version])/$(tgzname)";
 | 
							"dlsrc" string => "https://github.com/roundcube/roundcubemail/releases/download/$(cfg[version])/$(tgzname)";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
reports:
 | 
					reports:
 | 
				
			||||||
	dlbyversion::
 | 
					#	dlbyversion::
 | 
				
			||||||
		"dl by version";
 | 
					#		"dl by version";
 | 
				
			||||||
	!dlbyversion::
 | 
					#	!dlbyversion::
 | 
				
			||||||
		"not dl by version";
 | 
					#		"not dl by version";
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
files:
 | 
					files:
 | 
				
			||||||
	"$(dldir)/."
 | 
						"$(dldir)/."
 | 
				
			||||||
| 
						 | 
					@ -52,8 +52,8 @@ files:
 | 
				
			||||||
methods:
 | 
					methods:
 | 
				
			||||||
	"any" usebundle => download_file("$(dltype)","$(dlsrc)","$(dlfile)","roundcube_tgz_file",'{}'),
 | 
						"any" usebundle => download_file("$(dltype)","$(dlsrc)","$(dlfile)","roundcube_tgz_file",'{}'),
 | 
				
			||||||
	handle => "roundcube_tgz_copied",
 | 
						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)"
 | 
					    #    "$(dlfile)"
 | 
				
			||||||
| 
						 | 
					@ -76,22 +76,21 @@ files:
 | 
				
			||||||
	run_backups&config_exists::
 | 
						run_backups&config_exists::
 | 
				
			||||||
		"$(cfg[backup_dir])/config.inc.php"
 | 
							"$(cfg[backup_dir])/config.inc.php"
 | 
				
			||||||
		copy_from => local_dcp("$(install_sub_dir)/config/config.inc.php"),
 | 
							copy_from => local_dcp("$(install_sub_dir)/config/config.inc.php"),
 | 
				
			||||||
		depends_on => {"roundcube_untarred"};	
 | 
							depends_on => {"roundcube_untarred"};
 | 
				
			||||||
 | 
					 | 
				
			||||||
methods:
 | 
					methods:
 | 
				
			||||||
	"any" usebundle => mysql_table_exists(@(cfg),"users");
 | 
						"any" usebundle => mysql_table_exists(@(cfg),"users");
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	config_exists|roundcube_configr_repaired::
 | 
						config_exists|roundcube_config_repaired::
 | 
				
			||||||
		"any" usebundle => rm_rf ("$(install_sub_dir)/installer");
 | 
							"any" usebundle => rm_rf ("$(install_sub_dir)/installer");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
commands:
 | 
					commands:
 | 
				
			||||||
	roundcube_untar::
 | 
						roundcube_untar|roundcube_tgz_file_repaired::
 | 
				
			||||||
		"/usr/bin/tar"
 | 
							"/usr/bin/tar"
 | 
				
			||||||
		args => "xzf $(dlfile) -C $(cfg[install_dir]) && chown -R $(cfg[www_user]):$(cfg[www_group]) $(cfg[install_dir])",
 | 
							args => "xzf $(dlfile) -C $(cfg[install_dir]) && chown -R $(cfg[www_user]):$(cfg[www_group]) $(cfg[install_dir])",
 | 
				
			||||||
		depends_on => {"roundcube_tgz_copied"},
 | 
							depends_on => {"roundcube_tgz_copied"},
 | 
				
			||||||
		contain => wmde_cmd_useshell,
 | 
							contain => wmde_cmd_useshell,
 | 
				
			||||||
		handle => "roundcube_untarred";
 | 
							handle => "roundcube_untarred";
 | 
				
			||||||
	!roundcube_untar::
 | 
						(!roundcube_untar)&(!roundcube_tgz_file_repaired)::
 | 
				
			||||||
		"/usr/bin/true"
 | 
							"/usr/bin/true"
 | 
				
			||||||
		inform => "false",
 | 
							inform => "false",
 | 
				
			||||||
		depends_on => {"roundcube_tgz_copied"},
 | 
							depends_on => {"roundcube_tgz_copied"},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -76,7 +76,7 @@ classes:
 | 
				
			||||||
commands:
 | 
					commands:
 | 
				
			||||||
	install_yum_repo::
 | 
						install_yum_repo::
 | 
				
			||||||
	"wget"
 | 
						"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 && yum update -y",
 | 
						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 ",
 | 
				
			||||||
	contain => wmde_cmd_useshell;
 | 
						contain => wmde_cmd_useshell;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue