Added raw parameter

apache.cf

@@ -142,16 +142,18 @@ files:
 		create => "true",
 		edit_template => "$(sys.workdir)/inputs/$(def.mfdomain)/templates/httpd.conf.mustache",
 		template_method => "mustache",
+		handle => "apache_main_cfg_crreated",
 		classes => if_repaired(apache_changed);
 
 services:
 	"$(apache.service_name)"
-		depends_on => {"apache_editrc","apache_vhost_dir_created"},
+		depends_on => {"apache_editrc","apache_vhost_dir_created","apache_www_dir_created","apache_main_cfg_crreated"},
 		service_policy => "start",
 		handle => "apache_running";
 		
 	"php_changed|apache_changed"::
 		"$(apache.service_name)"
+		depends_on => {"apache_vhost_dir_created","apache_www_dir_created","apache_main_cfg_crreated"},
 		service_policy => "restart";
 }
 
@@ -164,12 +166,21 @@ commands:
 
 
 bundle agent apache_vhost
-(site)
+(site_param)
 {
 classes:
 	"delete" expression => $(site[disable]);
 	"use_ssl" expression => $(site[ssl]);
 vars:
+	"site_defaults" data => '
+		{
+			"aliases":[],
+		}
+	';
+
+	"site" data => mergedata(site_defaults,site_param);
+
+
 	"cert_file" string => "$(certbot.certbot_dir)/live/$(site[domain])";
 
 	"template_file" 
@@ -206,7 +217,7 @@ files:
 
 methods:
 	use_ssl::
-		"any" usebundle => certbot_cert(@(site),"$(apache.default_html_dir)","$(site[domain])"),
+		"any" usebundle => certbot_cert(@(site),"$(apache.default_html_dir)"), #,"$(site[domain])"),
 		handle => "apache_ssl_created$(site[domain])";
 
 	

certbot.cf

@@ -42,10 +42,13 @@ packages:
 			handle => "certbot_installed";
 }
 
-bundle agent certbot_cert(site,webroot,domain)
+bundle agent certbot_cert(site,webroot)
 {
 
 vars:
+
+	"domain" string => "$(site[domain])";
+
 	"site_json" string => storejson(@(site));
 	"args" string => string_mustache(
 			"-d {{domain}} {{#aliases}} -d {{.}} {{/aliases}}",
@@ -71,7 +74,8 @@ classes:
 	or => {no_cert_file, certbot_repaired};
 
 defaults:
-	 "webroot" string => "standalone";
+	"webroot" string => "standalone";
+	"domain" string => "$(site[domain])";
 
 methods:
 	"any" usebundle => install_certbot;

templates/httpd-vhost.conf.mustache

@@ -21,6 +21,7 @@
 	ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}}
 	ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log"
 	CustomLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-access.log" combined
+	{{vars.apache_vhost.site.raw}}
 </VirtualHost>
 {{/vars.apache_vhost.site.ssl}}
 
@@ -48,6 +49,7 @@
 	RewriteEngine On
 	Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/"
 	RewriteRule "^/.well-known/acme-challenge/" - [L]
+	{{vars.apache_vhost.site.raw}}
 </VirtualHost>
 {{/vars.apache_vhost.site.ssl}}