diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-11-27 14:49:23 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-11-27 14:49:23 -0200 |
| commit | e910ee31475d9a0636aae159714dbeab49c213af (patch) | |
| tree | 9bbc36a332d8c93244ff7549b30ac7099146e63f | |
| parent | 273d9ec6d4d3e4969fafa0f6df2e5c6c3fbf4e79 (diff) | |
| download | puppet-drupal-e910ee31475d9a0636aae159714dbeab49c213af.tar.gz puppet-drupal-e910ee31475d9a0636aae159714dbeab49c213af.tar.bz2 | |
Using drupal6.make
| -rw-r--r-- | files/drupal6.make (renamed from files/drupal.make) | 0 | ||||
| -rw-r--r-- | manifests/init.pp | 9 |
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'], } } |