Update apache to listen on 70 rather than 80 to avoid clashing with haproxy
This commit is contained in:
parent
7d14bf9ef0
commit
63f597f378
11
files/ports.conf
Normal file
11
files/ports.conf
Normal file
@ -0,0 +1,11 @@
|
||||
Listen 70
|
||||
|
||||
<IfModule ssl_module>
|
||||
Listen 443
|
||||
</IfModule>
|
||||
|
||||
<IfModule mod_gnutls.c>
|
||||
Listen 443
|
||||
</IfModule>
|
||||
|
||||
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
|
@ -173,6 +173,10 @@ def apache_reload():
|
||||
subprocess.call(['service', 'apache2', 'reload'])
|
||||
|
||||
|
||||
def apache_ports():
|
||||
shutil.copy('files/ports.conf', '/etc/apache2/ports.conf')
|
||||
|
||||
|
||||
@hooks.hook('upgrade-charm',
|
||||
'config-changed')
|
||||
@restart_on_change({'/etc/ceph/ceph.conf': ['radosgw'],
|
||||
@ -186,6 +190,7 @@ def config_changed():
|
||||
install_www_scripts()
|
||||
apache_sites()
|
||||
apache_modules()
|
||||
apache_ports()
|
||||
apache_reload()
|
||||
for r_id in relation_ids('identity-service'):
|
||||
identity_joined(relid=r_id)
|
||||
|
Loading…
Reference in New Issue
Block a user