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

Merge pull request #168 from bmwiedemann/suse

Browse Source 
fixes in SUSE support
This commit is contained in:
alxwr 2017-03-28 17:01:46 +02:00 committed by GitHub
commit 7d5e588b6e
3 changed files with 7 additions and 7 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:

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

@ -3,7 +3,7 @@
# #
# This is the main Apache server configuration file. It contains the # This is the main Apache server configuration file. It contains the
# configuration directives that give the server its instructions. # configuration directives that give the server its instructions.
# See <URL:http:///httpd.apache.org/docs/2.4/> for detailed information about # See <URL:http://httpd.apache.org/docs/2.4/> for detailed information about
# the directives. # the directives.
# Based upon the default apache configuration file that ships with apache, # Based upon the default apache configuration file that ships with apache,
@ -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
@ -193,7 +193,7 @@ Include /etc/apache2/sysconfig.d/include.conf
# IP addresses. This is indicated by the asterisks in the directives below. # IP addresses. This is indicated by the asterisks in the directives below.
# #
# Please see the documentation at # Please see the documentation at
# <URL:http:///httpd.apache.org/docs/2.4/vhosts/> # <URL:http://httpd.apache.org/docs/2.4/vhosts/>
# for further details before you try to setup virtual hosts. # for further details before you try to setup virtual hosts.
# #
# You may use the command line option '-S' to verify your virtual host # You may use the command line option '-S' to verify your virtual host

2
apache/map.jinja
View File

@ -72,7 +72,7 @@
'mod_fcgid': 'apache2-mod_fcgid', 'mod_fcgid': 'apache2-mod_fcgid',
'vhostdir': '/etc/apache2/vhosts.d', 'vhostdir': '/etc/apache2/vhosts.d',
'confdir': '/etc/httpd/conf.d', 'confdir': '/etc/apache2/conf.d',
'confext': '.conf', 'confext': '.conf',
'default_site': 'vhost.template', 'default_site': 'vhost.template',
'default_site_ssl': 'vhost-ssl.template', 'default_site_ssl': 'vhost-ssl.template',