Brad Thurber
0f0d5318e5
make modules.sls compatible with RHEL/CentOS Apache 2.2
2015-03-24 15:41:08 -04: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
Adam Herzog
1888584b94
Add config file extension (confext) to parameter map.
2014-02-09 09:11:55 -05:00
Christer Edwards
36051f4353
removed unneeded wsgi_path
2014-01-29 19:14:50 -07:00
Christer Edwards
001f2a9d9c
added initial FreeBSD support
2014-01-29 19:12:47 -07:00
Forrest Alvarez
3535ecae9a
Removed apt from items where it is not required, also modified fcgid to include apache as it requires the apache package.
2014-01-20 20:47:04 +00:00
Seth House
ad541eb5bf
Merge pull request #15 from bechtoldt/add_proxy_module_support
...
Adding mod_proxy and mod_proxy_http states
2014-01-08 07:30:39 -08:00
Arnold Bechtoldt
d60aca39cb
setting the correct parameter values for watch_in
2014-01-04 23:54:45 +01:00
Arnold Bechtoldt
1fce705bc0
setting the remaining changes caused by the change of cmd.wait to .module.wait in init.sls
2014-01-04 23:46:47 +01:00
Arnold Bechtoldt
b45a5f4fc4
adding mod_proxy and mod_proxy_http states, updating the README doc
2014-01-04 19:29:22 +01:00
Michal Galet
a3299dc1eb
States for apache-reload and apache-restart using module.wait not working
2014-01-04 11:59:39 +00:00
Jorge Rodriguez
845b58d15f
CustomLog directive takes two parameters. Introduced LogFormat variable and defaulted to "common" format.
2013-11-29 10:19:16 +02:00
Seth House
950ce07185
Change cmd.wait to module.wait for platform independence
2013-11-05 14:54:56 -08:00
Alan McNea
92b167ffa8
Added vhost_alias.sls for that apache mod
2013-11-05 20:06:10 +00:00
Alan McNea
f153c78ba8
Added apache include and requires to php5.sls and rewrite.sls
2013-11-05 20:05:28 +00:00
Alan McNea
c863598ec7
Moved apache-reload and apache-restart commands to init.sls and invoke apache-reload from standard.sls
2013-11-05 19:34:06 +00:00
Alan McNea
e34c476ea1
Added DirectoryIndex, UseCanonicalName, and VirtualDocumentRoot properties to standard.tmpl
2013-11-05 19:32:49 +00:00
Alan McNea
b51e442440
Fixed bugs in standard.tmpl
2013-11-05 19:32:03 +00:00
Seth House
f1cff2dd22
Renamed package-map.jinja to map.jinja; is used for more than package names
2013-09-03 13:28:00 -06:00
Seth House
2499a50135
Added apache.vhost formula
2013-08-29 02:10:23 -06:00
Seth House
a58bfa6d0f
Added a few common directories to package-map.jinja
2013-08-29 02:10:22 -06:00
Seth House
d0c958dd87
mod_wsgi requires apache
2013-08-26 20:54:38 -06:00
Seth House
3f8a1edb97
Added mod_wsgi to package-map
2013-08-26 20:54:37 -06:00
Seth House
66683570e9
Added package-map.jinja
2013-08-26 20:42:11 -06:00
Seth House
5550f85bd9
Added a mod_wsgi state
2013-08-13 16:52:36 -06:00
Seth House
effba317fd
Updated Debian-family formula to work on all Debian-family OSes
2013-08-13 15:03:42 -06:00
Seth House
746bbb9db3
Updated Debian-family formula to use main sls but keep custom ordering
2013-08-13 15:03:42 -06:00
Seth House
053c3443d7
Added basic formula to install Apache
2013-08-13 15:03:42 -06:00
