summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-08-02 12:44:10 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-08-02 12:44:10 -0300
commit1658794f138827a7d4d115d4896d93c65b937a64 (patch)
treeb74638623990c5381f9b29685d5959dc90a5e372 /manifests
parent2f93ac4ad08c6152463beecd5dec109da00bdda6 (diff)
downloadpuppet-puppet-1658794f138827a7d4d115d4896d93c65b937a64.tar.gz
puppet-puppet-1658794f138827a7d4d115d4896d93c65b937a64.tar.bz2
Update vhost for apache 2.4 compatibility
Diffstat (limited to 'manifests')
-rw-r--r--manifests/master/passenger.pp15
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"],
+ }
}