From d90b6becb9e5637a8d505a83923c759935f80742 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Mon, 1 Oct 2018 19:48:08 +0000
Subject: [PATCH] hard code a ficticious, but stable, server name for url
 linked to by captive portal

---
 roles/1-prep/templates/.iiab.env.j2.un~ | Bin 649 -> 1090 bytes
 roles/1-prep/templates/iiab.env.j2      |   1 +
 roles/httpd/templates/010-iiab.conf.j2  |   4 ++--
 roles/network/files/mac.template        |   2 +-
 roles/network/files/simple.template     |   2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/roles/1-prep/templates/.iiab.env.j2.un~ b/roles/1-prep/templates/.iiab.env.j2.un~
index b9f549ce150d79452aff79c6fd84e04a84434ffa..f4f008fed86220fc816d5d29c8031c3fd8f387e3 100644
GIT binary patch
delta 226
zcmeBVJ;YHTmYF+0G|wgfDFf5?zq*$b7W(^Vzkj)7?$*^pT4!Wto^X|$yL|P76uA#y
z{xC2w@B%Riz-UGwn+Yrep+RggKYCNXDGNk4{sNK$D3bvs#R<e4>p7UDz$!o@$N*#v
i&&C>0#)%6Q&4I?5K#lt<0g^yc3D$@q%3#{~d=&ud(kDFt

delta 115
zcmX@a(aD+;mYF+0G|wgfDFf5%w0$3|AHVN@nfh+M-b#hY6ANk%?-#b3d~c;V*V>P+
q5)2FsJV1;L7=auR1_2lw%#U7Zv7QAY5`SUhMB$C)0!&QLR{;Raz8?$#

diff --git a/roles/1-prep/templates/iiab.env.j2 b/roles/1-prep/templates/iiab.env.j2
index 07e8766b6..1f6220dfb 100644
--- a/roles/1-prep/templates/iiab.env.j2
+++ b/roles/1-prep/templates/iiab.env.j2
@@ -10,3 +10,4 @@ OS={{ ansible_local.local_facts.os }}
 OS_VER={{ ansible_local.local_facts.os_ver }}
 WWWROOT={{ doc_root }}
 STAGE=1
+FQDN={{ iiab-fqdn }}
diff --git a/roles/httpd/templates/010-iiab.conf.j2 b/roles/httpd/templates/010-iiab.conf.j2
index aa3cbe231..2558f9c94 100755
--- a/roles/httpd/templates/010-iiab.conf.j2
+++ b/roles/httpd/templates/010-iiab.conf.j2
@@ -176,8 +176,8 @@ DocumentRoot "{{ doc_root }}"
 <VirtualHost *:80>
    ErrorLog /var/log/apache2/error.log
    CustomLog /var/log/apache2/access.log combined
-   ServerName box
-   ServerAlias box.lan
+   ServerName {{ iiab_hostname }}
+   ServerAlias server.lan
    <Directory "{{ doc_root }}">
        Options Indexes FollowSymLinks
        AllowOverride None
diff --git a/roles/network/files/mac.template b/roles/network/files/mac.template
index 658aa6b98..049c2ff19 100644
--- a/roles/network/files/mac.template
+++ b/roles/network/files/mac.template
@@ -48,7 +48,7 @@
       <br><br>
       <br><br>
       <br><br>
-         <a class="button" href="http://box.lan/home">{{ btn1 }}</a>
+         <a class="button" href="http://server.lan/home">{{ btn1 }}</a>
       </div>
   </body>
 </html>
diff --git a/roles/network/files/simple.template b/roles/network/files/simple.template
index 152a1607c..3919528fb 100644
--- a/roles/network/files/simple.template
+++ b/roles/network/files/simple.template
@@ -69,7 +69,7 @@
     <script>
      var w = window.innerWidth;
      function homeclick(){
-        window.open("http://box.lan/home","_system");
+        window.open("http://server.lan/home","_system");
         $.ajax("/home_selected");
      }