From 57690acd77fe591ac02a2f446d9f1bfaf79271c9 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Fri, 17 Mar 2017 13:13:31 +0100 Subject: [PATCH 1/3] 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 From cc95c7579edd9f94253d84698b9c146c510aec2b Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Fri, 17 Mar 2017 13:16:07 +0100 Subject: [PATCH 2/3] SUSE: typo fixes --- apache/files/Suse/apache-2.4.config.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache/files/Suse/apache-2.4.config.jinja b/apache/files/Suse/apache-2.4.config.jinja index 0abe689..9f72a0a 100644 --- a/apache/files/Suse/apache-2.4.config.jinja +++ b/apache/files/Suse/apache-2.4.config.jinja @@ -3,7 +3,7 @@ # # This is the main Apache server configuration file. It contains the # configuration directives that give the server its instructions. -# See for detailed information about +# See for detailed information about # the directives. # Based upon the default apache configuration file that ships with apache, @@ -193,7 +193,7 @@ Include /etc/apache2/sysconfig.d/include.conf # IP addresses. This is indicated by the asterisks in the directives below. # # Please see the documentation at -# +# # for further details before you try to setup virtual hosts. # # You may use the command line option '-S' to verify your virtual host From 55eac388815deddd6ce6c80f730c7e24dbc6929c Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Fri, 17 Mar 2017 13:49:55 +0100 Subject: [PATCH 3/3] SUSE: fix conf.d location --- apache/map.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache/map.jinja b/apache/map.jinja index 9b69de7..185d688 100644 --- a/apache/map.jinja +++ b/apache/map.jinja @@ -72,7 +72,7 @@ 'mod_fcgid': 'apache2-mod_fcgid', 'vhostdir': '/etc/apache2/vhosts.d', - 'confdir': '/etc/httpd/conf.d', + 'confdir': '/etc/apache2/conf.d', 'confext': '.conf', 'default_site': 'vhost.template', 'default_site_ssl': 'vhost-ssl.template',