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

SUSE: use different global.conf

Browse Source 
sysconfig.d/global.conf is re-written by sysconfig on openSUSE
This commit is contained in:
Bernhard M. Wiedemann 2017-03-17 13:13:31 +01:00
parent 3f3e734cd7
commit 57690acd77
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/config.sls
View File

@ -57,7 +57,7 @@ include:
{% endif %} {% endif %}
{% if grains['os_family']=="Suse" %} {% if grains['os_family']=="Suse" %}
/etc/apache2/sysconfig.d/global.conf: /etc/apache2/global.conf:
file.managed: file.managed:
- template: jinja - template: jinja
- source: - source:

6
apache/files/Suse/apache-2.4.config.jinja
View File

@ -27,7 +27,7 @@
# |-- sysconfig.d/loadmodule.conf . . . . . [*] load these modules # |-- sysconfig.d/loadmodule.conf . . . . . [*] load these modules
# |-- listen.conf . . . . . . . . . . . . . IP adresses / ports to listen on # |-- listen.conf . . . . . . . . . . . . . IP adresses / ports to listen on
# |-- mod_log_config.conf . . . . . . . . . define logging formats # |-- mod_log_config.conf . . . . . . . . . define logging formats
# |-- sysconfig.d/global.conf . . . . . . . [*] server-wide general settings # |-- global.conf . . . . . . . . . . . . . server-wide general settings
# |-- mod_status.conf . . . . . . . . . . . restrict access to mod_status (server monitoring) # |-- mod_status.conf . . . . . . . . . . . restrict access to mod_status (server monitoring)
# |-- mod_info.conf . . . . . . . . . . . . restrict access to mod_info # |-- mod_info.conf . . . . . . . . . . . . restrict access to mod_info
# |-- mod_usertrack.conf . . . . . . . . . defaults for cookie-based user tracking # |-- mod_usertrack.conf . . . . . . . . . defaults for cookie-based user tracking
@ -121,8 +121,8 @@ Include /etc/apache2/listen.conf
# predefined logging formats # predefined logging formats
Include /etc/apache2/mod_log_config.conf Include /etc/apache2/mod_log_config.conf
# generated from global settings in /etc/sysconfig/apache2 # global settings managed by salt
Include /etc/apache2/sysconfig.d/global.conf Include /etc/apache2/global.conf
# optional mod_status, mod_info # optional mod_status, mod_info
Include /etc/apache2/mod_status.conf Include /etc/apache2/mod_status.conf