aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-11-27 14:49:23 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-11-27 14:49:23 -0200
commite910ee31475d9a0636aae159714dbeab49c213af (patch)
tree9bbc36a332d8c93244ff7549b30ac7099146e63f /manifests
parent273d9ec6d4d3e4969fafa0f6df2e5c6c3fbf4e79 (diff)
downloadpuppet-drupal-e910ee31475d9a0636aae159714dbeab49c213af.tar.gz
puppet-drupal-e910ee31475d9a0636aae159714dbeab49c213af.tar.bz2
Using drupal6.make
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp9
1 files changed, 8 insertions, 1 deletions
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'],
}
}