diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/ssl/debian.pp | 9 | ||||
| -rw-r--r-- | manifests/vhost.pp | 6 | ||||
| -rw-r--r-- | manifests/vhost/php/standard.pp | 4 | ||||
| -rw-r--r-- | manifests/vhost/template.pp | 3 |
4 files changed, 13 insertions, 9 deletions
diff --git a/manifests/ssl/debian.pp b/manifests/ssl/debian.pp index 10b1631..99dfe36 100644 --- a/manifests/ssl/debian.pp +++ b/manifests/ssl/debian.pp @@ -1,9 +1,4 @@ class apache::ssl::debian inherits apache::ssl::base { - line { 'apache_debian_ssl_port': - file => "${apache::debian::config_dir}/ports.conf", - line => "Listen 443", - ensure => present, - require => Package['apache'], - notify => Service['apache'], - } + apache::debian::module { 'ssl': ensure => present } + apache::config::global { 'ssl.conf': } } diff --git a/manifests/vhost.pp b/manifests/vhost.pp index f1a20f0..1f2db90 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -30,6 +30,8 @@ define apache::vhost( $php_use_pear = false, $php_safe_mode = true, $php_default_charset = 'absent', + $php_additional_open_basedirs = 'absent', + $php_additional_options = 'absent', $cgi_binpath = 'absent', $default_charset = 'absent', $do_includes = false, @@ -83,6 +85,8 @@ define apache::vhost( php_use_pear => $php_use_pear, php_safe_mode => $php_safe_mode, php_default_charset => $php_default_charset, + php_additional_open_basedirs => $php_additional_open_basedirs, + php_additional_options => $php_additional_options, run_mode => $run_mode, run_uid => $run_uid, run_gid => $run_gid, @@ -98,6 +102,4 @@ define apache::vhost( } default: { fail("no such vhost_mode: $vhost_mode defined for $name.") } } - } - diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index a6e2ff0..6a83a42 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -35,6 +35,8 @@ define apache::vhost::php::standard( $php_safe_mode = true, $php_safe_mode_exec_bins = 'absent', $php_default_charset = 'absent', + $php_additional_open_basedirs = 'absent', + $php_additional_options = 'absent', $do_includes = false, $options = 'absent', $additional_options = 'absent', @@ -146,6 +148,8 @@ define apache::vhost::php::standard( php_use_pear => $php_use_pear, php_safe_mode => $php_safe_mode, php_default_charset => $real_php_default_charset, + php_additional_open_basedirs => $php_additional_open_basedirs, + php_additional_options => $php_additional_options, ssl_mode => $ssl_mode, htpasswd_file => $htpasswd_file, htpasswd_path => $htpasswd_path, diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index bba3437..324a96a 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -42,6 +42,8 @@ define apache::vhost::template( $php_use_pear = false, $php_safe_mode = true, $php_default_charset = 'absent', + $php_additional_open_basedirs = 'absent', + $php_additional_options = 'absent', $run_mode = 'normal', $run_uid = 'absent', $run_gid = 'absent', @@ -105,6 +107,7 @@ define apache::vhost::template( } } + # set default dirs for templates # php php_safe_mode_exec_bin directory case $php_safe_mode_exec_bin_dir { |