external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

put _default_ in 001-captive-portal.conf, specify box.lan in 010-iiab.conf (#1308)

Browse source
This commit is contained in:
georgejhunt 2018-11-27 08:00:52 -08:00 • committed by GitHub
parent eb9808de27
commit b332e7821d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
roles/captive-portal/templates/001-captive-portal.conf
View file

@ -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> <VirtualHost *:80>
# The ServerName directive sets the request scheme, hostname and port that # The ServerName directive sets the request scheme, hostname and port that
# the server uses to identify itself. This is used when creating # the server uses to identify itself. This is used when creating

2
roles/httpd/templates/010-iiab.conf.j2
View file

@ -177,7 +177,7 @@ DocumentRoot "{{ doc_root }}"
ErrorLog /var/log/apache2/error.log ErrorLog /var/log/apache2/error.log
CustomLog /var/log/apache2/access.log combined CustomLog /var/log/apache2/access.log combined
ServerName {{ iiab_hostname }} ServerName {{ iiab_hostname }}
ServerAlias * ServerAlias {{ iiab_hostname }}.{{ iiab_domain }}
<Directory "{{ doc_root }}"> <Directory "{{ doc_root }}">
Options Indexes FollowSymLinks Options Indexes FollowSymLinks
AllowOverride None AllowOverride None