Adding wp-cli support for wordpress script

diff --git a/manifests/init.pp b/manifests/init.pp
index e144c1d680983bfaa52c743b6a03538898596a22..d3a162bba57f22559b9277ad3fee7a89e50cb31f 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -22,4 +22,12 @@ class wordpress {
     mode    => 755,
   }
 
+  vcsrepo { "/usr/local/share/wp-cli":
+    ensure   => present,
+    provider => git,
+    source   => 'git://github.com/wp-cli/wp-cli.git',
+    revision => '0d8487b771afbaf1acd8c086e088f9d3601c3395',
+    owner    => 'root',
+    group    => 'root',
+  }
 }

diff --git a/templates/wordpress.sh.erb b/templates/wordpress.sh.erb
index 05ab92838758e9bdd4f40c20871b76857aa5eca8..9fccd26c82960a9a5a19e2e1acf6f0d349471020 100644 (file)
--- a/templates/wordpress.sh.erb
+++ b/templates/wordpress.sh.erb
@@ -126,9 +126,14 @@ function wordpress_upgrade {
   echo "Check procedure and remove wordpress-$old once you make sure that everything is fine."
 }
 
+# Usage
+function wordpress_usage {
+  echo "Usage: `basename $0` <deploy|upgrade> [arguments]"
+}
+
 # Main procedure
 if [ -z "$1" ]; then
-  echo "Usage: `basename $0` <deploy|upgrade> [arguments]"
+  wordpress_usage
   exit 1
 elif [ "$1" == "deploy" ]; then
   shift
@@ -136,4 +141,11 @@ elif [ "$1" == "deploy" ]; then
 elif [ "$1" == "upgrade" ]; then
   shift
   wordpress_upgrade $*
+elif [ "$1" == "help" ]; then
+  wordpress_usage
+  /usr/local/share/wp-cli/src/bin/wp help
+else
+  # Send all other requests to wp-cli 
+  shift
+  /usr/local/share/wp-cli/src/bin/wp $*
 fi