diff options
| -rw-r--r-- | manifests/master/passenger.pp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/manifests/master/passenger.pp b/manifests/master/passenger.pp index f0df446..530d399 100644 --- 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"], + } } |