Adrien "ze" Urban
0ed8f9a94b
DocumentRoot: fallback to SiteName like templates
Templates already fallback to SiteName before site id.
This attemps to be consistent with them, and avoid having to explicitly specify
the DocumentRoot, when the template already does the proper inference.
6 年前
Adrien "ze" Urban
4e15435ef4
geoip: Debian support
6 年前
Arthur Lutz
d7e212d904
[apache/map.jinja] add RedHat fcgid package name
6 年前
N
da543013f4
Merge pull request #222 from noelmcloughlin/FixFastCgi
Fix mod_fastcgi, mod_php5, and pkgrepo states
6 年前
N
7e66b260e4
Merge pull request #220 from noelmcloughlin/issue122
Do not add ServerAlias unless defined
6 年前
N
7e0d861e0c
Merge pull request #223 from aboe76/python3_support
replace iteritems with items
6 年前
Niels Abspoel
fe9407df47
replace iteritems with items
6 年前
noelmcloughlin
2c21dc0df6
Fix mod_fastcgi state/repo
7 年前
N
f1514dab84
Merge pull request #205 from emeygret/patch-1
Add RedirectMatch option
7 年前
Niels Abspoel
142fb59bb1
Merge pull request #221 from netmanagers/master
Added "Managed by Salt..." headers in templates
7 年前
Javier Bértoli
fcb434e248
Added "Managed by Salt..." headers in template and made them unifom across the formula
7 年前
Javier Bértoli
6de9dd885d
Merge pull request #219 from arthurlogilab/217-customlog
[apache/vhosts] fix CustomLog on standard template
7 年前
Noel McLoughin
147aa71551
Do not add ServerAlias unless defined
7 年前
Niels Abspoel
48bab96af6
Merge pull request #212 from noelmcloughlin/issue186_travis
Updated Travis/Kitchen tests
7 年前
Arthur Lutz
fd23f29cf8
Merge branch 'master' into 217-customlog
7 年前
Arthur Lutz
1ebee8bc07
[apache/vhosts] fix CustomLog on standard template
7 年前
Noel McLoughin
853ec8e118
Allow Skipping of service manipulation via pillar (+PR comments)
7 年前
Niels Abspoel
7d46830814
Merge pull request #216 from emeygret/patch-2
pillar exemple for RedirectMatch directive
7 年前
emeygret
55c6010bde
pillar exemple for RedirectMatch directive
7 年前
Niels Abspoel
57b2c5d1aa
Merge pull request #215 from arthurlogilab/patch-1
Fix conflict ID #214
7 年前
Arthur Lutz
1b5e13a36c
Fix conflict ID #214
7 年前
Javier Bértoli
c6018aeac1
Merge pull request #211 from saltstack-formulas/manage-tls-defaults
Manage tls defaults
7 年前
Noel McLoughin
9e4ad5566e
Add kitchen/travis tests
7 年前
Noel McLoughin
77a7cbf228
Allow Skipping of service manipulation via pillar (+PR comments)
7 年前
Alexander Weidinger
d3110f93f6
Manage TLS defaults
7 年前
Alexander Weidinger
9de2372789
map.jinja: corrected Debian's confdir
7 年前
Alexander Weidinger
cbc9ad29dc
map.jinja: corrected FreeBSD defaults
(We were only supporting 2.4 anyway.)
7 年前
Niels Abspoel
06e2cee88a
Merge pull request #210 from louis-haddrell/develop
Replace apache.conf_mod_wsgi if statement syntax (fixes #209 )
7 年前
Louis Haddrell
ac071586e0
Replace apache.conf_mod_wsgi if statement syntax ( fixes #209 )
7 年前
Niels Abspoel
ab8535cb19
Merge pull request #208 from saltstack-formulas/fix-custom-log-2
Fix CustomLog default values in templates – 2nd edition
7 年前
Alexander Weidinger
08a21edb73
Actually fix CustomLog default values in templates
7 年前
Alexander Weidinger
e20189e94a
Revert "Fix CustomLog default values in templates"
This reverts commit 429039819d
.
7 年前
Niels Abspoel
d979d8a5f3
Merge pull request #206 from saltstack-formulas/fix-customlog-defaults
Fix CustomLog default values in templates
7 年前
Alexander Weidinger
429039819d
Fix CustomLog default values in templates
7 年前
Wolodja Wentland
147fc0581f
Merge pull request #184 from alxwr/template-security
Template security.conf in Debian
7 年前
emeygret
2142ab99f1
Add RedirectMatch option
in pillar add
RedirectMatch: true
7 年前
Niels Abspoel
9e1b617f11
Merge pull request #204 from tsenay/master
Split Logformat and CustomLog Directive to avoid syntax error on RedHat
7 年前
thomas Senay
5fea96a6a2
Split Logformat and CustomLog Directive to avoid syntax error on RedHat
7 年前
Niels Abspoel
c86760ee4c
Merge pull request #202 from alexfrosa/master
fixed: missing LogFormat
7 年前
alexfrosa
dca6c1b4a3
Update minimal.tmpl
Adapted log format to Apache's new default
7 年前
Javier Bértoli
e366517ffc
Merge pull request #201 from noelmcloughlin/archlinux
ArchLinux support in map.jinja
7 年前
Niels Abspoel
9898b4fe2f
Merge pull request #191 from alxwr/mod_fastcgi-oscodename
mod_fastcgi: use oscodename grain / call for testers
7 年前
Alex Rosa
0475eef4ad
fixed: missing LogFormat
7 年前
Noel McLoughin
1434dcc5e9
ArchLinux OS mapping
7 年前
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
7 年前
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.
7 年前
Niels Abspoel
72dc03a4e7
Merge pull request #194 from saltstack-formulas/fix-pillar
Consolidate duplicate 'Location' stanzas in pillar.example
7 年前
Noel McLoughlin
a07560a7ea
Consolidate duplicate 'Location' stanzas in pillar.example; SLS Rendering Error fix
7 年前
Niels Abspoel
1561224dfc
Merge pull request #193 from saltstack-formulas/susefix
workaround for #192
7 年前
Noel McLoughlin
be024a6475
workaround for #192
7 年前