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_joomla/php_joomla.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'templates/vhosts/php_joomla')

diff --git a/templates/vhosts/php_joomla/php_joomla.erb b/templates/vhosts/php_joomla/php_joomla.erb
index a5f0d13..4bfef81 100644
--- a/templates/vhosts/php_joomla/php_joomla.erb
+++ b/templates/vhosts/php_joomla/php_joomla.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 -%>
@@ -27,7 +27,7 @@
     <%- end -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
-        Include conf.d/joomla.inc
+        Include include.d/joomla.inc
 
         AllowOverride <%= allow_override %>
         <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
@@ -99,8 +99,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 -%>
@@ -122,7 +122,7 @@
     AddDefaultCharset <%= default_charset %>
     <%- end -%>
     <Directory "<%= documentroot %>/">
-        Include conf.d/joomla.inc
+        Include include.d/joomla.inc
 
         AllowOverride <%= allow_override %>
         <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
-- 
cgit v1.2.3