20 Commits

Author SHA1 Message Date
Reid Vandewiele
d3d0d23d06 Re-enable local php class
Previously, commit 8a56ee91 removed local control of the apache::php_package
management in favor of "include php". However, no dependency was added to the
Modulefile and to date the php module referenced in apache::php has not been
released.

This commit reinstates apache local class management of php to the apache::php
class (at least until such time as the puppetlabs-php module is released).
2012-02-29 20:17:54 -08:00
Garrett Honeycutt
c3b7dccd5d Merge pull request #9 from kelseyhightower/ticket/master/11706_apache_depends_on_puppetlabs_firewall
(#11706) puppetlabs-apache depends on puppetlabs-firewall
2012-01-21 17:05:20 -08:00
Kelsey Hightower
88a2ac6388 (#11706) puppetlabs-apache depends on puppetlabs-firewall
Without this patch puppetlabs-apache does not depend on
puppetlabs-firewall.

This patch solves this problem by updating the Modulefile to specify
the dependency on puppetlabs-firewall.
2012-01-21 18:04:28 -05:00
Ken Barber
abe53133b6 Merge branch 'ticket/11071-firewall_module_update'
* ticket/11071-firewall_module_update:
  (#11071) Fix to work with latest firewall module
2011-12-01 01:07:35 +00:00
David Alden
a776a8b46d (#11071) Fix to work with latest firewall module
The firewall module deprecated the use of jump => accept, this patch now
changes this parameter to action => accept making it compatible with the
latest release.
2011-12-01 01:05:56 +00:00
Ken Barber
6c378a219e Merge branch 'ticket/11070-scientific_linux'
* ticket/11070-scientific_linux:
  (#11070) Add support for Scientific Linux
2011-12-01 00:58:34 +00:00
David Alden
2b79e8bdd1 (#11070) Add support for Scientific Linux
This patch adds Scientific Linux to the various case statements so it is
supported. This also fixed the various templates so that the log location
is variable depending on weither the OS is Redhat based or Debian based.
2011-12-01 00:56:45 +00:00
James Turnbull
f1001b367e Merge pull request #2 from glarizza/feature/master/apache_refactor
Refactor puppetlabs-apache
2011-07-16 12:46:11 -07:00
Gary Larizza
405b3e9026 Fix for a2mod
This dummy provider will fix an issue where a2mod is to
be installed in the current puppet run, yet it can't be found.
2011-07-15 15:28:46 -07:00
Gary Larizza
57b904839b Commit apache::vhost::redirect Manifest 2011-07-15 15:27:50 -07:00
Gary Larizza
8862d013e6 Commit apache::vhost::proxy Manifest 2011-07-15 15:27:39 -07:00
Gary Larizza
d5c1fd0185 Commit apache::mod::wsgi Manifest 2011-07-15 15:27:27 -07:00
Gary Larizza
a825ac7d8d Commit apache::mod::python Manifest 2011-07-15 15:27:14 -07:00
Gary Larizza
b77062f595 Commit Templates 2011-07-15 15:26:35 -07:00
Gary Larizza
9a51b4aa8d Vhost File Declarations
Include apache::vhost file declarations and templates.
2011-07-15 15:26:22 -07:00
Gary Larizza
6cf7312ff3 Defaults for Parameters
Set sane default parameters for the apache::vhost subclass
and enter them into apache::params.
2011-07-15 15:25:31 -07:00
Gary Larizza
6a5b11a4e0 Ensure installed
Use installed vs. present syntax
2011-07-15 15:23:46 -07:00
Gary Larizza
f672e46905 a2mod fix
Only use @a2mod if you're running an OS that supports it.
2011-07-15 15:23:24 -07:00
Zach
8a56ee91f0 add pthon support to apache 2010-11-21 16:34:48 -05:00
James Turnbull
35721a3f35 Initial commit 2010-09-01 18:01:04 -04:00