From 57690acd77fe591ac02a2f446d9f1bfaf79271c9 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Fri, 17 Mar 2017 13:13:31 +0100 Subject: [PATCH] SUSE: use different global.conf sysconfig.d/global.conf is re-written by sysconfig on openSUSE --- apache/config.sls | 2 +- apache/files/Suse/apache-2.4.config.jinja | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apache/config.sls b/apache/config.sls index 1d63599..4691f8e 100644 --- a/apache/config.sls +++ b/apache/config.sls @@ -57,7 +57,7 @@ include: {% endif %} {% if grains['os_family']=="Suse" %} -/etc/apache2/sysconfig.d/global.conf: +/etc/apache2/global.conf: file.managed: - template: jinja - source: diff --git a/apache/files/Suse/apache-2.4.config.jinja b/apache/files/Suse/apache-2.4.config.jinja index 4119f93..0abe689 100644 --- a/apache/files/Suse/apache-2.4.config.jinja +++ b/apache/files/Suse/apache-2.4.config.jinja @@ -27,7 +27,7 @@ # |-- sysconfig.d/loadmodule.conf . . . . . [*] load these modules # |-- listen.conf . . . . . . . . . . . . . IP adresses / ports to listen on # |-- 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_info.conf . . . . . . . . . . . . restrict access to mod_info # |-- mod_usertrack.conf . . . . . . . . . defaults for cookie-based user tracking @@ -121,8 +121,8 @@ Include /etc/apache2/listen.conf # predefined logging formats Include /etc/apache2/mod_log_config.conf -# generated from global settings in /etc/sysconfig/apache2 -Include /etc/apache2/sysconfig.d/global.conf +# global settings managed by salt +Include /etc/apache2/global.conf # optional mod_status, mod_info Include /etc/apache2/mod_status.conf