Add drush

common-tasks/mysql-secure.yml

@@ -2,6 +2,8 @@
 ##
 # MySQL database setup, this does the equivalent of mysql_secure_installation.
 #
+# Distribution independent.
+#
 - name: Set the root password.
  action: mysql_user user=root password=$mysql_root_password host=localhost
  tags: common

ubuntu-10.04-lamp-dev/run-local-all

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # Script for running the play on the localhost, everything included.
-ansible-playbook -c local --tags="common" ./setup.yml
+ansible-playbook -c local --tags="common,drush" ./setup.yml

ubuntu-10.04-lamp-dev/setup.yml

@@ -71,6 +71,11 @@
  action: command a2ensite devserver
  tags: common
 
+ ##
+ # Drush install, a Drupal shell tool.
+ #
+ - include: ../common-tasks/ubuntu-drush.yml
+
  ##
  # Restart services
  #
@@ -81,7 +86,3 @@
  - name: Restart MySQL
  action: service name=mysql state=restarted
  tags: common
-
- - name: Restart vsftpd
- action: service name=vsftpd state=restarted
- tags: ftp

ubuntu-12.04-lamp-dev/setup.yml

@@ -90,17 +90,7 @@
  ##
  # Drush install, a Drupal shell tool.
  #
- - name: PEAR for obtaining drush.
- action: apt pkg=php-pear state=installed
- tags: drush
-
- - name: Setup PEAR channel for drush
- action: command pear channel-discover pear.drush.org creates=/usr/share/php/.channels/pear.drush.org.reg
- tags: drush
-
- - name: Install drush for Drupal
- action: command pear install drush/drush creates=/usr/bin/drush
- tags: drush
+ - include: ../common-tasks/ubuntu-drush.yml
 
  ##
  # node.js installation (latest stable instead of Ubuntu's out-of-date one)