From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 2 Aug 2015 15:18:13 +0000 (-0300)
Subject: Switch to default.conf vhost
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d8b13a863d928e3a8a46b05396ba7a5ae5a52829;p=puppet-apache.git

Switch to default.conf vhost
---

diff --git a/manifests/init.pp b/manifests/init.pp
index d4ea486..2960e2f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -157,8 +157,14 @@ class apache(
                  "puppet:///modules/apache/icons", ]
   }
 
+  # Legacy configuration
+  file { [ "${sites}-available/default", "${sites}-enabled/000-default" ]:
+    ensure => absent,
+    notify => Service["apache"],
+  }
+
   # default site configuration
-  file { "${sites}-available/default":
+  file { "${sites}-available/default.conf":
     ensure  => present,
     content => template('apache/default.erb'),
     owner   => root,
@@ -167,6 +173,13 @@ class apache(
     notify  => Service["apache"],
   }
 
+  file { "${sites}-enabled/000-default.conf":
+    owner  => root,
+    group  => root,
+    ensure => "${sites}-available/default.conf",
+    notify => Service["apache"],
+  }
+
   # https proxy configuration
   # see http://www.metaltoad.com/blog/running-drupal-secure-pages-behind-proxy
   file { "$conf_d/https-proxy":