diff options
author | mh <mh@immerda.ch> | 2010-08-16 21:51:22 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2010-08-16 21:51:22 +0200 |
commit | b3a17cff5315fbbda901a6f1d406c3500cf65a3a (patch) | |
tree | 24333b39346d8f6334fba28deaba415bf1ce700e /manifests/ssl | |
parent | e8e48e7fc60d5551a315f9b0b6a01adfdc0e3558 (diff) |
fix various missing things for itk_plus mode
Diffstat (limited to 'manifests/ssl')
-rw-r--r-- | manifests/ssl/centos.pp | 4 | ||||
-rw-r--r-- | manifests/ssl/itk_plus/centos.pp | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/manifests/ssl/centos.pp b/manifests/ssl/centos.pp index b2c8ad8..7bc8c89 100644 --- a/manifests/ssl/centos.pp +++ b/manifests/ssl/centos.pp @@ -5,4 +5,8 @@ class apache::ssl::centos inherits apache::ssl::base { require => Package[apache], } ::apache::config::global{ 'ssl.conf': } + + apache::config::global{'00-listen-ssl.conf': + ensure => absent, + } } diff --git a/manifests/ssl/itk_plus/centos.pp b/manifests/ssl/itk_plus/centos.pp new file mode 100644 index 0000000..d8989c9 --- /dev/null +++ b/manifests/ssl/itk_plus/centos.pp @@ -0,0 +1,11 @@ +class apache::ssl::itk_plus::centos inherits apache::ssl::centos { + include apache::ssl::itk::centos + Apache::Config::Global['ssl.conf']{ + source => "apache/itk_plus/conf.d/${operatingsystem}/ssl.conf", + } + + apache::config::global{'00-listen-ssl.conf': + ensure => 'present', + content => template("apache/itk_plus/${operatingsystem}/00-listen-ssl.conf.erb"), + } +} |