Merge branch 'master' of github.com:robertdebock/ansible-role-httpd

robertdebock · Jan 31, 2021 · 209b104 · 209b104
2 parents 2e07747 + 7893dd6
commit 209b104
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -30,6 +30,9 @@ This example is taken from `molecule/resources/converge.yml` and is tested on ea
           documentroot: /var/www/html/www1.example.com
         - name: backend_http
           servername: www2.example.com
+          serveralias:
+            - example.com
+            - special.com
           backend_url: "http://www.example.com/"
           serveralias:
             - example.com

diff --git a/templates/vhost.conf.j2 b/templates/vhost.conf.j2
@@ -12,6 +12,11 @@
 
 <VirtualHost *:{{ httpd_port }}>
    ServerName {{ item.servername }}
+
+{% if item.serveralias is defined %}
+   ServerAlias {{ item.serveralias | join(' ') }}
+{% endif %}
+
 {% if item.options is defined %}
    Options {{ item.options|join(' ') }}
 {% endif %}