Commit Graph

52 Commits

Author SHA1 Message Date
Andreas Thienemann
4ed6e228f5 Improve document root fix for Red Hat (#241)
The docroot fix from PR#240 worked fine for default servers.
But as soon as one uses vhosts this broke as the vhosts were
created under the docroot in /var/www/html rather than the better
/var/www.

Fix this by differentiating between docroot and wwwdir.
Further allow to override both in Red Hat-style configs.
The override allows to reuse this formula for the softwarecollections
rpms.
2018-10-27 15:21:51 +02:00
Andreas Thienemann
eca4daf767 Fix DocumentRoot on Red Hat
The current docroot ist set to /var/www. This is incorrect.
Fix with correct value /var/www/html.
2018-10-10 19:01:49 +02:00
ardin
7bac5c7c30 mod_mpm for RedHat (#160) 2018-08-17 19:42:45 +02:00
Niels Abspoel
32f92e8acd
Merge pull request #227 from ze42/geoip_debian
geoip: Debian support
2018-08-17 19:39:16 +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
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
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
Noel McLoughin
1434dcc5e9 ArchLinux OS mapping 2017-11-03 16:47:20 +00: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
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
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
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
kadogo
14fa8d8616 Add variables for mod_xsendfile and mod_fastcgi 2017-05-17 06:41:54 +02:00
Oleksandr Porunov
7ac28f42f9 Clear uncomment state of mod_wsgi config 2017-04-06 15:03:37 +03:00
Javier Bértoli
475fb8347e Add default user/group attributes as required by some states 2017-03-29 07:42:27 -03:00
Bernhard M. Wiedemann
55eac38881 SUSE: fix conf.d location 2017-03-17 13:49:55 +01:00
Alexander Weidinger
5dbe687cda FreeBSD: mod_perl2 2017-02-01 23:50:03 +01:00
Alexander Weidinger
327f86db91 FreeBSD: confdir: extra/ 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
srse
45c1e98dff Added gentoo defaults to map.jinja (#155) 2016-08-25 09:08:26 -07:00
abehling
9aca4c35b7 RedHat: Made AddDefaultCharset Directive configurable (#147)
* RedHat: Made AddDefaultCharset Directive configurable

* Added description of apache:lookup:default_charset to pillar.example, sane default equals former hardcoded UTF-8
2016-06-29 09:18:30 -07:00
Kenneth Østrup
61439a60a8 Set use_require on Ubuntu 16.04 (Xenial Xerus) with Apache 2.4 (#148) 2016-06-28 09:36:33 -07:00
Javier Bértoli
2be52db8b8 Add mod_security management
Add gitignore, kitchen-ci files
Add some tests and documentation
2016-05-11 15:41:07 -03:00
Dominik Menzi
16888bd927 Add support for Ubuntu precise 2016-04-13 13:32:42 +02:00
a.genus
4d04d95b02 Manage ports.conf file on Debian 2016-02-01 19:03:47 +03:00
Bogdan Radulescu
ee1208d5c7 Improove the logrotate state with the map 2016-01-07 19:02:00 +00:00
Adrien Bréfort
9e9d6ba4ba Add support for Ubuntu 15.04 and 15.10 in map.jinja. 2015-11-22 12:11:14 +01:00
Carlo Vollebregt
a3885e6d69 Added installation support for mod_pagespeed on RedHat 2015-11-19 22:04:03 +01:00
Brad Thurber
e5c1209433 This branch is foundational for further version-specific work to come.
* Add apache version (2.2, 2.4) detection based on osfinger (defaults to 2.4).
* Version can be overridden in pillar (for Apache 2.4 on RHEL 6 for example)
2015-08-26 08:49:43 -04:00
Krzysztof Pawłowski
b6fe515ed8 RedHat fixes: change default vhostdir to redhat official default /etc/httpd/vhosts.d, add state for ensuring that vhostdir exists, include vhosts.d/*.conf in httpd.conf 2015-07-22 14:36:25 +02:00
Krzysztof Pawłowski
0d7b149fd5 Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat. 2015-07-22 10:13:38 +02:00
Forrest
b839a7e30b Revert "corrected the key to match the pillar.example" 2015-06-23 10:30:16 -07:00
Papoyan, Nerses
023c2873b1 corrected the key to match the pillar.example 2015-06-23 11:35:55 -04:00
Niels Abspoel
53b995a680 Improved apache-formula
- Added more modules and configuration options
 - Renamed sls files to reflect what they do.
 - added mpm options for Debian
2015-06-19 20:44:53 +02:00
Elias Probst
1a1104fe80 Set 'confext' for Debian systems. 2015-04-17 14:39:57 +02:00
Raphaël Hertzog
5dc9d42ea6 Update map.ninja to rely on oscodename grain instead of lsb_distrib_release
This is more reliable than version numbers which might change with point
releases (in particular for Debian Jessie) and is more likely to not
conflict between multiple OS.
2015-03-11 20:43:18 +01:00
Niels Abspoel
9cd070302f Added basic opensuse support 2015-03-08 22:12:36 +01:00
Cory Wright
eb15c0753a Update map.jinja
Fix typo: `user_require` -> `use_require`
2015-03-04 17:39:15 -05:00
Niels Abspoel
3ab160bad2 updated map.jinja debian 8.0 settings 2015-01-10 16:18:59 +01:00
Adrien Bréfort
67e12a8bc2 Fixed Apache 2.4 support and added support for Ubuntu 14.10.
Replace require_all with use_require in map.jinja, we want to be able
to use custom Require values.

Remove uneeded Directory in standard.tmpl and add conditional and
default value for Require.

Fix bad filenames in standard.sls
2014-10-28 15:13:13 +01:00
Berry Langerak
b8fe242d35 Adding support for Apache 2.4 on Ubuntu 14.04
- Adding confext to virtualhost names.
- Renaming the default config file for Ubuntu (000-default.conf).
- Adding ability to use "Require all granted".
2014-10-01 10:35:53 +02:00
Adam Herzog
1888584b94 Add config file extension (confext) to parameter map. 2014-02-09 09:11:55 -05:00
Christer Edwards
36051f4353 removed unneeded wsgi_path 2014-01-29 19:14:50 -07:00