Nitin Madhok
c3393a4910
Fixing minor typo
пре 9 година
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
пре 9 година
abednarik
b28b61205a
Update mod proxy id to avoid conflict when using modules te enable this mod
пре 9 година
Forrest
17916fc234
Merge pull request #93 from abednarik/fix_deprecated_iteritems_method
Replace deprecated iteritems() with items()
пре 9 година
abednarik
384a3c56c2
Replace deprecated iteritems() with items()
пре 9 година
puneet kandhari
52af4e1ca4
Merge pull request #92 from abrefort/master
Add support for Ubuntu 15.04 and 15.10 in map.jinja.
пре 9 година
Adrien Bréfort
9e9d6ba4ba
Add support for Ubuntu 15.04 and 15.10 in map.jinja.
пре 9 година
Forrest
fadff5c544
Merge pull request #91 from elevennl/master
Added installation support for mod_pagespeed on RedHat
пре 9 година
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
пре 9 година
Carlo Vollebregt
a3885e6d69
Added installation support for mod_pagespeed on RedHat
пре 9 година
Forrest
939011c4f2
Merge pull request #90 from cybacolt/master
fix for symlink docroot failure
пре 9 година
Rowcliffe Browne
fd49c2c385
fix for symlink docroot failure
пре 9 година
Nitin Madhok
e62a82116b
Merge pull request #88 from abednarik/fix_osfingermap_for_centos
CentOS osfingermap update
пре 9 година
abednarik
a093f8debb
CentOS osfingermap update
пре 9 година
Forrest
c0a4041310
Merge pull request #87 from inventage/master
Set vhost sites as enabled by default
пре 9 година
Dominik Menzi
ea065e3413
Set vhost sites as enabled by default
пре 9 година
Forrest
84519a6aea
Merge pull request #85 from bradthurber/redhat_module_fixes
Redhat module.sls fixes
пре 9 година
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
пре 9 година
Brad Thurber
9020f8d82a
sed needs to allow spaces before LoadModule
пре 9 година
Brad Thurber
24698575f1
add space before grep module check
пре 9 година
puneet kandhari
663b80724f
Merge pull request #84 from eliasp/missing-confext
Add missing context
пре 9 година
Elias Probst
293b68b939
Add missing context
пре 9 година
puneet kandhari
4c02ae7004
Merge pull request #83 from morsik/patch-1
Added CentOS and Oracle Linux versions mapping
пре 9 година
Konrad Mosoń
f07f672ed1
Added CentOS and Oracle Linux versions mapping
пре 9 година
puneet kandhari
c6413a361c
Merge pull request #82 from eliasp/patch-1
Don't execute `a2dissite` on each state run
пре 9 година
Elias Probst
ff2dd397c3
Don't execute `a2dissite` on each state run
Add `onlyif` check to execute `a2dissite` only when needed.
пре 9 година
puneet kandhari
92cc127bfe
Merge pull request #81 from jcristau/no-documentroot
allow absence of DocumentRoot
пре 9 година
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>
пре 9 година
Nitin Madhok
9bd6873d27
Merge pull request #80 from eliasp/a2tools-confext
a2(en|dis)site requires the full name incl. the confext.
пре 9 година
Elias Probst
0ed941bd4e
a2(en|dis)site requires the full name incl. the confext.
пре 9 година
puneet kandhari
7406e62d23
Merge pull request #78 from eliasp/correct-confext-usage
Use 'apache.confext' instead of hardcoding '.conf'
пре 9 година
Elias Probst
873d86cadb
Use 'apache.confext' instead of hardcoding '.conf'
пре 9 година
puneet kandhari
d01b7cc66e
Merge pull request #77 from bradthurber/add_apache_version
Add apache version to pillar/map.jinja
пре 9 година
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)
пре 9 година
puneet kandhari
75304c160c
Merge pull request #76 from bradthurber/add-lookup-to-pillar
add lookup section to pillar.example
пре 9 година
Brad Thurber
13fb82c470
add lookup section to pillar.example
пре 9 година
Forrest
b6437b15e0
Merge pull request #74 from Wenzel/disable_site
add a boolean to a site configuration to enable or disable it
пре 9 година
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
пре 9 година
Mathieu Tarral
a7fb2f89fc
add missing {% endif %}
пре 9 година
Mathieu Tarral
c195dce07c
add an 'enabled' attribute for a site in pillar
пре 9 година
Mathieu Tarral
a88611c1d0
fix apache-restart ID in apache/mod_mpm according to apache/init.sls
пре 9 година
puneet kandhari
b59ef46304
Merge pull request #72 from wido/fix_register_site
Files in sites-available should end with .conf under Ubuntu
пре 9 година
Wido den Hollander
def448db2f
Files in sites-available should end with .conf under Ubuntu
пре 9 година
puneet kandhari
e84b76ab01
Merge pull request #71 from bradthurber/find_wildcard_paths_should_be_quoted
quote wildcard paths
пре 9 година
Brad Thurber
0ced6e4cf0
quote wildcard paths
пре 9 година
puneet kandhari
25179778ed
Merge pull request #68 from msciciel/msciciel
RedHat fixes: change default vhostdir to redhat official
пре 9 година
Krzysztof Pawłowski
b6fe515ed8
RedHat fixes: change default vhostdir to redhat official default /etc/httpd/vhosts.d, add state for ensuring that vhostdir exists, include vhosts.d/*.conf in httpd.conf
пре 9 година
Nitin Madhok
954a39e0cd
Merge pull request #67 from msciciel/msciciel
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
пре 9 година
Krzysztof Pawłowski
0d7b149fd5
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
пре 9 година
puneet kandhari
9d72208524
Merge pull request #66 from madssj/fix-syntax-error
Fixed missing : and uppercased D in debian
пре 9 година