From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 27 Nov 2010 16:49:23 +0000 (-0200)
Subject: Using drupal6.make
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e910ee31475d9a0636aae159714dbeab49c213af;p=puppet-drupal.git

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 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'],
   }
 }