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
pirms 9 gadiem
Krzysztof Pawłowski
0d7b149fd5
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
pirms 9 gadiem
Mads Sülau Jørgensen
4741f58a25
Fixed missing : and uppercased D in debian
pirms 9 gadiem
Forrest
b839a7e30b
Revert "corrected the key to match the pillar.example"
pirms 9 gadiem
Papoyan, Nerses
023c2873b1
corrected the key to match the pillar.example
pirms 9 gadiem
Rico Moorman
1a2d22b2e8
Correct variable name
pirms 9 gadiem
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
pirms 9 gadiem
Jonathan Ballet
a8f2d89995
ssl: also support the SSLCertificateChainFile required by some providers
pirms 9 gadiem
Jonathan Ballet
c9d9d954de
proxy: support SSL certificate in the proxy template
pirms 9 gadiem
Cody Hiar
07b2a9f9f5
Create defaul vhost directories when DocumentRoot is not set
pirms 9 gadiem
Mosen
d4b1af0af4
Fix unnecessary comparison against boolean in vhosts/standard.tmpl
pirms 9 gadiem
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()
pirms 9 gadiem
Elias Probst
1a1104fe80
Set 'confext' for Debian systems.
pirms 9 gadiem
Florian Bittner
dbb86f2bc4
Add basic SSL functionality.
pirms 9 gadiem
Brad Thurber
5afdcb819c
per @gravyboat suggestion, change separate if to elif
pirms 9 gadiem
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.
pirms 9 gadiem
Jonathan Ballet
74e4c4d7d5
Make proxies order stable
pirms 9 gadiem
Jonathan Ballet
3f4a7667f7
Jinja's `reverse` is a filter, use it accordingly
pirms 9 gadiem
Brad Thurber
0f0d5318e5
make modules.sls compatible with RHEL/CentOS Apache 2.2
pirms 9 gadiem
Cody Hiar
f1b89abd3b
Update standard.sls
Make sure that you can makedirs incase parent folders are not created
pirms 9 gadiem
Cody Hiar
138a522f3f
Update standard.sls
Create the vhost DocumentRoot directory if it does not exist
pirms 9 gadiem
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.
pirms 9 gadiem
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.
pirms 9 gadiem
sebastien.fleury
fce8d72c12
Issue#41 configure multi proxypass configuration in vhost
pirms 9 gadiem
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.
pirms 9 gadiem
Niels Abspoel
9cd070302f
Added basic opensuse support
pirms 9 gadiem
Cory Wright
eb15c0753a
Update map.jinja
Fix typo: `user_require` -> `use_require`
pirms 9 gadiem
root
2ba72e613d
Add new templates 'proxy.tmpl' and 'redirect.tmpl'. Add comment pointing to new templates to pillar.example.
pirms 10 gadiem
Niels Abspoel
3ab160bad2
updated map.jinja debian 8.0 settings
pirms 10 gadiem
Ben Dougherty
ff9fc14eaf
Fix mod-php5 dependency when setting php.ini
pirms 10 gadiem
Skyler Berg
11d66cfda7
Add ability to specify modules in pillar
pirms 10 gadiem
Adrien Bréfort
3612927174
Fix default Options.
pirms 10 gadiem
Adrien Bréfort
67e12a8bc2
Fixed Apache 2.4 support and added support for Ubuntu 14.10.
Replace require_all with use_require in map.jinja, we want to be able
to use custom Require values.
Remove uneeded Directory in standard.tmpl and add conditional and
default value for Require.
Fix bad filenames in standard.sls
pirms 10 gadiem
Berry Langerak
b8fe242d35
Adding support for Apache 2.4 on Ubuntu 14.04
- Adding confext to virtualhost names.
- Renaming the default config file for Ubuntu (000-default.conf).
- Adding ability to use "Require all granted".
pirms 10 gadiem
KennethWilke
964b653692
fixed things seth mentioned in class
pirms 10 gadiem
Seth House
67b8518e47
Added explanatory comment to the apache restart/reload module.wait states
pirms 10 gadiem
Vincent Fretin
541360a0ce
use test -f instead of ls in register_site.sls too
pirms 10 gadiem
Vincent Fretin
0aec048eaf
use test -f instead of ls
pirms 10 gadiem
vincentfretin
18d8c0c0fb
Don't execute a2ensite if the vhost is already enabled
pirms 10 gadiem
Seth House
2db91119af
Combined multiple extend statements
Fixes #22
pirms 10 gadiem
Seth House
6457ae9e86
Use long-form state declaration
pirms 10 gadiem
Adam Herzog
be1aa5629e
Use confext parameter when naming vhost config files.
pirms 11 gadiem
Adam Herzog
1888584b94
Add config file extension (confext) to parameter map.
pirms 11 gadiem
Christer Edwards
36051f4353
removed unneeded wsgi_path
pirms 11 gadiem
Christer Edwards
001f2a9d9c
added initial FreeBSD support
pirms 11 gadiem
Forrest Alvarez
3535ecae9a
Removed apt from items where it is not required, also modified fcgid to include apache as it requires the apache package.
pirms 11 gadiem
Arnold Bechtoldt
d60aca39cb
setting the correct parameter values for watch_in
pirms 11 gadiem
Arnold Bechtoldt
1fce705bc0
setting the remaining changes caused by the change of cmd.wait to .module.wait in init.sls
pirms 11 gadiem
Arnold Bechtoldt
b45a5f4fc4
adding mod_proxy and mod_proxy_http states, updating the README doc
pirms 11 gadiem
Michal Galet
a3299dc1eb
States for apache-reload and apache-restart using module.wait not working
pirms 11 gadiem