diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-11-09 22:14:05 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-11-09 22:14:05 +0000 |
| commit | 5b60bffdc9603975cf9d2642e414b93d1043eb8a (patch) | |
| tree | a9062cb288fb3e9881f1ffd246c5e4246f0af4c8 /modules/apache | |
| parent | 0e16990becf746d2f141919b80aab0f1a7cb7e53 (diff) | |
| download | puppet-5b60bffdc9603975cf9d2642e414b93d1043eb8a.tar puppet-5b60bffdc9603975cf9d2642e414b93d1043eb8a.tar.gz puppet-5b60bffdc9603975cf9d2642e414b93d1043eb8a.tar.bz2 puppet-5b60bffdc9603975cf9d2642e414b93d1043eb8a.tar.xz puppet-5b60bffdc9603975cf9d2642e414b93d1043eb8a.zip | |
only add NameVirtualHost on port 443 when mod_ssl has been selected
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/manifests/init.pp | 11 | ||||
| -rw-r--r-- | modules/apache/templates/customization.conf | 1 | ||||
| -rw-r--r-- | modules/apache/templates/ssl.conf | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index d49cadbf..94405a43 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -106,6 +106,17 @@ class apache { require => Package["apache-conf"], content => template("apache/01_default_ssl_vhost.conf") } + + file { "ssl.conf": + ensure => present, + path => "/etc/httpd/conf.d/ssl.conf", + content => template("apache/ssl.conf"), + require => Package["apache-conf"], + notify => Service["apache"], + owner => root, + group => root, + mode => 644, + } } class mod_wsgi inherits base { diff --git a/modules/apache/templates/customization.conf b/modules/apache/templates/customization.conf index 81424c42..41e15e3a 100644 --- a/modules/apache/templates/customization.conf +++ b/modules/apache/templates/customization.conf @@ -1,2 +1 @@ NameVirtualHost *:80 -NameVirtualHost *:443 diff --git a/modules/apache/templates/ssl.conf b/modules/apache/templates/ssl.conf new file mode 100644 index 00000000..bcfe8201 --- /dev/null +++ b/modules/apache/templates/ssl.conf @@ -0,0 +1 @@ +NameVirtualHost *:443 |