Commit Graph

638 Commits

Author SHA1 Message Date
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
Bernhard M. Wiedemann
57690acd77 SUSE: use different global.conf
sysconfig.d/global.conf is re-written by sysconfig on openSUSE
2017-03-17 13:16:01 +01:00
Patrick Chevalley
780bf3158d Add Reverse Proxy directives, GeoIP, Certificates management, mostly for RedHat 2017-03-09 12:44:32 +01:00
Alexander Weidinger
3f3e734cd7 mod_proxy_http: include mod_proxy in all OSs 2017-02-20 20:09:25 +01:00
Niels Abspoel
68ca8eb9de Merge pull request #164 from fcrozat/suse
ensure php5 module is enabled on openSUSE / SLE
2017-02-06 16:54:10 +01:00
alxwr
7fd57d228f Merge pull request #158 from alxwr/freebsd-support
FreeBSD support
2017-02-02 09:41:33 +01:00
Alexander Weidinger
6e880d0827 FreeBSD: mod_cgi 2017-02-01 23:50:03 +01:00
Alexander Weidinger
e1c55b9475 FreeBSD: apache.mod_proxy_http 2017-02-01 23:50:03 +01:00
Alexander Weidinger
0590e43973 FreeBSD: apache.manage_security 2017-02-01 23:50:03 +01:00
Alexander Weidinger
9f796f0b6a apache.global for Debian and FreeBSD 2017-02-01 23:50:03 +01:00
Alexander Weidinger
f03df6e2fb FreeBSD: mod_rewrite 2017-02-01 23:50:03 +01:00
Alexander Weidinger
5dbe687cda FreeBSD: mod_perl2 2017-02-01 23:50:03 +01:00
Alexander Weidinger
4e12b404a4 FreeBSD: mod_suexec 2017-02-01 23:50:03 +01:00
Alexander Weidinger
bc81c6ab43 FreeBSD: mod_proxy 2017-02-01 23:50:03 +01:00
Alexander Weidinger
9e3645c53c FreeBSD: made default SSL key configurable 2017-02-01 23:50:03 +01:00
Alexander Weidinger
4d94109534 FreeBSD: set correct env vars 2017-02-01 23:50:03 +01:00
Alexander Weidinger
327f86db91 FreeBSD: confdir: extra/ 2017-02-01 23:50:03 +01:00
Alexander Weidinger
385a120590 FreeBSD: envvars 2017-02-01 23:50:03 +01:00
Alexander Weidinger
9a1fb054d6 mod_php5: FreeBSD 2017-02-01 23:50:03 +01:00
Alexander Weidinger
5d27226001 FreeBSD: global DocumentRoot 2017-02-01 23:50:03 +01:00
Alexander Weidinger
c7e533d7e5 mod_ssl: FreeBSD support 2017-02-01 23:50:03 +01:00
Alexander Weidinger
a64ee209cb FreeBSD support 2017-02-01 23:48:25 +01:00
alxwr
6d2ebe27db Merge pull request #157 from webscale-formulas/mod_security_rules
add modsecurity rules state
2017-02-01 23:47:14 +01:00
Alexander Weidinger
cc9d81c3b1 Made Timeout optional 2017-02-01 23:39:29 +01:00
alxwr
217b6caa64 Merge pull request #118 from opdude/feature/add-fields
Added Timeout and LimitRequestsFields to vhosts
2017-02-01 23:12:13 +01:00