saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
461 Commits 6 Branches 31 Tags 1.8 MiB
f4045efeff
Commit Graph

461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Javier Bértoli
4e73a80b62
Merge pull request #229 from ze42/manage_security_file_presence 
manage_security: fix file presence detection
 2018-06-27 14:29:09 -03:00
Adrien "ze" Urban
76f05dda8e manage_security: fix file presence detection 
Detect runtime, rather than before starting/installing anything.
 2018-06-07 14:52:57 +02:00
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.
 2018-05-22 15:23:11 +02:00
Adrien "ze" Urban
4e15435ef4 geoip: Debian support 2018-05-22 15:20:50 +02:00
Arthur Lutz
d7e212d904 [apache/map.jinja] add RedHat fcgid package name 2018-03-23 13:39:02 +01:00
N
da543013f4
Merge pull request #222 from noelmcloughlin/FixFastCgi 
Fix mod_fastcgi, mod_php5, and pkgrepo states
 2018-03-15 10:47:14 +00:00
N
7e66b260e4
Merge pull request #220 from noelmcloughlin/issue122 
Do not add ServerAlias unless defined
 2018-03-15 10:46:55 +00:00
N
7e0d861e0c
Merge pull request #223 from aboe76/python3_support 
replace iteritems with items
 2018-03-07 20:11:13 +00:00
Niels Abspoel
fe9407df47 replace iteritems with items 2018-03-07 21:05:22 +01:00
noelmcloughlin
2c21dc0df6 Fix mod_fastcgi state/repo 2018-02-14 21:01:43 +00:00
N
f1514dab84
Merge pull request #205 from emeygret/patch-1 
Add RedirectMatch option
 2018-02-05 12:06:51 +00:00
Niels Abspoel
142fb59bb1
Merge pull request #221 from netmanagers/master 
Added "Managed by Salt..." headers in templates
 2018-02-04 14:42:00 +01:00
Javier Bértoli
fcb434e248 Added "Managed by Salt..." headers in template and made them unifom across the formula 2018-02-04 10:26:40 -03:00
Javier Bértoli
6de9dd885d
Merge pull request #219 from arthurlogilab/217-customlog 
[apache/vhosts] fix CustomLog on standard template
 2018-01-31 07:21:34 -03:00
Noel McLoughin
147aa71551 Do not add ServerAlias unless defined 2018-01-30 23:20:25 +00:00
Niels Abspoel
48bab96af6
Merge pull request #212 from noelmcloughlin/issue186_travis 
Updated Travis/Kitchen tests
 2018-01-30 23:05:43 +01:00
Arthur Lutz
fd23f29cf8
Merge branch 'master' into 217-customlog 2018-01-30 14:24:16 +01:00
Arthur Lutz
1ebee8bc07 [apache/vhosts] fix CustomLog on standard template 2018-01-30 14:13:12 +01:00
Noel McLoughin
853ec8e118 Allow Skipping of service manipulation via pillar (+PR comments) 2018-01-30 14:10:01 +01:00
Niels Abspoel
7d46830814
Merge pull request #216 from emeygret/patch-2 
pillar exemple for RedirectMatch directive
 2018-01-17 20:01:23 +01:00
emeygret
55c6010bde
pillar exemple for RedirectMatch directive 2018-01-17 08:36:03 +01:00
Niels Abspoel
57b2c5d1aa
Merge pull request #215 from arthurlogilab/patch-1 
Fix conflict ID #214
 2018-01-16 21:06:47 +01:00
Arthur Lutz
1b5e13a36c
Fix conflict ID #214 2018-01-16 10:04:16 +01:00
Javier Bértoli
c6018aeac1
Merge pull request #211 from saltstack-formulas/manage-tls-defaults 
Manage tls defaults
 2018-01-14 19:34:37 -03:00
Noel McLoughin
9e4ad5566e Add kitchen/travis tests 2018-01-11 23:38:18 +00:00
Noel McLoughin
77a7cbf228 Allow Skipping of service manipulation via pillar (+PR comments) 2018-01-11 21:57:28 +00:00
Alexander Weidinger
d3110f93f6 Manage TLS defaults 2018-01-10 01:24:17 +01:00
Alexander Weidinger
9de2372789 map.jinja: corrected Debian's confdir 2018-01-09 23:38:47 +01:00
Alexander Weidinger
cbc9ad29dc map.jinja: corrected FreeBSD defaults 
(We were only supporting 2.4 anyway.)
 2018-01-09 22:12:31 +01:00
Niels Abspoel
06e2cee88a
Merge pull request #210 from louis-haddrell/develop 
Replace apache.conf_mod_wsgi if statement syntax (fixes #209)
 2018-01-05 15:32:58 +01:00
Louis Haddrell
ac071586e0 Replace apache.conf_mod_wsgi if statement syntax (fixes #209) 2018-01-05 13:26:06 +00:00
Niels Abspoel
ab8535cb19
Merge pull request #208 from saltstack-formulas/fix-custom-log-2 
Fix CustomLog default values in templates – 2nd edition
 2018-01-05 10:19:14 +01:00
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