diff options
Diffstat (limited to 'manifests/ssl')
| -rw-r--r-- | manifests/ssl/base.pp | 5 | ||||
| -rw-r--r-- | manifests/ssl/debian.pp | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/manifests/ssl/base.pp b/manifests/ssl/base.pp index 4aabb40..ff9baa5 100644 --- a/manifests/ssl/base.pp +++ b/manifests/ssl/base.pp @@ -1,4 +1,7 @@ class apache::ssl::base { - ::apache::config::include{ 'ssl_defaults.inc': } + ::apache::config::include{ 'ssl_defaults.inc': } + + if !$apache_no_default_site { ::apache::vhost::file{ '0-default_ssl': } + } } 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': } } |