From d06a9422614bf3aad51ce119fc95a4e85ede24a9 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 27 Nov 2010 15:28:05 -0200
Subject: Oops

---
 manifests/init.pp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index 20fc5bb..5ddd1c9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -42,19 +42,12 @@ 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":
+  file { "/usr/local/share/drupal/drupal6.make":
     ensure  => present,
     owner   => root,
     group   => root,
     mode    => 644,
-    source  => "puppet://$server/modules/drupal/drupal6.make",
+    source  => "puppet:///modules/drupal/drupal6.make",
     require => File['/usr/local/share/drupal'],
   }
 }
-- 
cgit v1.2.3