Alexander Weidinger
08a21edb73
Actually fix CustomLog default values in templates
2018-01-05 01:30:42 +01:00
Alexander Weidinger
e20189e94a
Revert "Fix CustomLog default values in templates"
...
This reverts commit 429039819d
2018-01-05 00:59:57 +01:00
Niels Abspoel
d979d8a5f3
Merge pull request #206 from saltstack-formulas/fix-customlog-defaults
...
Fix CustomLog default values in templates
2018-01-03 20:35:26 +01:00
Alexander Weidinger
429039819d
Fix CustomLog default values in templates
2018-01-03 02:12:54 +01:00
Wolodja Wentland
147fc0581f
Merge pull request #184 from alxwr/template-security
...
Template security.conf in Debian
2017-12-19 10:24:14 +00:00
emeygret
2142ab99f1
Add RedirectMatch option
...
in pillar add
RedirectMatch: true
2017-12-12 11:35:14 +01:00
Niels Abspoel
9e1b617f11
Merge pull request #204 from tsenay/master
...
Split Logformat and CustomLog Directive to avoid syntax error on RedHat
2017-11-14 20:06:04 +01:00
thomas Senay
5fea96a6a2
Split Logformat and CustomLog Directive to avoid syntax error on RedHat
2017-11-13 10:41:25 +01:00
Niels Abspoel
c86760ee4c
Merge pull request #202 from alexfrosa/master
...
fixed: missing LogFormat
2017-11-05 14:18:57 +01:00
alexfrosa
dca6c1b4a3
Update minimal.tmpl
...
Adapted log format to Apache's new default
2017-11-05 10:44:24 -02:00
Javier Bértoli
e366517ffc
Merge pull request #201 from noelmcloughlin/archlinux
...
ArchLinux support in map.jinja
2017-11-05 09:02:35 -03:00
Niels Abspoel
9898b4fe2f
Merge pull request #191 from alxwr/mod_fastcgi-oscodename
...
mod_fastcgi: use oscodename grain / call for testers
2017-11-04 21:11:48 +01:00
Alex Rosa
0475eef4ad
fixed: missing LogFormat
2017-11-04 16:38:31 -02:00
Noel McLoughin
1434dcc5e9
ArchLinux OS mapping
2017-11-03 16:47:20 +00:00
Niels Abspoel
185b98a38e
Merge pull request #198 from irtnog/enable-custom-mod_ssl-package
...
Add setting that allows deployers to override the default mod_ssl
2017-10-23 20:23:01 +02:00
Matthew X. Economou
1899f2df5e
Add setting that allows deployers to override the default mod_ssl package
...
Other states in this formula allow changing the Apache httpd or module
package on RHEL/CentOS, e.g., one may use packages from the httpd24
SCL to install newer versions than in the base repositories. This
changes the apache.mod_ssl SLS to match them.
2017-10-23 09:35:31 -04:00
Niels Abspoel
72dc03a4e7
Merge pull request #194 from saltstack-formulas/fix-pillar
...
Consolidate duplicate 'Location' stanzas in pillar.example
2017-08-24 22:19:35 +02:00
Noel McLoughlin
a07560a7ea
Consolidate duplicate 'Location' stanzas in pillar.example; SLS Rendering Error fix
2017-08-24 20:58:37 +01:00
Niels Abspoel
1561224dfc
Merge pull request #193 from saltstack-formulas/susefix
...
workaround for #192
2017-08-24 21:44:11 +02:00
Noel McLoughlin
be024a6475
workaround for #192
2017-08-24 11:41:05 +01:00
Alexander Weidinger
ef1c55b45c
mod_fastcgi: use oscodename grain
2017-08-23 11:40:59 +02:00
Niels Abspoel
0b117e522d
Merge pull request #189 from louis-haddrell/develop
...
Replaced use_require with Apache version check (fixes #188 )
2017-08-22 18:01:20 +02:00
Javier Bértoli
72134744bf
Merge pull request #190 from aboe76/apache_modules_suse_support
...
add suse support to apache_modules
2017-08-10 07:15:43 -03:00
Niels Abspoel
9003d2b3ce
update grain check with Suse and SUSE
2017-08-03 21:11:25 +02:00
Niels Abspoel
e5313af81a
add suse support to apache_modules
2017-08-03 16:18:54 +02:00
Javier Bértoli
a61504f900
Merge pull request #185 from aboe76/update_suse_config
...
update suse config file with latest changes
2017-08-02 07:53:14 -03:00
Louis Haddrell
2360d722b6
Replaced use_require with Apache version check ( fixes #188 )
2017-08-02 00:05:18 +01:00
Niels Abspoel
b6dbc87844
Merge pull request #187 from louis-haddrell/master
...
Replaced Apache 2.4 syntax in RedHat Apache 2.2 config (fixes #115 )
2017-08-01 23:20:11 +02:00
Louis Haddrell
7e96ce8d3e
Replaced Apache 2.4 syntax in RedHat Apache 2.2 config ( fixes #115 )
2017-08-01 15:34:06 +01:00
Raphaël Hertzog
1feaf1f392
Add map.jinja data for latest Debian and Ubuntu releases
2017-06-08 16:09:07 +02:00
Niels Abspoel
adea6485ea
update suse config file with latest changes
2017-05-21 23:31:24 +02:00
Alexander Weidinger
5fa91b7b91
Template security.conf in Debian
...
Including optional per-OS templates
(Solves https://github.com/saltstack-formulas/apache-formula/issues/153 )
2017-05-17 07:54:02 +02:00
Alexander Weidinger
c341b92123
Merge branch 'OpenSides-master'
2017-05-17 07:13:40 +02:00
kadogo
69bb7744c8
Correct little error for mod_fastcgi
2017-05-17 06:41:55 +02:00
kadogo
93e1a0a9cd
Update README for new mod (xsendfile, fastcgi, proxy_fcgi)
2017-05-17 06:41:55 +02:00
kadogo
14fa8d8616
Add variables for mod_xsendfile and mod_fastcgi
2017-05-17 06:41:54 +02:00
kadogo
858d012380
Add mod_fastcgi (Debian)
2017-05-17 06:41:54 +02:00
kadogo
d4e45322bf
Add mod_proxy_fcgi (Debian)
2017-05-17 06:41:54 +02:00
kadogo
7495b5fdd8
Add mod_xsenfile (Debian)
2017-05-17 06:41:54 +02:00
Niels Abspoel
34a1050c66
Merge pull request #183 from netmanagers/master
...
Remove duplicated ID (fixes #179 ), added minimal template (fixes #34 )
2017-04-24 22:14:03 +02:00
Javier Bértoli
507b2021f7
Merge pull request #181 from mshade/centos6-osfingermap
...
Correct CentOS 6 osfinger map
2017-04-24 15:40:15 -03:00
Javier Bértoli
a7f66b6344
Move vhostdir to config.sls
2017-04-24 15:33:44 -03:00
Javier Bértoli
ffac9b2381
Added minimal template ( fixes #34 )
2017-04-23 14:38:17 -03:00
Javier Bértoli
9c9050595d
Remove duplicated ID ( fixes #179 )
2017-04-23 14:37:26 -03:00
Mike Shade
9bf72e5d0a
Correct CentOS 6 osfinger map
...
CentOS 6 reports as CentOS-6 rather than CentOS Linux-6 from osfinger grain
2017-04-13 12:41:53 -04:00
Javier Bértoli
cfbf55e3d4
Merge pull request #178 from gwaters/master
...
in RH, vhosts.d doesnt exisit, this makes it
2017-04-12 20:29:13 -03:00
Gary Waters
4da54dd8de
in RH, vhosts.d doesnt exisit, this makes it
2017-04-12 14:45:00 -07:00
Javier Bértoli
919f2a38d2
Merge pull request #176 from porunov/master
...
Clear uncomment state of mod_wsgi config
2017-04-06 12:18:18 -03:00
Oleksandr Porunov
ee6b910302
Format mod_wsgi state
2017-04-06 15:11:32 +03:00
Oleksandr Porunov
7ac28f42f9
Clear uncomment state of mod_wsgi config
2017-04-06 15:03:37 +03:00
