* Fix bindings for default ports in case they are needed
* Fix tests for listen_default_ports option
* Fix doc for listen_default_ports option
Change-Id: I83955b302f41d2ef78d091f88b99bd5b6d551949
diff --git a/README.rst b/README.rst
index fcf36ff..6578abe 100644
--- a/README.rst
+++ b/README.rst
@@ -32,6 +32,7 @@
server:
enabled: true
bind:
+ listen_default_ports: false
address: '0.0.0.0'
ports:
- 80
diff --git a/apache/files/ports.conf b/apache/files/ports.conf
index 5ad5bd1..1ddabf5 100644
--- a/apache/files/ports.conf
+++ b/apache/files/ports.conf
@@ -4,14 +4,14 @@
{%- from "apache/map.jinja" import listen_ports, server with context %}
{%- if server.get('bind', {}).get('listen_default_ports', True) %}
-Listen 80
+Listen {% if server.bind.address is defined %}{{ server.bind.address }}:{%- endif %}80
<IfModule ssl_module>
- Listen 443
+ Listen {% if server.bind.address is defined %}{{ server.bind.address }}:{%- endif %}443
</IfModule>
<IfModule mod_gnutls.c>
- Listen 443
+ Listen {% if server.bind.address is defined %}{{ server.bind.address }}:{%- endif %}443
</IfModule>
{%- endif %}
diff --git a/tests/pillar/apache_server_php5.sls b/tests/pillar/apache_server_php5.sls
index dc50f5e..294c37d 100644
--- a/tests/pillar/apache_server_php5.sls
+++ b/tests/pillar/apache_server_php5.sls
@@ -1,6 +1,8 @@
apache:
server:
enabled: true
+ bind:
+ listen_default_ports: false
modules:
- cgi
- php
diff --git a/tests/pillar/apache_server_php7.sls b/tests/pillar/apache_server_php7.sls
index 8ca65c1..bed96fd 100644
--- a/tests/pillar/apache_server_php7.sls
+++ b/tests/pillar/apache_server_php7.sls
@@ -1,6 +1,8 @@
apache:
server:
enabled: true
+ bind:
+ address: 127.0.0.1
modules:
- cgi
- php
diff --git a/tests/pillar/apache_server_php7_ssl.sls b/tests/pillar/apache_server_php7_ssl.sls
index e803587..8859b58 100644
--- a/tests/pillar/apache_server_php7_ssl.sls
+++ b/tests/pillar/apache_server_php7_ssl.sls
@@ -1,5 +1,7 @@
apache:
server:
+ bind:
+ listen_default_ports: false
ssl:
enabled: True
crypto_device: 'builtin'