saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding exclude_listen_directive option (#151)

Browse Source 
* Adding exclude_listen_directive option

* Updating Debian config
This commit is contained in:
Rob Ruma 2016-07-20 22:19:39 -04:00 committed by Forrest
parent adc80edd39
commit d5337836b2
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/files/Debian/ports-2.2.conf.jinja
View File

@ -8,10 +8,12 @@
{%- set interfaces = site.get('interface', '*').split() %} {%- set interfaces = site.get('interface', '*').split() %}
{%- set port = site.get('port', 80) %} {%- set port = site.get('port', 80) %}
{%- for interface in interfaces %} {%- for interface in interfaces %}
{%- if not site.get('exclude_listen_directive', False) %}
{%- set listen_directive = interface ~ ':' ~ port %} {%- set listen_directive = interface ~ ':' ~ port %}
{%- if listen_directive not in listen_directives %} {%- if listen_directive not in listen_directives %}
{%- do listen_directives.append(listen_directive) %} {%- do listen_directives.append(listen_directive) %}
{%- endif %} {%- endif %}
{%- endif %}
{%- endfor %} {%- endfor %}
{%- endfor %} {%- endfor %}
{%- for listen in listen_directives %} {%- for listen in listen_directives %}

2
apache/files/Debian/ports-2.4.conf.jinja
View File

@ -8,10 +8,12 @@
{%- set interfaces = site.get('interface', '*').split() %} {%- set interfaces = site.get('interface', '*').split() %}
{%- set port = site.get('port', 80) %} {%- set port = site.get('port', 80) %}
{%- for interface in interfaces %} {%- for interface in interfaces %}
{%- if not site.get('exclude_listen_directive', False) %}
{%- set listen_directive = interface ~ ':' ~ port %} {%- set listen_directive = interface ~ ':' ~ port %}
{%- if listen_directive not in listen_directives %} {%- if listen_directive not in listen_directives %}
{%- do listen_directives.append(listen_directive) %} {%- do listen_directives.append(listen_directive) %}
{%- endif %} {%- endif %}
{%- endif %}
{%- endfor %} {%- endfor %}
{%- endfor %} {%- endfor %}
{%- for listen in listen_directives %} {%- for listen in listen_directives %}

2
apache/files/RedHat/apache-2.4.config.jinja
View File

@ -49,10 +49,12 @@ ServerRoot "/etc/httpd"
{%- set interfaces = site.get('interface', '*').split() %} {%- set interfaces = site.get('interface', '*').split() %}
{%- set port = site.get('port', 80) %} {%- set port = site.get('port', 80) %}
{%- for interface in interfaces %} {%- for interface in interfaces %}
{%- if not site.get('exclude_listen_directive', False) %}
{%- set listen_directive = interface ~ ':' ~ port %} {%- set listen_directive = interface ~ ':' ~ port %}
{%- if listen_directive not in listen_directives %} {%- if listen_directive not in listen_directives %}
{%- do listen_directives.append(listen_directive) %} {%- do listen_directives.append(listen_directive) %}
{%- endif %} {%- endif %}
{%- endif %}
{%- endfor %} {%- endfor %}
{%- endfor %} {%- endfor %}
{%- for listen in listen_directives %} {%- for listen in listen_directives %}

2
pillar.example
View File

@ -54,6 +54,8 @@ apache:
interface: '*' interface: '*'
port: '80' port: '80'
exclude_listen_directive: True # Do not add a Listen directive in httpd.conf
ServerName: example.com # uses the unique ID above unless specified ServerName: example.com # uses the unique ID above unless specified
ServerAlias: www.example.com ServerAlias: www.example.com