refactor(roles/httpd): merge httpd roles

1 files changed, 5 insertions, 12 deletions

diff --git a/roles/httpd/templates/httpd.conf.j2 b/roles/httpd/templates/httpd.conf.j2
index 6285d70..49e928d 100644
--- a/roles/httpd/templates/httpd.conf.j2
+++ b/roles/httpd/templates/httpd.conf.j2
@@ -1,18 +1,12 @@
 # managed by Ansible
 
 types {
-	text/css        css
-	text/html       html htm
-	text/plain      txt pgp pub
-	image/gif       gif
-	image/jpeg      jpeg jpg
-	image/png       png
-	image/svg+xml   svg
-	application/xml xml rss
+{% for type in httpd_supported_types %}
+	{{ type }}
+{% endfor %}
 }
 
-{% if inventory_hostname == __global_domain_controller  %}
-server "default" {
+server "acme" {
 	listen on localhost port 8888
 
 	location "/.well-known/acme-challenge/*" {
@@ -24,8 +18,7 @@ server "default" {
 		block return 302 "https://$HTTP_HOST$REQUEST_URI"
 	}
 }
-{% endif %}
 
-{% for file in configuration_files.files %}
+{% for file in httpd_configuration_files.files %}
 include "{{ file.path }}"
 {% endfor %}