Rowcliffe Browne
fd49c2c385
fix for symlink docroot failure
9 years ago
Nitin Madhok
e62a82116b
Merge pull request #88 from abednarik/fix_osfingermap_for_centos
CentOS osfingermap update
9 years ago
abednarik
a093f8debb
CentOS osfingermap update
9 years ago
Forrest
c0a4041310
Merge pull request #87 from inventage/master
Set vhost sites as enabled by default
9 years ago
Dominik Menzi
ea065e3413
Set vhost sites as enabled by default
9 years ago
Forrest
84519a6aea
Merge pull request #85 from bradthurber/redhat_module_fixes
Redhat module.sls fixes
9 years ago
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 years ago
Brad Thurber
9020f8d82a
sed needs to allow spaces before LoadModule
9 years ago
Brad Thurber
24698575f1
add space before grep module check
9 years ago
puneet kandhari
663b80724f
Merge pull request #84 from eliasp/missing-confext
Add missing context
9 years ago
Elias Probst
293b68b939
Add missing context
9 years ago
puneet kandhari
4c02ae7004
Merge pull request #83 from morsik/patch-1
Added CentOS and Oracle Linux versions mapping
9 years ago
Konrad Mosoń
f07f672ed1
Added CentOS and Oracle Linux versions mapping
9 years ago
puneet kandhari
c6413a361c
Merge pull request #82 from eliasp/patch-1
Don't execute `a2dissite` on each state run
9 years ago
Elias Probst
ff2dd397c3
Don't execute `a2dissite` on each state run
Add `onlyif` check to execute `a2dissite` only when needed.
9 years ago
puneet kandhari
92cc127bfe
Merge pull request #81 from jcristau/no-documentroot
allow absence of DocumentRoot
9 years ago
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 years ago
Nitin Madhok
9bd6873d27
Merge pull request #80 from eliasp/a2tools-confext
a2(en|dis)site requires the full name incl. the confext.
9 years ago
Elias Probst
0ed941bd4e
a2(en|dis)site requires the full name incl. the confext.
9 years ago
puneet kandhari
7406e62d23
Merge pull request #78 from eliasp/correct-confext-usage
Use 'apache.confext' instead of hardcoding '.conf'
9 years ago
Elias Probst
873d86cadb
Use 'apache.confext' instead of hardcoding '.conf'
9 years ago
puneet kandhari
d01b7cc66e
Merge pull request #77 from bradthurber/add_apache_version
Add apache version to pillar/map.jinja
9 years ago
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 years ago
puneet kandhari
75304c160c
Merge pull request #76 from bradthurber/add-lookup-to-pillar
add lookup section to pillar.example
9 years ago
Brad Thurber
13fb82c470
add lookup section to pillar.example
9 years ago
Forrest
b6437b15e0
Merge pull request #74 from Wenzel/disable_site
add a boolean to a site configuration to enable or disable it
9 years ago
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 years ago
Mathieu Tarral
a7fb2f89fc
add missing {% endif %}
9 years ago
Mathieu Tarral
c195dce07c
add an 'enabled' attribute for a site in pillar
9 years ago
Mathieu Tarral
a88611c1d0
fix apache-restart ID in apache/mod_mpm according to apache/init.sls
9 years ago
puneet kandhari
b59ef46304
Merge pull request #72 from wido/fix_register_site
Files in sites-available should end with .conf under Ubuntu
9 years ago
Wido den Hollander
def448db2f
Files in sites-available should end with .conf under Ubuntu
9 years ago
puneet kandhari
e84b76ab01
Merge pull request #71 from bradthurber/find_wildcard_paths_should_be_quoted
quote wildcard paths
9 years ago
Brad Thurber
0ced6e4cf0
quote wildcard paths
9 years ago
puneet kandhari
25179778ed
Merge pull request #68 from msciciel/msciciel
RedHat fixes: change default vhostdir to redhat official
9 years ago
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 years ago
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 years ago
Krzysztof Pawłowski
0d7b149fd5
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
9 years ago
puneet kandhari
9d72208524
Merge pull request #66 from madssj/fix-syntax-error
Fixed missing : and uppercased D in debian
9 years ago
Mads Sülau Jørgensen
4741f58a25
Fixed missing : and uppercased D in debian
9 years ago
Brian Jackson
26334430da
Merge pull request #65 from techhat/master
Initial commit of SPM FORMULA
9 years ago
Joseph Hall
e0ce473b81
Initial commit of SPM FORMULA
9 years ago
puneet kandhari
513bc04861
Merge pull request #62 from saltstack-formulas/revert-61-master
Revert "corrected the key to match the pillar.example"
9 years ago
Forrest
b839a7e30b
Revert "corrected the key to match the pillar.example"
9 years ago
Forrest
32c492dbae
Merge pull request #61 from papoyan/master
corrected the key to match the pillar.example
9 years ago
Papoyan, Nerses
023c2873b1
corrected the key to match the pillar.example
9 years ago
puneet kandhari
f34b239202
Merge pull request #60 from Thingks/master
Correct variable name
9 years ago
Rico Moorman
1a2d22b2e8
Correct variable name
9 years ago
puneet kandhari
114bb34fc4
Merge pull request #59 from aboe76/master
Improvements to the apache-formula
9 years ago
Niels Abspoel
53b995a680
Improved apache-formula
- Added more modules and configuration options
- Renamed sls files to reflect what they do.
- added mpm options for Debian
9 years ago