Commit Graph

423 Commits

Author SHA1 Message Date
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
Dominik Menzi
ea065e3413 Set vhost sites as enabled by default 2015-11-16 11:43:44 +01:00
Forrest
84519a6aea Merge pull request #85 from bradthurber/redhat_module_fixes
Redhat module.sls fixes
2015-10-20 12:28:46 -07:00
Brad Thurber
fb2f41afe4 debugging - the \s gets turned into \\s for some reason - so using [[:space:]] instead. This seems to be the grep-favored approach http://stackoverflow.com/questions/4233159/grep-regex-whitespace-behavior 2015-10-20 14:37:22 -04:00
Brad Thurber
9020f8d82a sed needs to allow spaces before LoadModule 2015-10-20 14:03:33 -04:00
Brad Thurber
24698575f1 add space before grep module check 2015-10-20 13:41:51 -04:00
puneet kandhari
663b80724f Merge pull request #84 from eliasp/missing-confext
Add missing context
2015-10-08 06:32:18 -05:00
Elias Probst
293b68b939 Add missing context 2015-10-08 12:31:47 +02:00
puneet kandhari
4c02ae7004 Merge pull request #83 from morsik/patch-1
Added CentOS and Oracle Linux versions mapping
2015-10-03 09:40:58 -05:00
Konrad Mosoń
f07f672ed1 Added CentOS and Oracle Linux versions mapping 2015-10-03 15:44:45 +02:00
puneet kandhari
c6413a361c Merge pull request #82 from eliasp/patch-1
Don't execute `a2dissite` on each state run
2015-09-25 04:58:44 -05:00
Elias Probst
ff2dd397c3 Don't execute a2dissite on each state run
Add `onlyif` check to execute `a2dissite` only when needed.
2015-09-25 09:34:28 +02:00
puneet kandhari
92cc127bfe Merge pull request #81 from jcristau/no-documentroot
allow absence of DocumentRoot
2015-09-21 09:17:49 -05:00
Julien Cristau
9be8ade5aa allow absence of DocumentRoot
DocumentRoot is useless for a plain redirect or proxy vhost, no need to
force creating the directory.

Signed-off-by: Julien Cristau <julien.cristau@logilab.fr>
2015-09-21 15:47:46 +02:00
Nitin Madhok
9bd6873d27 Merge pull request #80 from eliasp/a2tools-confext
a2(en|dis)site requires the full name incl. the confext.
2015-08-28 10:17:36 -04:00