Using drupal6.make

diff --git a/files/drupal.make b/files/drupal6.make
similarity index 100%
rename from files/drupal.make
rename to files/drupal6.make

diff --git a/manifests/init.pp b/manifests/init.pp
index ceeea07ee4ca1bb754ef6a9c1027b6ab632f006a..5333d9b4c1367d9c8400832a5d2050020404ef02 100644 (file)
--- 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'],
   }
 }