Added ability to configure mod_remoteip
This commit is contained in:
parent
8df779fe12
commit
8f2308b985
@ -85,6 +85,11 @@ Installs and enables the mod_fcgid module
|
|||||||
|
|
||||||
Enables the Apache module vhost_alias (Debian Only)
|
Enables the Apache module vhost_alias (Debian Only)
|
||||||
|
|
||||||
|
``apache.mod_remoteip``
|
||||||
|
----------------------
|
||||||
|
|
||||||
|
Enables and configures the Apache module mod_remoteip using data from Pillar. (Debian Only)
|
||||||
|
|
||||||
``apache.vhosts.standard``
|
``apache.vhosts.standard``
|
||||||
--------------------------
|
--------------------------
|
||||||
|
|
||||||
|
4
apache/files/Debian/conf-available/remoteip.conf.jinja
Normal file
4
apache/files/Debian/conf-available/remoteip.conf.jinja
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
RemoteIPHeader {{ salt['pillar.get']('apache:mod_remoteip:RemoteIPHeader', 'X-Forwarded-For') }}
|
||||||
|
{%- for trusted_proxy in salt['pillar.get']('apache:mod_remoteip:RemoteIPTrustedProxy', []) %}
|
||||||
|
RemoteIPTrustedProxy {{ trusted_proxy }}
|
||||||
|
{%- endfor %}
|
25
apache/mod_remoteip.sls
Normal file
25
apache/mod_remoteip.sls
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
{% if grains['os_family']=="Debian" %}
|
||||||
|
|
||||||
|
include:
|
||||||
|
- apache
|
||||||
|
|
||||||
|
a2enmod remoteip:
|
||||||
|
cmd.run:
|
||||||
|
- unless: ls /etc/apache2/mods-enabled/remoteip.load
|
||||||
|
- order: 255
|
||||||
|
- require:
|
||||||
|
- pkg: apache
|
||||||
|
- watch_in:
|
||||||
|
- module: apache-restart
|
||||||
|
|
||||||
|
/etc/apache2/conf-available/remoteip.conf:
|
||||||
|
file.managed:
|
||||||
|
- template: jinja
|
||||||
|
- source:
|
||||||
|
- salt://apache/files/{{ salt['grains.get']('os_family') }}/conf-available/remoteip.conf.jinja
|
||||||
|
- require:
|
||||||
|
- pkg: apache
|
||||||
|
- watch_in:
|
||||||
|
- service: apache
|
||||||
|
|
||||||
|
{% endif %}
|
@ -18,6 +18,13 @@ apache:
|
|||||||
# ``apache.mod_wsgi`` formula additional configuration:
|
# ``apache.mod_wsgi`` formula additional configuration:
|
||||||
mod_wsgi: mod_wsgi
|
mod_wsgi: mod_wsgi
|
||||||
|
|
||||||
|
# ``apache.mod_remoteip`` formula additional configuration:
|
||||||
|
mod_remoteip:
|
||||||
|
RemoteIPHeader: X-Forwarded-For
|
||||||
|
RemoteIPTrustedProxy:
|
||||||
|
- 10.0.8.0/24
|
||||||
|
- 127.0.0.1
|
||||||
|
|
||||||
# ``apache.vhosts`` formula additional configuration:
|
# ``apache.vhosts`` formula additional configuration:
|
||||||
sites:
|
sites:
|
||||||
example.net:
|
example.net:
|
||||||
|
Loading…
Reference in New Issue
Block a user