Wifi CP fixes: Apache listen and servername
Use the IP address for a Servername and make sure we listen on port 81
This commit is contained in:
parent
ce8089c65b
commit
bf7dff75d9
3 changed files with 31 additions and 0 deletions
16
modules/rhizo_base/files/ports.conf
Normal file
16
modules/rhizo_base/files/ports.conf
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
# If you just change the port or add more ports here, you will likely also
|
||||||
|
# have to change the VirtualHost statement in
|
||||||
|
# /etc/apache2/sites-enabled/000-default.conf
|
||||||
|
|
||||||
|
Listen 80
|
||||||
|
Listen 81
|
||||||
|
|
||||||
|
<IfModule ssl_module>
|
||||||
|
Listen 443
|
||||||
|
</IfModule>
|
||||||
|
|
||||||
|
<IfModule mod_gnutls.c>
|
||||||
|
Listen 443
|
||||||
|
</IfModule>
|
||||||
|
|
||||||
|
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
|
|
@ -41,6 +41,20 @@ class rhizo_base::wifi {
|
||||||
notify => Service['apache2']
|
notify => Service['apache2']
|
||||||
}
|
}
|
||||||
|
|
||||||
|
file { '/etc/apache2/ports.conf':
|
||||||
|
ensure => present,
|
||||||
|
source => 'puppet:///modules/rhizo_base/ports.conf',
|
||||||
|
require => Package['apache2'],
|
||||||
|
notify => Service['apache2']
|
||||||
|
}
|
||||||
|
|
||||||
|
file { '/etc/apache2/mods-enabled/rewrite.load':
|
||||||
|
ensure => link,
|
||||||
|
target => '../mods-available/rewrite.load',
|
||||||
|
require => Package['apache2'],
|
||||||
|
notify => Service['apache2']
|
||||||
|
}
|
||||||
|
|
||||||
firewall { '000 accept DHCP (udp port 67)':
|
firewall { '000 accept DHCP (udp port 67)':
|
||||||
proto => 'udp',
|
proto => 'udp',
|
||||||
iniface => $wifi_if,
|
iniface => $wifi_if,
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
<VirtualHost <%= @wifi_ip %>:81>
|
<VirtualHost <%= @wifi_ip %>:81>
|
||||||
#ServerName www.example.com
|
#ServerName www.example.com
|
||||||
|
ServerName <%= @wifi_ip %>
|
||||||
|
|
||||||
ServerAdmin webmaster@localhost
|
ServerAdmin webmaster@localhost
|
||||||
DocumentRoot /var/rhizomatica/portal
|
DocumentRoot /var/rhizomatica/portal
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue