Forrest
8df779fe12
Merge pull request #98 from michaelforge/feature_manage-security
Added ability to manage security settings
vor 9 Jahren
Forrest
832cf13025
Merge pull request #99 from michaelforge/feature_manage-default-vhost
Added ability to replace default vhost with own version
vor 9 Jahren
Alexander Kozlov
f7940ecdc1
Added ability to replace default vhost with own version
Added example shows 503 code instead of "It works!" page.
vor 9 Jahren
Alexander Kozlov
5a641d5b6a
Mentioned `apache.manage_security` at docs
vor 9 Jahren
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
vor 9 Jahren
Forrest
00d0785886
Merge pull request #95 from nigelsim/versioned-config
Added support for different config templates based on Apache version
vor 9 Jahren
Forrest
f8197e6e51
Merge pull request #96 from nigelsim/alias-location
Added support for Alias and Location directives in a VirutalHost
vor 9 Jahren
root
3742b40f86
Added support for Alias and Locations, as well as enabling Dav
vor 9 Jahren
root
dc7970955a
Added support for different templates for the config file based on version
vor 9 Jahren
Nitin Madhok
c3393a4910
Fixing minor typo
vor 9 Jahren
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
vor 9 Jahren
abednarik
b28b61205a
Update mod proxy id to avoid conflict when using modules te enable this mod
vor 9 Jahren
Forrest
17916fc234
Merge pull request #93 from abednarik/fix_deprecated_iteritems_method
Replace deprecated iteritems() with items()
vor 9 Jahren
abednarik
384a3c56c2
Replace deprecated iteritems() with items()
vor 9 Jahren
puneet kandhari
52af4e1ca4
Merge pull request #92 from abrefort/master
Add support for Ubuntu 15.04 and 15.10 in map.jinja.
vor 9 Jahren
Adrien Bréfort
9e9d6ba4ba
Add support for Ubuntu 15.04 and 15.10 in map.jinja.
vor 9 Jahren
Forrest
fadff5c544
Merge pull request #91 from elevennl/master
Added installation support for mod_pagespeed on RedHat
vor 9 Jahren
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
vor 9 Jahren
Carlo Vollebregt
a3885e6d69
Added installation support for mod_pagespeed on RedHat
vor 9 Jahren
Forrest
939011c4f2
Merge pull request #90 from cybacolt/master
fix for symlink docroot failure
vor 9 Jahren
Rowcliffe Browne
fd49c2c385
fix for symlink docroot failure
vor 9 Jahren
Nitin Madhok
e62a82116b
Merge pull request #88 from abednarik/fix_osfingermap_for_centos
CentOS osfingermap update
vor 9 Jahren
abednarik
a093f8debb
CentOS osfingermap update
vor 9 Jahren
Forrest
c0a4041310
Merge pull request #87 from inventage/master
Set vhost sites as enabled by default
vor 9 Jahren
Dominik Menzi
ea065e3413
Set vhost sites as enabled by default
vor 9 Jahren
Forrest
84519a6aea
Merge pull request #85 from bradthurber/redhat_module_fixes
Redhat module.sls fixes
vor 9 Jahren
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
vor 9 Jahren
Brad Thurber
9020f8d82a
sed needs to allow spaces before LoadModule
vor 9 Jahren
Brad Thurber
24698575f1
add space before grep module check
vor 9 Jahren
puneet kandhari
663b80724f
Merge pull request #84 from eliasp/missing-confext
Add missing context
vor 9 Jahren
Elias Probst
293b68b939
Add missing context
vor 9 Jahren
puneet kandhari
4c02ae7004
Merge pull request #83 from morsik/patch-1
Added CentOS and Oracle Linux versions mapping
vor 9 Jahren
Konrad Mosoń
f07f672ed1
Added CentOS and Oracle Linux versions mapping
vor 9 Jahren
puneet kandhari
c6413a361c
Merge pull request #82 from eliasp/patch-1
Don't execute `a2dissite` on each state run
vor 9 Jahren
Elias Probst
ff2dd397c3
Don't execute `a2dissite` on each state run
Add `onlyif` check to execute `a2dissite` only when needed.
vor 9 Jahren
puneet kandhari
92cc127bfe
Merge pull request #81 from jcristau/no-documentroot
allow absence of DocumentRoot
vor 9 Jahren
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>
vor 9 Jahren
Nitin Madhok
9bd6873d27
Merge pull request #80 from eliasp/a2tools-confext
a2(en|dis)site requires the full name incl. the confext.
vor 9 Jahren
Elias Probst
0ed941bd4e
a2(en|dis)site requires the full name incl. the confext.
vor 9 Jahren
puneet kandhari
7406e62d23
Merge pull request #78 from eliasp/correct-confext-usage
Use 'apache.confext' instead of hardcoding '.conf'
vor 9 Jahren
Elias Probst
873d86cadb
Use 'apache.confext' instead of hardcoding '.conf'
vor 9 Jahren
puneet kandhari
d01b7cc66e
Merge pull request #77 from bradthurber/add_apache_version
Add apache version to pillar/map.jinja
vor 9 Jahren
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)
vor 9 Jahren
puneet kandhari
75304c160c
Merge pull request #76 from bradthurber/add-lookup-to-pillar
add lookup section to pillar.example
vor 9 Jahren
Brad Thurber
13fb82c470
add lookup section to pillar.example
vor 9 Jahren
Forrest
b6437b15e0
Merge pull request #74 from Wenzel/disable_site
add a boolean to a site configuration to enable or disable it
vor 9 Jahren
puneet kandhari
3dafac2627
Merge pull request #73 from Wenzel/fix_mod_mpm
fix apache-restart ID in apache/mod_mpm according to apache/init.sls
vor 9 Jahren
Mathieu Tarral
a7fb2f89fc
add missing {% endif %}
vor 9 Jahren
Mathieu Tarral
c195dce07c
add an 'enabled' attribute for a site in pillar
vor 9 Jahren
Mathieu Tarral
a88611c1d0
fix apache-restart ID in apache/mod_mpm according to apache/init.sls
vor 9 Jahren