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

feature(trust): improved remote ip internal proxy support (#300)

Browse Source 
* feat(trusted_proxy): Add support for RemoteIPInternalProxy

* fix(syntax): add semicolon
This commit is contained in:
Marius van Witzenburg 2021-01-08 12:33:46 +01:00 committed by GitHub
parent 6c529330e6
commit 22c647eb5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apache/files/Debian/conf-available/remoteip.conf.jinja
View File

@ -2,3 +2,6 @@ RemoteIPHeader {{ salt['pillar.get']('apache:mod_remoteip:RemoteIPHeader', 'X-Fo
{%- for trusted_proxy in salt['pillar.get']('apache:mod_remoteip:RemoteIPTrustedProxy', []) %} {%- for trusted_proxy in salt['pillar.get']('apache:mod_remoteip:RemoteIPTrustedProxy', []) %}
RemoteIPTrustedProxy {{ trusted_proxy }} RemoteIPTrustedProxy {{ trusted_proxy }}
{%- endfor %} {%- endfor %}
{%- for trusted_proxy in salt['pillar.get']('apache:mod_remoteip:RemoteIPInternalProxy', []) %}
RemoteIPInternalProxy {{ trusted_proxy }}
{%- endfor %}

3
apache/files/RedHat/conf.modules.d/remoteip.conf.jinja
View File

@ -6,3 +6,6 @@ RemoteIPHeader {{ salt['pillar.get']('apache:mod_remoteip:RemoteIPHeader', 'X-Fo
{%- for trusted_proxy in salt['pillar.get']('apache:mod_remoteip:RemoteIPTrustedProxy', []) %} {%- for trusted_proxy in salt['pillar.get']('apache:mod_remoteip:RemoteIPTrustedProxy', []) %}
RemoteIPTrustedProxy {{ trusted_proxy }} RemoteIPTrustedProxy {{ trusted_proxy }}
{%- endfor %} {%- endfor %}
{%- for trusted_proxy in salt['pillar.get']('apache:mod_remoteip:RemoteIPInternalProxy', []) %}
RemoteIPInternalProxy {{ trusted_proxy }}
{%- endfor %}

3
pillar.example
View File

@ -444,6 +444,9 @@ apache:
RemoteIPTrustedProxy: RemoteIPTrustedProxy:
- 10.0.8.0/24 - 10.0.8.0/24
- 127.0.0.1 - 127.0.0.1
RemoteIPInternalProxy:
- 10.10.8.0/24
- 127.0.0.1
# ``apache.mod_security`` formula additional configuration: # ``apache.mod_security`` formula additional configuration:
mod_security: mod_security:

3
test/salt/pillar/modules.sls
View File

@ -427,6 +427,9 @@ apache:
RemoteIPTrustedProxy: RemoteIPTrustedProxy:
- 10.0.8.0/24 - 10.0.8.0/24
- 127.0.0.1 - 127.0.0.1
RemoteIPInternalProxy:
- 10.10.8.0/24
- 127.0.0.1
# ``apache.mod_security`` formula additional configuration: # ``apache.mod_security`` formula additional configuration:
mod_security: mod_security: