Update vhost for apache 2.4 compatibility

diff --git a/manifests/master/passenger.pp b/manifests/master/passenger.pp
index f0df446b842a85daa8d4ff93366ecda152309c19..530d3999ff8d679ef014c062069b41e57320b627 100644 (file)
--- a/manifests/master/passenger.pp
+++ b/manifests/master/passenger.pp
@@ -24,8 +24,14 @@ class puppet::master::passenger {
   $listen   = hiera('puppet::daemon::port', '8140')
   $certname = hiera('puppet::master::certname', "puppet.${::domain}")
 
+  # Legacy configuration
+  file { [ '/etc/apache2/sites-available/puppetmaster', '/etc/apache2/sites-enabled/puppetmaster' ]:
+    ensure => absent,
+    notify => Service['apache'],
+  }
+
   # manage puppetmaster vhost
-  file { '/etc/apache2/sites-available/puppetmaster':
+  file { '/etc/apache2/sites-available/puppetmaster.conf':
     ensure  => present,
     owner   => root,
     group   => root,
@@ -33,4 +39,11 @@ class puppet::master::passenger {
     content => template("puppet/passenger.erb"),
     notify  => Service['apache'],
   }
+
+  file { "/etc/apache2/sites-enabled/puppetmaster.conf":
+    owner  => root,
+    group  => root,
+    ensure => "/etc/apache2/sites-available/puppetmaster.conf",
+    notify => Service["apache"],
+  }
 }