From d2c4bdf792815f0a0f54d717bdec619f03d984ab Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 23 Dec 2009 16:06:45 -0500
Subject: introduce config::global for global configs in conf.d and
 config::include for vhost snippets in include.d

---
 templates/vhosts/php/php.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates/vhosts/php')

diff --git a/templates/vhosts/php/php.erb b/templates/vhosts/php/php.erb
index 84e5c26..411bfd6 100644
--- a/templates/vhosts/php/php.erb
+++ b/templates/vhosts/php/php.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -76,8 +76,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
-- 
cgit v1.2.3