Code organization

diff --git a/manifests/init.pp b/manifests/init.pp
index adb79f54ec74f3743acd41d9c13320b4588b12f0..11a58f0d5d9d8da5b929b52e0bde1685a098e366 100644 (file)
--- 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',
+  }
 }