aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-11-23 14:46:57 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-11-23 14:46:57 -0200
commit75f74ae6dfb413f4a4c2549124b36f1f85357ab4 (patch)
treeb4df55463f1747144ddf20d3517429ad1f6df609
parent30da9ca63f5576cac73292b6191b7d1ae1844aa4 (diff)
downloadpuppet-drupal-75f74ae6dfb413f4a4c2549124b36f1f85357ab4.tar.gz
puppet-drupal-75f74ae6dfb413f4a4c2549124b36f1f85357ab4.tar.bz2
Code organizationfeature/drush
-rw-r--r--manifests/init.pp30
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',
+ }
}