Compare commits
	
		
			No commits in common. "c51019ba0986c57c03501ab81fdb01015ad0b027" and "07723fa44abb0b520df4b01a421d41e70b1eeee5" have entirely different histories.
		
	
	
		
			c51019ba09
			...
			07723fa44a
		
	
		
							
								
								
									
										30
									
								
								dovecot.cf
								
								
								
								
							
							
						
						
									
										30
									
								
								dovecot.cf
								
								
								
								
							| 
						 | 
					@ -32,6 +32,10 @@ vars:
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
		};
 | 
							};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						
 | 
				
			||||||
 | 
							
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
methods:
 | 
					methods:
 | 
				
			||||||
	"any" usebundle => wmde_install_packages(@(pkgs),"dovecot");
 | 
						"any" usebundle => wmde_install_packages(@(pkgs),"dovecot");
 | 
				
			||||||
	"any" usebundle => wmde_service("$(service_name)","dovecot_kept","dovecot_repaired"),
 | 
						"any" usebundle => wmde_service("$(service_name)","dovecot_kept","dovecot_repaired"),
 | 
				
			||||||
| 
						 | 
					@ -44,18 +48,11 @@ methods:
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
files:	
 | 
					files:	
 | 
				
			||||||
	"$(cfg_dir)/."
 | 
					 | 
				
			||||||
	create => "true",
 | 
					 | 
				
			||||||
	perms => mog("755","root","root"),
 | 
					 | 
				
			||||||
	depends_on => {"dovecot_pkgs_installed"},
 | 
					 | 
				
			||||||
	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"),
 | 
					 | 
				
			||||||
	template_method => "mustache",
 | 
						template_method => "mustache",
 | 
				
			||||||
	depends_on => {"dovecot_pkgs_installed","dovecot_cfg_dir_created"},
 | 
						depends_on => {"dovecot_pkgs_installed"},
 | 
				
			||||||
	handle => "dovecot_cfg_created",
 | 
						handle => "dovecot_cfg_created",
 | 
				
			||||||
	edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/dovecot/dovecot.conf.mustache";
 | 
						edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/dovecot/dovecot.conf.mustache";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -84,20 +81,3 @@ reports:
 | 
				
			||||||
	"DOVECOT repaired";
 | 
						"DOVECOT repaired";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
bundle agent dovecot_vimbadmin_sql(cfg)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
vars:
 | 
					 | 
				
			||||||
	"cfg_file" string => "$(sys.workdir)/data/agent/dovecot/vimbadmin-sql.comf";
 | 
					 | 
				
			||||||
files:
 | 
					 | 
				
			||||||
	"$(cfg_file)"
 | 
					 | 
				
			||||||
	classes => if_repaired(dovecot_repaired),
 | 
					 | 
				
			||||||
	create => "true",
 | 
					 | 
				
			||||||
	template_method => "mustache",
 | 
					 | 
				
			||||||
	edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/dovecot/vimbadmin-sql.conf.mustache";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,8 +0,0 @@
 | 
				
			||||||
default_pass_scheme = CRYPT
 | 
					 | 
				
			||||||
driver = mysql
 | 
					 | 
				
			||||||
connect = host={{vars.dovecot_vimbadmin_sql.cfg.db_host}} dbname={{vars.dovecot_vimbadmin_sql.cfg.db_name}} user={{vars.dovecot_vimbadmin_sql.cfg.db_user}} password={{vars.dovecot_vimbadmin_sql.cfg.db_pass}}
 | 
					 | 
				
			||||||
password_query = \
 | 
					 | 
				
			||||||
  SELECT username AS user, password, \
 | 
					 | 
				
			||||||
    homedir AS userdb_home, uid AS userdb_uid, gid AS userdb_gid \
 | 
					 | 
				
			||||||
  FROM mailbox WHERE username = '%u'
 | 
					 | 
				
			||||||
iterate_query = SELECT username AS user FROM mailbox
 | 
					 | 
				
			||||||
		Loading…
	
		Reference in New Issue