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
Oleksandr Porunov
0cbf64209d
Add info about uninstall state
2017-04-05 11:18:21 +02:00
Oleksandr Porunov
c28a1097e3
Fix wsgi.conf uncomment for RedHat based OS
2017-04-05 10:42:06 +02:00
Oleksandr Porunov
0b37a14035
Fix: wsgi.conf file not found
2017-04-05 00:34:49 +02:00
Javier Bértoli
475fb8347e
Add default user/group attributes as required by some states
2017-03-29 07:42:27 -03:00
alxwr
7d5e588b6e
Merge pull request #168 from bmwiedemann/suse
...
fixes in SUSE support
2017-03-28 17:01:46 +02:00
alxwr
0e670f47df
Merge pull request #170 from bmwiedemann/fix2
...
fix standard.tmpl
2017-03-28 16:36:14 +02:00
alxwr
7f6179365e
Merge pull request #171 from porunov/master
...
Add uninstall state
2017-03-28 16:28:01 +02:00
alxwr
b003b82249
Merge pull request #169 from bmwiedemann/fix1
...
drop %O from default LogFormat
2017-03-28 16:24:06 +02:00
alxwr
8540ce92f6
Merge pull request #167 from isntall/mod_remoteip_conf
...
[+] debian apache2 needs to have conf enabled when making this change
2017-03-28 16:17:28 +02:00
alxwr
1a0776f3a1
Merge pull request #166 from warswe/add-features
...
Add Reverse Proxy directives, GeoIP, Certificates management
2017-03-28 16:15:40 +02:00
Oleksandr Porunov
aba648965f
Add a new line into uninstall state
2017-03-28 16:26:52 +03:00
Oleksandr Porunov
58e968916e
Add uninstall state
2017-03-28 16:15:44 +03:00
Bernhard M. Wiedemann
f25d7707cf
fix standard.tmpl
...
with salt-ssh-2016.11.3 it errored out with
TemplateNotFound: apache/map.jinja
and we were already passing in the 'apache' data as 'map'
from standard.sls
2017-03-20 17:10:22 +01:00
Bernhard M. Wiedemann
81a25d9467
drop %O from default LogFormat
...
because it requires mod_logio to be enabled
2017-03-20 17:09:58 +01:00
Archie Brentano
f80a06260b
[+] debian apache2 needs to have conf enabled when making this change
2017-03-17 09:03:26 -07:00
Bernhard M. Wiedemann
55eac38881
SUSE: fix conf.d location
2017-03-17 13:49:55 +01:00
Bernhard M. Wiedemann
cc95c7579e
SUSE: typo fixes
2017-03-17 13:16:07 +01:00