From b332e7821db67049b778870d3c808518fa13c650 Mon Sep 17 00:00:00 2001
From: georgejhunt <georgejhunt@gmail.com>
Date: Tue, 27 Nov 2018 08:00:52 -0800
Subject: [PATCH] put _default_ in 001-captive-portal.conf, specify box.lan in
 010-iiab.conf (#1308)

---
 roles/captive-portal/templates/001-captive-portal.conf | 10 ++++++++++
 roles/httpd/templates/010-iiab.conf.j2                 |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/roles/captive-portal/templates/001-captive-portal.conf b/roles/captive-portal/templates/001-captive-portal.conf
index 2a0e44311..7c77e8726 100644
--- a/roles/captive-portal/templates/001-captive-portal.conf
+++ b/roles/captive-portal/templates/001-captive-portal.conf
@@ -1,3 +1,13 @@
+<VirtualHost _defaullt_:80>
+   ErrorLog /var/log/apache2/error.log
+   CustomLog /var/log/apache2/access.log combined
+   <Directory "/library/www/html">
+       Options Indexes FollowSymLinks
+       AllowOverride None
+       Require all granted
+   </Directory>
+</VirtualHost>
+
 <VirtualHost *:80>
 	# The ServerName directive sets the request scheme, hostname and port that
 	# the server uses to identify itself. This is used when creating
diff --git a/roles/httpd/templates/010-iiab.conf.j2 b/roles/httpd/templates/010-iiab.conf.j2
index 637aba9e3..fed0b0210 100755
--- a/roles/httpd/templates/010-iiab.conf.j2
+++ b/roles/httpd/templates/010-iiab.conf.j2
@@ -177,7 +177,7 @@ DocumentRoot "{{ doc_root }}"
    ErrorLog /var/log/apache2/error.log
    CustomLog /var/log/apache2/access.log combined
    ServerName {{ iiab_hostname }}
-   ServerAlias *
+   ServerAlias {{ iiab_hostname }}.{{ iiab_domain }}
    <Directory "{{ doc_root }}">
        Options Indexes FollowSymLinks
        AllowOverride None