apache.cf

@@ -118,12 +118,11 @@ vars:
 			{m: "dav",f:"mod_dav"},
 			{m: "dav_svn", f:"mod_dav_svn"},
 			{m: "authz_svn", f:"mod_authz_svn"},
-			{m: "ssl",f:"mod_ssl"}
 		]';
 }
 
 
-bundle agent install_apache(raw)
+bundle agent install_apache(params)
 {
 classes:
 
@@ -204,14 +203,10 @@ bundle agent apache_vhost
 classes:
 	"delete" expression => $(site[disable]);
 	"use_ssl" expression => $(site[ssl]);
-	"use_certbot" expression => strcmp("certbot","$(site[ssl_cert])");
-
 vars:
 	"site_defaults" data => '
 		{
 			"aliases":[],
-			"ssl_cert":"certbot",
-			"email":"$(apache.admin_email)"
 		}
 	';
 
@@ -227,16 +222,9 @@ vars:
 	"domain_file" string => "$(apache.cfg_dir)/Vhosts/$(site[domain]).conf";
 	"domain_dir" string => "$(apache.www_dir)/$(site[domain])/";
 
-	"ssl_cert" string => ifelse( use_certbot, 
+use_ssl::
-		"$(certbot.certbot_dir)/live/$(site[domain])/fullchain.pem", 
-		"$(site[ssl_cert])");
-	"ssl_key" string => ifelse( use_certbot, 
-		"$(certbot.certbot_dir)/live/$(site[domain])/privkey.pem", 
-		"$(site[ssl_key])");
-
-	use_ssl&(use_certbot)::
 	"vhostdeps" slist => {"apache_ssl_created$(site[domain])"};
-	(!use_ssl)|(!use_certbot)::
+!use_ssl::
 	"vhostdeps" slist => {};
 files:
 
@@ -260,16 +248,16 @@ vars:
 			perms => uperm("$(apache.www_user)","$(apache.www_group)","750");
 
 methods:
-	use_ssl&use_certbot::
+	use_ssl::
 		"any" usebundle => certbot_cert(@(site),"$(apache.default_html_dir)"), #,"$(site[domain])"),
 		handle => "apache_ssl_created$(site[domain])";
 
+	
 		"apache_vhost_restart"::
 			"any" usebundle => restart_apache("$(site[domain])"),
 			depends_on => {"vhost_cfg_done$(site[domain])","apache_ssl_created$(site[domain])" };
 
-
+	!use_ssl::
-	(!use_ssl)|(!use_certbot)::
 		"apache_vhost_restart"::
 			"any" usebundle => restart_apache("$(site[domain])"),
 			depends_on => {"vhost_cfg_done$(site[domain])" };
@@ -277,24 +265,14 @@ methods:
 
 
 reports:
-#	"SSL_CERT: $(ssl_cert) $(ssl_key) ";
-#	use_ssl::
-#		"USE SSL";
-#	!use_ssl::
-#		"NOT USE_SSL";
-
-#	"RAW: $(site[raw])";
 }
 
 
-bundle agent apache_vhosts(sites)
+bundle agent configure_apache(sites)
 {
 vars:
 	"idx" slist => getindices(@(sites));
 methods:
-	"any" usebundle => apache_vhost(@(sites[$(idx)]));
+	"any" usebundle => apache_vhost($(sites[$idx]));
-
-reports:
-#	"IDXE $(idx)";
 	
 }

templates/httpd-vhost.conf.mustache

@@ -44,14 +44,12 @@
 	CustomLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-access.log" combined
 	# SSL
 	SSLEngine on
-#	SSLCertificateFile {{vars.certbot.certbot_dir}}/live/{{vars.apache_vhost.site.domain}}/fullchain.pem
+	SSLCertificateFile {{vars.certbot.certbot_dir}}/live/{{vars.apache_vhost.site.domain}}/fullchain.pem
-#	SSLCertificateKeyFile {{vars.certbot.certbot_dir}}/live/{{vars.apache_vhost.site.domain}}/privkey.pem
+	SSLCertificateKeyFile {{vars.certbot.certbot_dir}}/live/{{vars.apache_vhost.site.domain}}/privkey.pem
-	SSLCertificateFile {{vars.apache_vhost.ssl_cert}}
-	SSLCertificateKeyFile {{vars.apache_vhost.ssl_key}}
 	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}}}
+	{{vars.apache_vhost.site.raw}}
 </VirtualHost>
 {{/vars.apache_vhost.site.ssl}}
 

templates/httpd.conf.mustache

@@ -581,7 +581,7 @@ SSLRandomSeed connect builtin
 </VirtualHost>
 
 
-{{vars.install_apache.raw}}
+
 
 Include {{vars.apache.cfg_dir}}/Vhosts/*.conf