root
8d1b8f7f36
Add example code for new templates 'redirect.tmpl' and 'proxy.tmpl'.
pirms 10 gadiem
root
2ba72e613d
Add new templates 'proxy.tmpl' and 'redirect.tmpl'. Add comment pointing to new templates to pillar.example.
pirms 10 gadiem
Seth House
1a596bcb48
Merge pull request #36 from aboe76/improve_debian
updated map.jinja debian 8.0 settings
pirms 10 gadiem
Niels Abspoel
3ab160bad2
updated map.jinja debian 8.0 settings
pirms 10 gadiem
Nitin Madhok
c58a650b69
Merge pull request #35 from benjy14/master
Fix mod-php5 dependency when setting php.ini
pirms 10 gadiem
Ben Dougherty
ff9fc14eaf
Fix mod-php5 dependency when setting php.ini
pirms 10 gadiem
Nitin Madhok
aa0d6fdfc4
Merge pull request #32 from openenvi-formulas/modules
Add ability to specify modules in pillar
pirms 10 gadiem
Skyler Berg
11d66cfda7
Add ability to specify modules in pillar
pirms 10 gadiem
Nitin Madhok
82c120586a
Merge pull request #31 from abrefort/master
Fix Apache 2.4 and add support for Ubuntu 14.10
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
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
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
Nitin Madhok
13fef9e9ac
Merge pull request #27 from KennethWilke/master
fixed things seth mentioned in class
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
Seth House
448c4855ce
Revert "Updated README with new formula conventions URL"
This reverts commit f7b14ec169
.
pirms 10 gadiem
Seth House
f7b14ec169
Updated README with new formula conventions URL
pirms 10 gadiem
Seth House
2c499ee376
Merge pull request #26 from vincentfretin/patch-1
Don't execute a2ensite if the vhost is already enabled
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
Forrest
b034debeca
Merge pull request #24 from ev0rtex/patch-1
Fix link to instructions
pirms 10 gadiem
David Warkentin
49a79bd549
Fix link to instructions
The link to the installation and usage instructions does not work. This fixes it.
pirms 10 gadiem
Seth House
65c57dc315
Remove full Pillar example from README; see pillar.example instead
pirms 10 gadiem
Seth House
280ea54a65
Removed Jinja-esque placeholders from example Pillar; added instructions
The structure of this example file was quite confusing. Most of these
values are not required and should be denoted as such. Jinja notiation
to denote re-used Pillar values was also a bad and confusing choice.
Closes #8
pirms 10 gadiem
Seth House
b8f7ac33bf
Moved all Pillar examples under the same dictionary key
Having multiple different examples in the same file was causing
confusion.
pirms 10 gadiem
Joseph Hall
041fac4f48
Merge pull request #23 from mpeeters/patch-1
Fix typo
pirms 10 gadiem
Martin Peeters
b74df1871b
Fix typo
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
Joseph Hall
989ae09576
Merge pull request #20 from adamherzog/redhat-vhost-config-extension
Add vhost config file extension for RedHat-based distributions
pirms 11 gadiem
Adam Herzog
6a7448cb4b
Add confext (and missing vhostdir) parameters to pillar.example.
pirms 11 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
Forrest
b7edd43705
Merge pull request #19 from cedwards/master
added initial FreeBSD support
pirms 11 gadiem
Christer Edwards
36051f4353
removed unneeded wsgi_path
pirms 11 gadiem
Christer Edwards
001f2a9d9c
added initial FreeBSD support
pirms 11 gadiem
Seth House
641b70039a
Change optional deps list to be a bulleted list to match
pirms 11 gadiem
Seth House
aca9d6eeb3
Merge pull request #18 from gravyboat/master
Removed apt from items where it is not required, also modified fcgid to include apache as it requires the apache package.
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
Seth House
ad541eb5bf
Merge pull request #15 from bechtoldt/add_proxy_module_support
Adding mod_proxy and mod_proxy_http states
pirms 11 gadiem
Seth House
b1e2d39849
Merge pull request #16 from bechtoldt/improvements
setting the remaining changes caused by the change to module.wait
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
Joseph Hall
b118690c53
Merge pull request #14 from galet/master
States for apache-reload and apache-restart using module.wait not working
pirms 11 gadiem
Michal Galet
a3299dc1eb
States for apache-reload and apache-restart using module.wait not working
pirms 11 gadiem
Seth House
88d16e419a
Merge pull request #12 from Jorge-Rodriguez/master
CustomLog directive takes two parameters. Introduced LogFormat variable ...
pirms 11 gadiem
Jorge Rodriguez
845b58d15f
CustomLog directive takes two parameters. Introduced LogFormat variable and defaulted to "common" format.
pirms 11 gadiem