瀏覽代碼

Allow setting APACHE_SERVER_FLAGS on Suse (#234)

SUSE reads additional FLAGS that are used on the server start. They are
read from the APACHE_SERVER_FLAGS key, so we use a2enflag/a2disflag to
set those as we do with modules.
tags/v0.37.4
Sebastian Meyer 6 年之前
父節點
當前提交
6f3ab21d62
共有 2 個檔案被更改,包括 34 行新增0 行删除
  1. +28
    -0
      apache/flags.sls
  2. +6
    -0
      pillar.example

+ 28
- 0
apache/flags.sls 查看文件

@@ -0,0 +1,28 @@
{% from "apache/map.jinja" import apache with context %}

{% if salt['grains.get']('os_family') == 'Suse' or salt['grains.get']('os') == 'SUSE' %}

include:
- apache
{% for flag in salt['pillar.get']('apache:flags:enabled', []) %}
a2enflag {{ flag }}:
cmd.run:
- unless: egrep "^APACHE_SERVER_FLAGS=" /etc/sysconfig/apache2 | grep {{ flag }}
- require:
- pkg: apache
- watch_in:
- module: apache-restart
{% endfor %}

{% for module in salt['pillar.get']('apache:flags:disabled', []) %}
a2disflag -f {{ flag }}:
cmd.run:
- onlyif: egrep "^APACHE_SERVER_FLAGS=" /etc/sysconfig/apache2 | grep {{ flag }}
- require:
- pkg: apache
- watch_in:
- module: apache-restart
{% endfor %}

{% endif %}

+ 6
- 0
pillar.example 查看文件

@@ -291,6 +291,12 @@ apache:
disabled: # List modules to disable
- rewrite

flags:
enabled: # List server flags to enable
- SSL
disabled: # List server flags to disable
- status

# KeepAlive: Whether or not to allow persistent connections (more than
# one request per connection). Set to "Off" to deactivate.
keepalive: 'On'

Loading…
取消
儲存