Commit Graph

588 Commits

Author SHA1 Message Date
Frederic Crozat
af0c009f7b ensure php5 module is enabled on openSUSE / SLE 2017-01-22 22:50:33 +01:00
nigelsim
936f20b559 added Amazon Linux 2016 (#162) 2016-11-12 15:29:50 -08:00
dexbleeker
bf66e749d1 Append slash to RedirectTarget (#161) 2016-10-18 12:48:59 -07:00
Niels Abspoel
1c20ce5f70 add modsecurity rules state 2016-09-23 11:12:37 +02:00
Niels Abspoel
ffec46e8d5 Merge pull request #149 from dexbleeker/master
Add user-defined envvars
2016-09-15 17:11:10 +02:00
srse
45c1e98dff Added gentoo defaults to map.jinja (#155) 2016-08-25 09:08:26 -07:00
John Kristensen
10ae336f12 Correct ProxyPassTarget default for ProxyPassReverseTarget (#154)
According to the pillar.example file there is no site.ProxyPassTarget,
so ProxyPassReverseTarget should default to proxyargs.ProxyPassTarget
(ie. site.ProxyRoute.ProxyPassTarget)
2016-08-02 21:29:53 -07:00
Jeremy T. Bouse
be3215f0cd Update Debian mpm_prefork.conf to include ServerLimit (#152)
If MaxRequestWorkers is greater than 256 than you also need to set the
ServerLimit value which is defaulted to 256 but has a 20000 hard maximum
2016-07-29 10:19:46 -07:00
Rob Ruma
d5337836b2 Adding exclude_listen_directive option (#151)
* Adding exclude_listen_directive option

* Updating Debian config
2016-07-20 19:19:39 -07:00
Dex Bleeker
7b7deaeb5b Add user-defined envvars 2016-07-16 17:21:46 +02:00
Nitin Madhok
adc80edd39 Merge pull request #146 from rhertzog/fix-vhost
Do not force usage of apache.config in apache.vhosts.standard
2016-06-30 18:13:31 +02: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
Raphaël Hertzog
4fa9d57d2b Do not force usage of apache.config in apache.vhosts.standard
In 4d04d95b02 (#113)
apache/vhosts/standard.sls has been modified by @genuss to include
apache.config on the basis that apache.config was now able to retrieve the
interfaces/ports from pillar data in apache:sites.

I use apache:sites to register virtual hosts with non-standard
"template_file" (they contain the desired configuration directly)
and the "interface/port" keys are thus not meaningful.

apache:
  sites:
    example.com:
      template_file: salt://vm/example/apache-vhost.conf
      DocumentRoot: False

The generated ports.conf ends up containing only "*:80" while
my virtual host configuration files need ports 80 and 443. The
situation was perfectly fine up to now because the default configuration
file handles both of those ports if you have mod_ssl installed.

People who want to use apache.config should just explicitly include
that state, we should not force its usage to all apache.vhosts.standard
users.
2016-06-21 17:39:35 +02:00
Martin Jackson
6382785cc9 Add proxyrequests directive (#144)
* Add ProxyRequests directive

This allows or prevents Apache httpd from functioning as a forward proxy server.
[See](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests).
The default action is off so I've set this a the default for this formula so it does not change the default behaviour.

* Add example pillar usage
2016-05-24 10:10:01 -07:00
mschiff
33170b1dce Add '-f' option to a2dismod to fix hanging minions for some modules (#143) 2016-05-23 23:49:03 -07:00
Martin Jackson
b1640f4f3d [#141] Support additional options for Proxypass (#142)
* Add support for proxy pass target options

* Add example usage
2016-05-23 10:32:12 -07:00
Wolodja Wentland
eaffddb0d0 Merge pull request #140 from Nytoca/patch-1
Proper disabling of the default vhost
2016-05-18 21:51:59 +02:00
Forrest
23f4e68e6a Merge pull request #139 from tibberg/master
enable mod_ssl on Redhat
2016-05-18 11:12:10 -07:00
Philipp Marmet
01c9ca4a56 use default style for cmd.run: instead of cmd: - run 2016-05-18 17:08:22 +02:00
Philipp Marmet
df5edcd8a2 Proper disabling of the default vhost
Removing the file /etc/apache2/sites-available/000-default.conf leads to an error when Apache is restarted.
So the symlink in /etc/apache2/sites-enabled/ should be removed, the actual file can stay.
2016-05-18 13:01:05 +02:00
Tibor Gemes
98e9c00661 enable mod_ssl on Redhat 2016-05-18 10:07:24 +02:00
Forrest
c9344cf81c Merge pull request #138 from tibberg/master
Add custom port to RedHat config
2016-05-17 11:45:54 -07:00
Tibor Gemes
c7e23edf52 Add custom port to RedHat config 2016-05-17 18:59:01 +02:00
Forrest
f2f5ae553d Merge pull request #137 from netmanagers/master
Add mod_security management
2016-05-12 11:23:03 -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
Forrest
4567cc3870 Merge pull request #136 from abehling/master
RedHat: Added configurable variables, Fixed bug if vhostdir is something diff…
2016-05-10 09:51:47 -07:00
Alexander Behling
3232866cc2 Added configurable variables, Fixed bug if vhostdir is something different than default value 2016-05-10 11:49:41 +02:00
Wolodja Wentland
fa60741615 Merge pull request #133 from inventage/master
Add support for name based virtual hosts
2016-04-18 12:52:33 +02:00
Dominik Menzi
d1c3463154 Add support for NameVirtualHost on Debian 2016-04-15 09:08:14 +02:00
Forrest
0297392713 Merge pull request #134 from dexbleeker/master
rename no_default to no_default_vhost (matching README.md)
2016-04-13 10:57:59 -07:00
Dex Bleeker
653e445e00 rename no_default to no_default_vhost (matching README.md) 2016-04-13 17:20:58 +02:00
Wolodja Wentland
6ae0056d10 Merge pull request #132 from inventage/precise-support
Add support for Ubuntu 12.04
2016-04-13 15:19:38 +02:00
Dominik Menzi
16888bd927 Add support for Ubuntu precise 2016-04-13 13:32:42 +02:00
Forrest
68884e1705 Merge pull request #131 from Dextro/fix-pillar-example-option
fix Options in pillar.example
2016-04-12 09:27:31 -07:00
Bert Pattyn
5fc1dc710b fix Options in pillar.example 2016-04-12 15:01:07 +02:00
puneet kandhari
f0978a9c47 Pull Request Template 2016-04-11 09:59:39 -05:00
puneet kandhari
575f3debe6 Merge pull request #129 from fintanmm/master
Fixed directory typo for logrotate in pagespeed mod.
2016-04-11 09:58:03 -05:00
Fintan MacMahon
51b5acb151 Fixed directory typo for logrotate 2016-04-11 15:54:04 +01:00
Wolodja Wentland
ff8e539882 Merge pull request #127 from nilsglow/master
fix line feed suppression in standard.tmpl
2016-04-11 10:14:48 +02:00
Nils Kalchhauser
fa291e289a fix line feed suppression in standard.tmpl 2016-04-10 22:17:44 +02:00
Forrest
9f7b7f1941 Merge pull request #126 from artmoni/br_ssl
#125 activate ssl module
2016-04-07 11:28:46 -07:00
sebastien.fleury
55c5bf598b #125 activate ssl module 2016-04-07 12:02:13 +02:00
Forrest
ba0ba8686f Merge pull request #119 from opdude/hotfix/require-new-line
Fixed a bug where the Require parameter would be on the same line as …
2016-02-18 11:45:12 -08:00
Wolodja Wentland
c35f25e0cc Merge pull request #117 from opdude/feature/remove-vhost
Added the ability to remove the vhost file from debian
2016-02-18 19:53:41 +01:00
Daniel Hobley
9b8932b267 Fixed a bug where the Require parameter would be on the same line as location
- This is then ignored by Apache
2016-02-18 16:24:35 +01:00
Daniel Hobley
e281a7ba82 Added Timeout and LimitRequestsFields to vhosts 2016-02-18 16:22:22 +01:00
Daniel Hobley
2a84daf248 Added the ability to remove the vhost file from debian 2016-02-18 16:19:11 +01:00
Forrest
2320295d09 Merge pull request #113 from genuss/fix_listen
Manage ports.conf file properly
2016-02-01 10:58:02 -08:00
a.genus
4d04d95b02 Manage ports.conf file on Debian 2016-02-01 19:03:47 +03:00