From e910ee31475d9a0636aae159714dbeab49c213af Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 27 Nov 2010 14:49:23 -0200
Subject: Using drupal6.make

---
 manifests/init.pp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index ceeea07..5333d9b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -42,12 +42,19 @@ class drupal inherits pear {
   }
 
   # Drupal makefile
+  # TODO: remove in the long run
   file { "/usr/share/drupal/drupal.make":
+    ensure  => absent,
+    require => File['/usr/local/share/drupal'],
+  }
+
+  # Drupal makefile
+  file { "/usr/share/drupal/drupal6.make":
     ensure  => present,
     owner   => root,
     group   => root,
     mode    => 755,
-    source  => "puppet:///modules/drupal/drupal.make",
+    source  => "puppet:///modules/drupal/drupal6.make",
     require => File['/usr/local/share/drupal'],
   }
 }
-- 
cgit v1.2.3