aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-11-27 15:28:05 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-11-27 15:28:05 -0200
commitd06a9422614bf3aad51ce119fc95a4e85ede24a9 (patch)
tree49f6fac8518babc3bca343a3d49762fb2b49ff8e
parent6cb5b709dd7eadc2d7dbd8fe4fcf57ab695911a9 (diff)
downloadpuppet-drupal-d06a9422614bf3aad51ce119fc95a4e85ede24a9.tar.gz
puppet-drupal-d06a9422614bf3aad51ce119fc95a4e85ede24a9.tar.bz2
Oops
-rw-r--r--manifests/init.pp11
1 files changed, 2 insertions, 9 deletions
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'],
}
}