Rowcliffe Browne
fd49c2c385
fix for symlink docroot failure
vor 9 Jahren
abednarik
a093f8debb
CentOS osfingermap update
vor 9 Jahren
Dominik Menzi
ea065e3413
Set vhost sites as enabled by default
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
Elias Probst
293b68b939
Add missing context
vor 9 Jahren
Konrad Mosoń
f07f672ed1
Added CentOS and Oracle Linux versions mapping
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
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
Elias Probst
0ed941bd4e
a2(en|dis)site requires the full name incl. the confext.
vor 9 Jahren
Elias Probst
873d86cadb
Use 'apache.confext' instead of hardcoding '.conf'
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
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
Wido den Hollander
def448db2f
Files in sites-available should end with .conf under Ubuntu
vor 9 Jahren
Brad Thurber
0ced6e4cf0
quote wildcard paths
vor 9 Jahren
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
vor 9 Jahren
Krzysztof Pawłowski
0d7b149fd5
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
vor 9 Jahren
Mads Sülau Jørgensen
4741f58a25
Fixed missing : and uppercased D in debian
vor 9 Jahren
Forrest
b839a7e30b
Revert "corrected the key to match the pillar.example"
vor 9 Jahren
Papoyan, Nerses
023c2873b1
corrected the key to match the pillar.example
vor 9 Jahren
Rico Moorman
1a2d22b2e8
Correct variable name
vor 9 Jahren
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
vor 9 Jahren
Jonathan Ballet
a8f2d89995
ssl: also support the SSLCertificateChainFile required by some providers
vor 9 Jahren
Jonathan Ballet
c9d9d954de
proxy: support SSL certificate in the proxy template
vor 9 Jahren
Cody Hiar
07b2a9f9f5
Create defaul vhost directories when DocumentRoot is not set
vor 9 Jahren
Mosen
d4b1af0af4
Fix unnecessary comparison against boolean in vhosts/standard.tmpl
vor 9 Jahren
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()
vor 9 Jahren
Elias Probst
1a1104fe80
Set 'confext' for Debian systems.
vor 9 Jahren
Florian Bittner
dbb86f2bc4
Add basic SSL functionality.
vor 9 Jahren
Brad Thurber
5afdcb819c
per @gravyboat suggestion, change separate if to elif
vor 9 Jahren
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.
vor 9 Jahren
Jonathan Ballet
74e4c4d7d5
Make proxies order stable
vor 9 Jahren
Jonathan Ballet
3f4a7667f7
Jinja's `reverse` is a filter, use it accordingly
vor 9 Jahren
Brad Thurber
0f0d5318e5
make modules.sls compatible with RHEL/CentOS Apache 2.2
vor 9 Jahren
Cody Hiar
f1b89abd3b
Update standard.sls
Make sure that you can makedirs incase parent folders are not created
vor 9 Jahren
Cody Hiar
138a522f3f
Update standard.sls
Create the vhost DocumentRoot directory if it does not exist
vor 9 Jahren
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.
vor 9 Jahren
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.
vor 9 Jahren
sebastien.fleury
fce8d72c12
Issue#41 configure multi proxypass configuration in vhost
vor 9 Jahren
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.
vor 9 Jahren
Niels Abspoel
9cd070302f
Added basic opensuse support
vor 9 Jahren
Cory Wright
eb15c0753a
Update map.jinja
Fix typo: `user_require` -> `use_require`
vor 9 Jahren
root
2ba72e613d
Add new templates 'proxy.tmpl' and 'redirect.tmpl'. Add comment pointing to new templates to pillar.example.
vor 10 Jahren
Niels Abspoel
3ab160bad2
updated map.jinja debian 8.0 settings
vor 10 Jahren
Ben Dougherty
ff9fc14eaf
Fix mod-php5 dependency when setting php.ini
vor 10 Jahren
Skyler Berg
11d66cfda7
Add ability to specify modules in pillar
vor 10 Jahren
Adrien Bréfort
3612927174
Fix default Options.
vor 10 Jahren