diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-12 13:23:29 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-12 14:37:28 -0400 |
| commit | 115691c87bad3f5863f088e73603133b67c9f828 (patch) | |
| tree | bbfd7b5c0d0c220ef3e52eb25acd4595a46b85d0 /manifests/include | |
| parent | 2401aae6c4785c1e6a777756bebe70c38b889727 (diff) | |
| parent | 5ec141dfbf218dd9b2f2611d788db98f74e65073 (diff) | |
Merge remote-tracking branch 'immerda/master'
Fixed apache_no_default_site variable to be a parameter to the apache
class (no_default_site = false)
Conflicts:
files/include.d/Debian/ssl_defaults.inc
manifests/base.pp
manifests/config/file.pp
manifests/vhost.pp
manifests/vhost/php/standard.pp
manifests/vhost/template.pp
templates/vhosts/php/CentOS.erb
templates/vhosts/php/Debian.erb
Diffstat (limited to 'manifests/include')
| -rw-r--r-- | manifests/include/joomla.pp | 3 | ||||
| -rw-r--r-- | manifests/include/mod_fcgid.pp | 7 | ||||
| -rw-r--r-- | manifests/include/silverstripe.pp | 3 |
3 files changed, 13 insertions, 0 deletions
diff --git a/manifests/include/joomla.pp b/manifests/include/joomla.pp new file mode 100644 index 0000000..5adae30 --- /dev/null +++ b/manifests/include/joomla.pp @@ -0,0 +1,3 @@ +class apache::include::joomla { + apache::config::include{'joomla.inc': } +} diff --git a/manifests/include/mod_fcgid.pp b/manifests/include/mod_fcgid.pp new file mode 100644 index 0000000..b3c1cdc --- /dev/null +++ b/manifests/include/mod_fcgid.pp @@ -0,0 +1,7 @@ +class apache::include::mod_fcgid { + apache::config::global{'mod_fcgid.conf': + content => "<IfModule mod_fcgid.c> + FcgidFixPathinfo 1 +</IfModule>\n" + } +} diff --git a/manifests/include/silverstripe.pp b/manifests/include/silverstripe.pp new file mode 100644 index 0000000..fd2484b --- /dev/null +++ b/manifests/include/silverstripe.pp @@ -0,0 +1,3 @@ +class apache::include::silverstripe { + apache::config::include{'silverstripe.inc': } +} |