Adrien Bréfort
9e9d6ba4ba
Add support for Ubuntu 15.04 and 15.10 in map.jinja.
9 years ago
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 years ago
Carlo Vollebregt
a3885e6d69
Added installation support for mod_pagespeed on RedHat
9 years ago
Rowcliffe Browne
fd49c2c385
fix for symlink docroot failure
9 years ago
abednarik
a093f8debb
CentOS osfingermap update
9 years ago
Dominik Menzi
ea065e3413
Set vhost sites as enabled by default
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
Elias Probst
293b68b939
Add missing context
9 years ago
Konrad Mosoń
f07f672ed1
Added CentOS and Oracle Linux versions mapping
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
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
Elias Probst
0ed941bd4e
a2(en|dis)site requires the full name incl. the confext.
9 years ago
Elias Probst
873d86cadb
Use 'apache.confext' instead of hardcoding '.conf'
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
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
Wido den Hollander
def448db2f
Files in sites-available should end with .conf under Ubuntu
9 years ago
Brad Thurber
0ced6e4cf0
quote wildcard paths
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
Krzysztof Pawłowski
0d7b149fd5
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
9 years ago
Mads Sülau Jørgensen
4741f58a25
Fixed missing : and uppercased D in debian
9 years ago
Forrest
b839a7e30b
Revert "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
Rico Moorman
1a2d22b2e8
Correct variable name
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
Jonathan Ballet
a8f2d89995
ssl: also support the SSLCertificateChainFile required by some providers
9 years ago
Jonathan Ballet
c9d9d954de
proxy: support SSL certificate in the proxy template
9 years ago
Cody Hiar
07b2a9f9f5
Create defaul vhost directories when DocumentRoot is not set
9 years ago
Mosen
d4b1af0af4
Fix unnecessary comparison against boolean in vhosts/standard.tmpl
9 years ago
Mosen
f135e2e0d5
Fix incorrect syntax in pillar example for SSLCertificateFile, SSLCertificateKeyFile
Fix check for SSLCertificateFile, SSLCertificateKeyFile variables in vhosts/standard.tmpl, now using dict.get()
9 years ago
Elias Probst
1a1104fe80
Set 'confext' for Debian systems.
9 years ago
Florian Bittner
dbb86f2bc4
Add basic SSL functionality.
9 years ago
Brad Thurber
5afdcb819c
per @gravyboat suggestion, change separate if to elif
9 years ago
Jonathan Ballet
42426f3f4a
Don't fail on missing DocumentRoot
If the DocumentRoot value wasn't set, applying the state would cause the
following error:
ID: site.example.com-documentroot
Function: file.directory
Name: None
Result: False
Comment: Specified file None is not an absolute path
Started: 15:07:05.596723
Duration: 4.929 ms
Changes:
This fixes the problem by not trying to check for the DocumentRoot directory is
the value is missing.
9 years ago
Jonathan Ballet
74e4c4d7d5
Make proxies order stable
9 years ago
Jonathan Ballet
3f4a7667f7
Jinja's `reverse` is a filter, use it accordingly
9 years ago
Brad Thurber
0f0d5318e5
make modules.sls compatible with RHEL/CentOS Apache 2.2
9 years ago
Cody Hiar
f1b89abd3b
Update standard.sls
Make sure that you can makedirs incase parent folders are not created
9 years ago
Cody Hiar
138a522f3f
Update standard.sls
Create the vhost DocumentRoot directory if it does not exist
9 years ago
Ryan Peck
a83f74c18e
Add optional templating to register_site
Add optional templating for the register site aspect of a pillar.
User can specify keys to be included as defaults, otherwise it is
treated as a normal managed file.
9 years ago
Raphaël Hertzog
5dc9d42ea6
Update map.ninja to rely on oscodename grain instead of lsb_distrib_release
This is more reliable than version numbers which might change with point
releases (in particular for Debian Jessie) and is more likely to not
conflict between multiple OS.
9 years ago
sebastien.fleury
fce8d72c12
Issue#41 configure multi proxypass configuration in vhost
9 years ago
Ryan Peck
993e836f60
Fix case where state != enabled caused error
When using the register_site state, if the `state` for the
site in the apache pillar did not equal "enabled" the error
```
Cannot extend ID 'a2ensite <name>' in 'base:apache.register_site'. It is not part of the high state.
```
If statements were there to build out the `a2ensite` or `a2dissite` ID
appropiately, but the next state for managing the config always
assumed that the `a2ensite` id would be there.
Addressed by making a Jinja variable that will be the appropiate ID,
probably could use a better name.
9 years ago
Niels Abspoel
9cd070302f
Added basic opensuse support
9 years ago
Cory Wright
eb15c0753a
Update map.jinja
Fix typo: `user_require` -> `use_require`
9 years ago
root
2ba72e613d
Add new templates 'proxy.tmpl' and 'redirect.tmpl'. Add comment pointing to new templates to pillar.example.
10 years ago
Niels Abspoel
3ab160bad2
updated map.jinja debian 8.0 settings
10 years ago