add server_status state (#250)

Add server_status state to create a default server_status handler for localhost
This commit is contained in:
Niels Abspoel 2018-11-27 19:53:15 +01:00 committed by GitHub
parent a881f63780
commit dccfdf7962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 1 deletions

View File

@ -198,6 +198,11 @@ of interfaces to bind to. For example, to bind both IPv4 and IPv6:
Configures Apache's security.conf options by reassinging them using data from Pillar. Configures Apache's security.conf options by reassinging them using data from Pillar.
``apache.server_status``
--------------------------
Configures Apache's server_status handler for localhost
``apache.debian_full`` ``apache.debian_full``
---------------------- ----------------------

View File

@ -165,7 +165,7 @@ Include /etc/apache2/ssl-global.conf
{% if salt['pillar.get']('apache:mod_ssl:manage_tls_defaults', False) -%} {% if salt['pillar.get']('apache:mod_ssl:manage_tls_defaults', False) -%}
Include /etc/apache24/conf.d/tls-defaults.conf Include /etc/apache24/conf.d/tls-defaults.conf
{%- %} {%- endif %}
# global (server-wide) protocol configuration, that is not specific # global (server-wide) protocol configuration, that is not specific
# to any virtual host # to any virtual host

View File

@ -0,0 +1,10 @@
<Location "/server-status">
SetHandler server-status
{%- if apache.version == '2.4' %}
Require local
{%- elif apache.version == '2.2' %}
Order deny,allow
Deny from all
Allow from localhost
{%- endif %}
</Location>

18
apache/server_status.sls Normal file
View File

@ -0,0 +1,18 @@
{% from "apache/map.jinja" import apache with context %}
include:
- apache
- apache.config
{{apache.confdir}}/server-status{{apache.confext}}:
file.managed:
- source: salt://apache/files/server-status.conf.jinja
- template: jinja
- require:
- pkg: apache
- watch_in:
- module: apache-restart
- require_in:
- module: apache-restart
- module: apache-reload
- service: apache