aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/drupal6.make (renamed from files/drupal.make)0
-rw-r--r--manifests/init.pp9
2 files changed, 8 insertions, 1 deletions
diff --git a/files/drupal.make b/files/drupal6.make
index b811cfa..b811cfa 100644
--- a/files/drupal.make
+++ b/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'],
}
}