Removed some apache stuff
This commit is contained in:
		
							parent
							
								
									a48feb88b2
								
							
						
					
					
						commit
						5184e10af9
					
				
							
								
								
									
										16
									
								
								nginx.cf
								
								
								
								
							
							
						
						
									
										16
									
								
								nginx.cf
								
								
								
								
							| 
						 | 
				
			
			@ -20,6 +20,11 @@ debian::
 | 
			
		|||
	"cfg_dir" string => "/etc/nginx";
 | 
			
		||||
	"vhost_cfg_dir" string => "$(cfg_dir)/conf.d";
 | 
			
		||||
	"service_name" string => "nginx";
 | 
			
		||||
any::
 | 
			
		||||
	"service_deps" slist => {
 | 
			
		||||
			"nginx_pkgs_installed",
 | 
			
		||||
			"nginx_www_dir_created",
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -54,13 +59,20 @@ files:
 | 
			
		|||
		create => "true",
 | 
			
		||||
		handle => "nginx_work_dir_created";
 | 
			
		||||
 | 
			
		||||
methods:
 | 
			
		||||
	
 | 
			
		||||
	"any" usebundle => wmde_enable_service("nginx");
 | 
			
		||||
	"any" usebundle => wmde_service("$(nginx.service_name)","nginx_kept","nginx_repaired"),
 | 
			
		||||
		depends_on => @(nginx.service_deps) ;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
commands:
 | 
			
		||||
	"/bin/sh"
 | 
			
		||||
	args => "$(sys.workdir)/inputs/$(def.wmde_libdir)/scripts/del-files-not-in-list.sh $(nginx.vhost_cfg_dir) $(sys.workdir)/data/agent/nginx/domains.txt && echo dummy.conf > $(sys.workdir)/data/agent/nginx/domains.txt",
 | 
			
		||||
	inform => "false",
 | 
			
		||||
	handle => "nginx_vhost_dir_cleaned",
 | 
			
		||||
#	depends_on => {"apache_dummy_conf_created"},
 | 
			
		||||
#	depends_on => {"nginx_dummy_conf_created"},
 | 
			
		||||
	contain => wmde_cmd_useshell; 
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -80,7 +92,7 @@ classes:
 | 
			
		|||
	"do_logrotate" expression => $(site[logrotate]);
 | 
			
		||||
 | 
			
		||||
vars:
 | 
			
		||||
		#	"email":$(apache.admin_email),
 | 
			
		||||
		#	"email":$(nginx.admin_email),
 | 
			
		||||
 | 
			
		||||
	"site_defaults" data => '
 | 
			
		||||
		{
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -13,7 +13,7 @@ server {
 | 
			
		|||
		alias {{vars.nginx.default_html_dir}}/.well-known/acme-challenge/;
 | 
			
		||||
		try_files $uri $uri/ =404;
 | 
			
		||||
	}
 | 
			
		||||
	{{{vars.apache_vhost.site.raw}}}
 | 
			
		||||
	{{{vars.nginx_vhost.site.raw}}}
 | 
			
		||||
}
 | 
			
		||||
{{/vars.nginx_vhost.site.ssl}}
 | 
			
		||||
	
 | 
			
		||||
| 
						 | 
				
			
			@ -52,7 +52,7 @@ server {
 | 
			
		|||
#	ssl_dhparam               /etc/nginx/dhparam.pem;
 | 
			
		||||
 | 
			
		||||
	root {{vars.nginx_vhost.site.doc_root}};
 | 
			
		||||
	{{{vars.apache_vhost.site.raw}}}
 | 
			
		||||
	{{{vars.nginx_vhost.site.raw}}}
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue