Mathieu Tarral
a7fb2f89fc
add missing {% endif %}
2015-08-25 01:58:22 -04:00
Mathieu Tarral
c195dce07c
add an 'enabled' attribute for a site in pillar
2015-08-25 01:50:58 -04:00
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
2015-07-22 14:36:25 +02:00
Krzysztof Pawłowski
0d7b149fd5
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
2015-07-22 10:13:38 +02:00
Mads Sülau Jørgensen
4741f58a25
Fixed missing : and uppercased D in debian
2015-07-08 15:33:19 +02:00
Forrest
b839a7e30b
Revert "corrected the key to match the pillar.example"
2015-06-23 10:30:16 -07:00
Papoyan, Nerses
023c2873b1
corrected the key to match the pillar.example
2015-06-23 11:35:55 -04:00
Rico Moorman
1a2d22b2e8
Correct variable name
2015-06-19 22:55:30 +02:00
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
2015-06-19 20:44:53 +02:00
Niels Abspoel
f6a0c84544
Merge pull request #56 from thornycrackers/master
...
Create defaul vhost directories when DocumentRoot is not set
2015-06-17 16:11:29 +02:00
Jonathan Ballet
a8f2d89995
ssl: also support the SSLCertificateChainFile required by some providers
2015-06-09 11:54:07 +02:00
Jonathan Ballet
c9d9d954de
proxy: support SSL certificate in the proxy template
2015-06-09 11:48:35 +02:00
Cody Hiar
07b2a9f9f5
Create defaul vhost directories when DocumentRoot is not set
2015-05-31 12:17:25 -06:00
Mosen
d4b1af0af4
Fix unnecessary comparison against boolean in vhosts/standard.tmpl
2015-05-14 16:55:11 +10:00
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()
2015-05-14 12:38:27 +10:00
Elias Probst
1a1104fe80
Set 'confext' for Debian systems.
2015-04-17 14:39:57 +02:00
Forrest
99ea682cfb
Merge pull request #52 from daschatten/master
...
Add basic SSL functionality.
2015-04-02 08:52:42 -07:00
Florian Bittner
dbb86f2bc4
Add basic SSL functionality.
2015-04-02 14:23:21 +02:00
Nitin Madhok
231000fd4b
Merge pull request #47 from bradthurber/modules.sls-redhat
...
make modules.sls compatible with RHEL/CentOS Apache 2.2
2015-03-26 13:07:08 -04:00
Brad Thurber
5afdcb819c
per @gravyboat suggestion, change separate if to elif
2015-03-26 08:00:11 -04:00
Forrest
39176444d1
Merge pull request #48 from multani/fix-jinja-reverse
...
Fix Jinja's reverse
2015-03-25 19:25:38 -07:00
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.
2015-03-25 15:06:18 +01:00
Jonathan Ballet
74e4c4d7d5
Make proxies order stable
2015-03-25 14:48:13 +01:00
Jonathan Ballet
3f4a7667f7
Jinja's reverse
is a filter, use it accordingly
2015-03-25 14:47:55 +01:00
Brad Thurber
0f0d5318e5
make modules.sls compatible with RHEL/CentOS Apache 2.2
2015-03-24 15:41:08 -04:00
Cody Hiar
f1b89abd3b
Update standard.sls
...
Make sure that you can makedirs incase parent folders are not created
2015-03-23 16:53:45 -06:00
Cody Hiar
138a522f3f
Update standard.sls
...
Create the vhost DocumentRoot directory if it does not exist
2015-03-23 15:22:08 -06:00
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.
2015-03-18 13:36:19 -04:00
Florian Bittner
77398445a9
Merge pull request #43 from artmoni/br_multiproxy
...
Issue#41 configure multi proxypass configuration in vhost
Thank you!
2015-03-11 23:15:49 +01:00
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.
2015-03-11 20:43:18 +01:00
sebastien.fleury
fce8d72c12
Issue#41 configure multi proxypass configuration in vhost
2015-03-11 18:35:41 +01:00
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.
2015-03-10 16:52:24 -04:00
Niels Abspoel
9cd070302f
Added basic opensuse support
2015-03-08 22:12:36 +01:00
Cory Wright
eb15c0753a
Update map.jinja
...
Fix typo: `user_require` -> `use_require`
2015-03-04 17:39:15 -05:00
root
2ba72e613d
Add new templates 'proxy.tmpl' and 'redirect.tmpl'. Add comment pointing to new templates to pillar.example.
2015-02-15 00:06:44 +01:00
Niels Abspoel
3ab160bad2
updated map.jinja debian 8.0 settings
2015-01-10 16:18:59 +01:00
Ben Dougherty
ff9fc14eaf
Fix mod-php5 dependency when setting php.ini
2014-12-29 10:25:08 +08:00
Skyler Berg
11d66cfda7
Add ability to specify modules in pillar
2014-11-20 15:46:31 -08:00
Adrien Bréfort
3612927174
Fix default Options.
2014-10-28 18:50:04 +01:00
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
2014-10-28 15:13:13 +01:00
Nitin Madhok
5432b18a7c
Merge pull request #29 from berry-langerak/feature/adding-support-for-apache-2.4
...
Adding support for Apache 2.4 on Ubuntu 14.04
2014-10-01 07:38:22 -04:00
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".
2014-10-01 10:35:53 +02:00
KennethWilke
964b653692
fixed things seth mentioned in class
2014-09-25 11:48:36 -05:00
Seth House
67b8518e47
Added explanatory comment to the apache restart/reload module.wait states
2014-08-06 17:08:14 -04:00
Vincent Fretin
541360a0ce
use test -f instead of ls in register_site.sls too
2014-08-01 15:39:32 +02:00
Vincent Fretin
0aec048eaf
use test -f instead of ls
2014-08-01 15:32:40 +02:00
vincentfretin
18d8c0c0fb
Don't execute a2ensite if the vhost is already enabled
2014-08-01 10:43:04 +02:00
Seth House
2db91119af
Combined multiple extend statements
...
Fixes #22
2014-03-10 11:53:34 -06:00
Seth House
6457ae9e86
Use long-form state declaration
2014-03-04 11:13:26 -08:00
Adam Herzog
be1aa5629e
Use confext parameter when naming vhost config files.
2014-02-09 09:12:31 -05:00