Commit Graph

261 Commits

Author SHA1 Message Date
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
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
a.genus
ba6679ef66 Remove breaking changes 2016-02-01 19:01:02 +03:00
Forrest
c5987510b7 Merge pull request #111 from mchugh19/master
Cleanup whitespace in generated vhosts
2016-01-31 15:38:45 -08:00
Christian McHugh
f8d90931f8 Cleanup whitespace in generated vhosts
Correct handling of allow encoded slashes
2016-01-31 16:35:29 -06:00
Forrest
308e05f72f Merge pull request #110 from douardda/allow-several-interfaces
Allow to configure several interfaces for a vhost.
2016-01-25 12:21:09 -08:00
David Douard
f01c72c637 Allow to configure several interfaces for a vhost.
This is done by split the interface pillar value instead of using a proper
list so it behaves exactly the same as before for simple 1 interface cases
(no need to refactor one's pillar files).

The resulting is something like:

  Listen 1.2.3.4:80
  Listen [2001🔤def💯:3]:80

  <VirtualHost 1.2.3.4:80 [2001🔤def💯:3]:80>
  ...
2016-01-25 12:25:29 +01:00
Forrest
ef10de6a57 Merge pull request #109 from cybacolt/master
allow AllowEncodedSlashes directive in vhosts.
2016-01-19 21:23:40 -08:00
Rowcliffe Browne
4987f3d556 allow AllowEncodedSlashes directive in vhosts.
Apache2 docs state this is global, but vhost overrides it even when not specified.

additionally, this directive is defaulted differently across distributions (eg. CentOS is default 'On')

this change allows control of the directive.
2016-01-20 12:17:41 +08:00
Forrest
2ff245c230 Merge pull request #108 from cybacolt/master
Allow global directives to be added to apache config
2016-01-19 01:07:43 -08:00
Rowcliffe Browne
2557d3d1c8 Allow global directives to be added to apache config 2016-01-19 17:02:31 +08:00
puneet kandhari
e10b2f59d1 Merge pull request #107 from cloud-hero/master
Added state for configuring logrotate
2016-01-07 13:33:27 -06:00
Bogdan Radulescu
ee1208d5c7 Improove the logrotate state with the map 2016-01-07 19:02:00 +00:00
Bogdan Radulescu
d7b28dd4fb Added state for configuring logrotate 2016-01-07 20:03:10 +02:00
michaelforge
8f21cf5572 Fixed typo in README, follow-up to f7940ecdc 2015-12-29 20:08:39 +03:00
Forrest
9ade6b3de8 Merge pull request #104 from genuss/mod_dav_svn
Add mod_dav_svn support
2015-12-24 13:12:43 -08:00
Forrest
6f20861b9a Merge pull request #106 from genuss/conf_ports
Configure listen directive
2015-12-24 13:10:25 -08:00
a.genus
5d03deb3b5 Remove ports.conf inclusion 2015-12-24 16:09:18 +03:00
a.genus
cac7545070 Add listen directive to vhosts templates and remove ports.conf 2015-12-24 16:01:32 +03:00
a.genus
f69e834f4b Add docs about mod_dav_svn 2015-12-24 12:53:33 +03:00
a.genus
8ca121bed2 Add mod_dav_svn 2015-12-23 17:02:24 +03:00
Forrest
7abbe22724 Merge pull request #103 from michaelforge/feature-keepalive_option
Added ability to configure KeepAlive option
2015-12-16 16:32:49 -08:00
Alexander Kozlov
57d11a1cf0 Fixed YAML parsing On/Off as True/False
True and False are not correct values for apache config
2015-12-17 02:50:37 +03:00
Alexander Kozlov
3e650f5c48 Added ability to configure KeepAlive option
Sometimes it's necessary optimization in nginx+apache2 environment
2015-12-17 02:40:48 +03:00
Wolodja Wentland
0b69d718bb Merge pull request #102 from michaelforge/fix-newlines
Added newlines to recent files
2015-12-16 16:38:53 +01:00
Alexander Kozlov
03d97659d0 Added newlines to recent files 2015-12-16 16:43:16 +03:00
Forrest
7860992728 Merge pull request #101 from michaelforge/feature-mod_remoteip
Added ability to configure mod_remoteip
2015-12-15 16:33:30 -08:00
Alexander Kozlov
58aae42324 Follow-up to 8f2308b98 2015-12-16 03:09:48 +03:00
Alexander Kozlov
8f2308b985 Added ability to configure mod_remoteip 2015-12-16 02:54:14 +03:00