Updates CLI

1 files changed, 10 insertions, 2 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 4bc2a34..93befc8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,6 +1,8 @@
 class wordpress {
   $wp_cli = 'https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar'
 
+  include php::composer
+
   file { "/usr/local/bin/wordpress":
     ensure => present,
     source => "puppet:///modules/wordpress/wordpress.sh",
@@ -9,11 +11,17 @@ class wordpress {
     mode   => 755,
   }
 
-  # Composer
+  # Wordpress command line
   exec { 'getwp':
-    command => "/usr/bin/wget ${wp_cli} -O /usr/local/bin/wp-cli && chmod +x /usr/local/bin/wp-cli",
+    command => "/usr/bin/wget ${wp_cli} -O /usr/local/bin/wp && chmod +x /usr/local/bin/wp",
     user    => 'root',
     cwd     => '/tmp',
     creates => '/usr/local/bin/wp-cli',
+    require => Exec['getcomposer'],
+  }
+
+  # Old location
+  file { '/usr/local/bin/wp-cli':
+    ensure => absent,
   }
 }