Commit Graph

437 Commits

Author SHA1 Message Date
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
Forrest
8df779fe12 Merge pull request #98 from michaelforge/feature_manage-security
Added ability to manage security settings
2015-12-14 11:33:06 -08:00
Forrest
832cf13025 Merge pull request #99 from michaelforge/feature_manage-default-vhost
Added ability to replace default vhost with own version
2015-12-14 11:32:48 -08:00
Alexander Kozlov
f7940ecdc1 Added ability to replace default vhost with own version
Added example shows 503 code instead of "It works!" page.
2015-12-14 17:44:59 +03:00
Alexander Kozlov
5a641d5b6a Mentioned apache.manage_security at docs 2015-12-14 17:14:32 +03:00
Alexander Kozlov
8584dbf2a1 Added ability to manage security settings
By reassigning options with `blockreplace` at `/etc/apache2/conf-available/security.conf`, which is linked as conf-enabled by default on Debian packages
2015-12-14 17:12:20 +03:00
Forrest
00d0785886 Merge pull request #95 from nigelsim/versioned-config
Added support for different config templates based on Apache version
2015-12-09 13:20:38 -08:00
Forrest
f8197e6e51 Merge pull request #96 from nigelsim/alias-location
Added support for Alias and Location directives in a VirutalHost
2015-12-09 13:19:59 -08:00
root
3742b40f86 Added support for Alias and Locations, as well as enabling Dav 2015-12-10 06:59:32 +10:00
root
dc7970955a Added support for different templates for the config file based on version 2015-12-10 06:54:50 +10:00
Nitin Madhok
c3393a4910 Fixing minor typo 2015-11-23 13:39:28 -05:00
Nitin Madhok
35885280f1 Merge pull request #94 from abednarik/update_mod_proxy_id
Update mod proxy id to avoid conflict when using modules te enable this module
2015-11-23 13:37:39 -05:00
abednarik
b28b61205a Update mod proxy id to avoid conflict when using modules te enable this mod 2015-11-23 15:31:45 -03:00
Forrest
17916fc234 Merge pull request #93 from abednarik/fix_deprecated_iteritems_method
Replace deprecated iteritems() with items()
2015-11-22 14:10:40 -08:00
abednarik
384a3c56c2 Replace deprecated iteritems() with items() 2015-11-22 18:57:56 -03:00
puneet kandhari
52af4e1ca4 Merge pull request #92 from abrefort/master
Add support for Ubuntu 15.04 and 15.10 in map.jinja.
2015-11-22 06:34:07 -06: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
Forrest
fadff5c544 Merge pull request #91 from elevennl/master
Added installation support for mod_pagespeed on RedHat
2015-11-20 13:52:41 -08:00
Carlo Vollebregt
2d39798fbb Added installation support for mod_pagespeed on RedHat: cache and log dir are already created after installation of the mod_pagespeed RPM 2015-11-20 12:33:16 +01:00
Carlo Vollebregt
a3885e6d69 Added installation support for mod_pagespeed on RedHat 2015-11-19 22:04:03 +01:00
Forrest
939011c4f2 Merge pull request #90 from cybacolt/master
fix for symlink docroot failure
2015-11-16 19:33:38 -08:00
Rowcliffe Browne
fd49c2c385 fix for symlink docroot failure 2015-11-17 11:16:24 +08:00
Nitin Madhok
e62a82116b Merge pull request #88 from abednarik/fix_osfingermap_for_centos
CentOS osfingermap update
2015-11-16 15:09:10 -05:00
abednarik
a093f8debb CentOS osfingermap update 2015-11-16 17:07:23 -03:00
Forrest
c0a4041310 Merge pull request #87 from inventage/master
Set vhost sites as enabled by default
2015-11-16 11:08:05 -08:00