diff --git a/apache/manifests/init.pp b/apache/manifests/init.pp index 905a416..2c4150f 100644 --- a/apache/manifests/init.pp +++ b/apache/manifests/init.pp @@ -449,7 +449,7 @@ class apache::mod::include { # Install mod_fcgid. # -class apache::mod::fcgid { +class apache::mod::fcgid($http=true, $https=true) { package { "mod_fcgid": name => $::operatingsystem ? { @@ -468,7 +468,7 @@ class apache::mod::fcgid { } } "centos","redhat","fedora": { - if defined(Class["apache::server"]) { + if $http == true and defined(Class["apache::server"]) { file { "/var/run/mod_fcgid": ensure => directory, mode => "0755", @@ -481,7 +481,7 @@ class apache::mod::fcgid { https => false, } } - if defined(Class["apache::sslserver"]) { + if $https == true and defined(Class["apache::sslserver"]) { file { "/var/run/mod_fcgid_httpsd": ensure => directory, mode => "0755", @@ -539,7 +539,7 @@ class apache::mod::ldap { # Install mod_passenger. # -class apache::mod::passenger { +class apache::mod::passenger($http=true, $https=true) { package { "mod_passenger": name => $::operatingsystem ? { @@ -559,6 +559,8 @@ class apache::mod::passenger { } "centos","redhat","fedora": { apache::configfile { "passenger.conf": + http => $http, + https => $https, require => Package["mod_passenger"], } } @@ -579,7 +581,7 @@ class apache::mod::passenger { # Install mod_perl. # -class apache::mod::perl { +class apache::mod::perl($http=true, $https=true) { package { "mod_perl": name => $::operatingsystem ? { @@ -599,6 +601,8 @@ class apache::mod::perl { } "centos","redhat","fedora": { apache::configfile { "perl.conf": + http => $http, + https => $https, require => Package["mod_perl"], } } @@ -612,7 +616,7 @@ class apache::mod::perl { # Install PHP. # -class apache::mod::php { +class apache::mod::php($http=true, $https=true) { package { "php": name => $::operatingsystem ? { @@ -632,6 +636,8 @@ class apache::mod::php { } "centos","redhat","fedora": { apache::configfile { "php.conf": + http => $http, + https => $https, require => Package["php"], } } @@ -702,7 +708,7 @@ class apache::mod::proxy_balancer { # Install mod_python. # -class apache::mod::python { +class apache::mod::python($http=true, $https=true) { package { "mod_python": name => $::operatingsystem ? { @@ -722,6 +728,8 @@ class apache::mod::python { } "centos","redhat","fedora": { apache::configfile { "python.conf": + http => $http, + https => $https, require => Package["mod_python"], } } @@ -752,7 +760,7 @@ class apache::mod::rewrite { # Install mod_wsgi. # -class apache::mod::wsgi { +class apache::mod::wsgi($http=true, $https=true) { package { "mod_wsgi": name => $::operatingsystem ? { @@ -779,6 +787,8 @@ class apache::mod::wsgi { before => Apache::Configfile["wsgi.conf"], } apache::configfile { "wsgi.conf": + http => $http, + https => $https, source => "puppet:///modules/apache/wsgi.conf", require => Package["mod_wsgi"], }