Niels Abspoel
|
32f92e8acd
|
Merge pull request #227 from ze42/geoip_debian
geoip: Debian support
|
2018-08-17 19:39:16 +02:00 |
|
Niels Abspoel
|
03de980860
|
Merge pull request #230 from ze42/docroot_owner
vhosts/standard: allow to set docroot ownership
|
2018-08-17 19:38:18 +02:00 |
|
Niels Abspoel
|
00b437aa27
|
Merge pull request #232 from ze42/vhosts_cleanup
vhosts/cleanup: clean non-salted sites
|
2018-08-17 19:36:30 +02:00 |
|
Javier Bértoli
|
760cadebc3
|
Merge pull request #233 from alxwr/master
Create Apache's logdir if necessary
|
2018-08-17 10:42:55 -03:00 |
|
Alexander Weidinger
|
33e1302a12
|
Create Apache's logdir if necessary
|
2018-08-15 02:01:40 +02:00 |
|
Adrien "ze" Urban
|
fdaa62d7a9
|
vhosts/cleanup: clean non-salted sites
Makes it easier to clean any unwanted sites
|
2018-07-03 11:44:24 +02:00 |
|
Adrien "ze" Urban
|
37f8af4b3a
|
vhosts/standard: rewrite, simplify code
* No more if.
* Allow lookup to set default value for all docroot
* updated pillar.example
|
2018-06-28 15:28:03 +02:00 |
|
Adrien "ze" Urban
|
2bae6fea10
|
vhosts/standard: fix set user/group
unless test -d on file.directory seems useless.
|
2018-06-28 10:20:33 +02:00 |
|
Adrien "ze" Urban
|
5211bdd72b
|
vhosts/standard: allow user/group option
Support for DocumentRootUser and DocumentRootGroup
|
2018-06-28 10:20:33 +02:00 |
|
Javier Bértoli
|
dc46bc8340
|
Merge pull request #224 from arthurlogilab/fix-fcgid-redhat
Fix fcgid redhat
|
2018-06-27 14:32:40 -03:00 |
|
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
|
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 |
|