diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-03-02 23:40:25 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-03-02 23:40:25 +0000 |
| commit | 6f38c21e362b5b2a0b233b22cbc97e7e76cb704d (patch) | |
| tree | f5d92c7f4958e2aeca0525a63f41701d68cf49c7 /modules | |
| parent | ef9df57ec73f67fcef34be8a7ab047c8255c42f2 (diff) | |
| download | puppet-6f38c21e362b5b2a0b233b22cbc97e7e76cb704d.tar puppet-6f38c21e362b5b2a0b233b22cbc97e7e76cb704d.tar.gz puppet-6f38c21e362b5b2a0b233b22cbc97e7e76cb704d.tar.bz2 puppet-6f38c21e362b5b2a0b233b22cbc97e7e76cb704d.tar.xz puppet-6f38c21e362b5b2a0b233b22cbc97e7e76cb704d.zip | |
only install default ssl vhost when mod_ssl is used
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/apache/manifests/init.pp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index 8a9bd783..d528ebee 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -38,16 +38,6 @@ class apache { content => template("apache/00_default_vhosts.conf") } - file { "01_default_ssl_vhost.conf": - path => '/etc/httpd/conf/vhosts.d/01_default_ssl_vhost.conf', - ensure => "present", - owner => root, - group => root, - mode => 644, - notify => Service['apache'], - require => Package["apache-conf"], - content => template("apache/01_default_ssl_vhost.conf") - } } class mod_php inherits base { @@ -92,6 +82,17 @@ class apache { package { "apache-mod_ssl": ensure => installed } + + file { "01_default_ssl_vhost.conf": + path => '/etc/httpd/conf/vhosts.d/01_default_ssl_vhost.conf', + ensure => "present", + owner => root, + group => root, + mode => 644, + notify => Service['apache'], + require => Package["apache-conf"], + content => template("apache/01_default_ssl_vhost.conf") + } } class mod_wsgi inherits base { |