From fbb3cb7dcd8406f085e80f3f11fa873b55bd5073 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 17 May 2009 22:27:05 +0200 Subject: extracted every define and class in it's own file --- manifests/ssl/base.pp | 4 ++++ manifests/ssl/centos.pp | 8 ++++++++ manifests/ssl/itk.pp | 6 ------ manifests/ssl/itk/centos.pp | 6 ++++++ manifests/ssl/openbsd.pp | 18 ++++++++++++++++++ 5 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 manifests/ssl/base.pp create mode 100644 manifests/ssl/centos.pp create mode 100644 manifests/ssl/itk/centos.pp create mode 100644 manifests/ssl/openbsd.pp (limited to 'manifests/ssl') diff --git a/manifests/ssl/base.pp b/manifests/ssl/base.pp new file mode 100644 index 0000000..72f61fd --- /dev/null +++ b/manifests/ssl/base.pp @@ -0,0 +1,4 @@ +class apache::ssl::base { + ::apache::config::file{ 'ssl_defaults.inc': } + ::apache::vhost::file{ '0-default_ssl': } +} diff --git a/manifests/ssl/centos.pp b/manifests/ssl/centos.pp new file mode 100644 index 0000000..a516f02 --- /dev/null +++ b/manifests/ssl/centos.pp @@ -0,0 +1,8 @@ +class apache::ssl::centos inherits apache::ssl::base { + package { 'mod_ssl': + name => 'mod_ssl', + ensure => present, + require => Package[apache], + } + ::apache::config::file{ 'ssl.conf': } +} diff --git a/manifests/ssl/itk.pp b/manifests/ssl/itk.pp index 910a48d..62c96cf 100644 --- a/manifests/ssl/itk.pp +++ b/manifests/ssl/itk.pp @@ -6,9 +6,3 @@ class apache::ssl::itk inherits apache::ssl { } } -class apache::ssl::itk::centos inherits apache::ssl::centos { - Package['mod_ssl']{ - name => 'mod_ssl-itk', - } -} - diff --git a/manifests/ssl/itk/centos.pp b/manifests/ssl/itk/centos.pp new file mode 100644 index 0000000..fb6a4a6 --- /dev/null +++ b/manifests/ssl/itk/centos.pp @@ -0,0 +1,6 @@ +class apache::ssl::itk::centos inherits apache::ssl::centos { + Package['mod_ssl']{ + name => 'mod_ssl-itk', + } +} + diff --git a/manifests/ssl/openbsd.pp b/manifests/ssl/openbsd.pp new file mode 100644 index 0000000..04dadeb --- /dev/null +++ b/manifests/ssl/openbsd.pp @@ -0,0 +1,18 @@ +class apache::ssl::openbsd inherits apache::openbsd { + include apache::ssl::base + + Line['enable_apache_on_boot']{ + ensure => 'absent', + } + line{'enable_apachessl_on_boot': + file => '/etc/rc.conf.local', + line => 'httpd flags="-DSSL"', + } + + File['/opt/bin/restart_apache.sh']{ + source => "puppet://$server/apache/OpenBSD/bin/restart_apache_ssl.sh", + } + Service['apache']{ + start => 'apachectl startssl', + } +} -- cgit v1.2.3