diff options
| -rw-r--r-- | manifests/init.pp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index adb79f5..11a58f0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -151,6 +151,14 @@ class drupal( backup => false, } + # Composer + exec { 'getcomposer': + command => '/usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php && /bin/mv composer.phar /usr/local/bin/composer', + user => 'root', + cwd => '/tmp', + creates => '/usr/local/bin/composer', + } + #vcsrepo { "/usr/local/share/drush": # ensure => present, # provider => git, @@ -160,14 +168,6 @@ class drupal( # group => 'root', #} - # Composer - exec { 'getcomposer': - command => '/usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php && /bin/mv composer.phar /usr/local/bin/composer', - user => 'root', - cwd => '/tmp', - creates => '/usr/local/bin/composer', - } - #file { "/usr/local/bin/drush": # ensure => '/usr/local/share/drush/drush', # owner => root, @@ -175,13 +175,6 @@ class drupal( # require => [ Vcsrepo['/usr/local/share/drush'], Exec['getcomposer'] ], #} - exec { 'getdrush': - command => '/usr/bin/wget https://github.com/drush-ops/drush/releases/download/8.0.0/drush.phar -O /usr/local/bin/drush && chmod +x /usr/local/bin/drush', - user => 'root', - cwd => '/tmp', - creates => '/usr/local/bin/drush', - } - #exec { 'composer-drush': # command => '/usr/local/bin/composer global require drush/drush:dev-master', # user => 'vagrant', @@ -189,4 +182,11 @@ class drupal( # environment => [ 'COMPOSER_HOME="/vagrant"' ], # require => Exec['getcomposer'], #} + + exec { 'getdrush': + command => '/usr/bin/wget https://github.com/drush-ops/drush/releases/download/8.0.0/drush.phar -O /usr/local/bin/drush && chmod +x /usr/local/bin/drush', + user => 'root', + cwd => '/tmp', + creates => '/usr/local/bin/drush', + } } |