merge master

Vagrantfile

@@ -7,7 +7,7 @@ Vagrant.require_version '>= 1.8.6'
 
 Vagrant.configure(2) do |config|
 
-  vccw_version = '3.0.9';
+  vccw_version = '3.0.10';
 
   _conf = YAML.load(
     File.open(

provision/default.yml

@@ -107,6 +107,10 @@ ruby_gems:
   - bundler
   - wordmove
 
+mailcatcher: true
+
+wp_i18n_tools: true
+
 #
 # NPM modules
 #
@@ -151,7 +155,6 @@ php_ini:
   post_max_size: 1024M # Same with VVV
   short_open_tag: Off
   session.save_path: /tmp
-  sendmail_path: /usr/bin/env catchmail
   upload_max_filesize: 1024M # Same with VVV
   xdebug.remote_enable: true
   xdebug.remote_host: 127.0.0.1

provision/playbooks/commands.yml

@@ -67,10 +67,6 @@
       template:
         src: templates/guest-wp-cli-config.yml
         dest: "{{ ansible_env.HOME }}/.wp-cli/config.yml"
-    - name: Create a `/vagrant/wp-cli.yml`
-      template:
-        src: templates/host-wp-cli-config.yml
-        dest: "{{ vccw.vagrant_dir }}/wp-cli.yml"
     - name: Install WP-CLI packages
       become: no
       shell: /bin/bash -lc "wp package install '{{ item }}'"
@@ -126,3 +122,4 @@
         repo: http://i18n.svn.wordpress.org/tools/trunk/
         dest: "{{ ansible_env.HOME }}/.wp-i18n/"
       ignore_errors: yes
+      when: vccw.wp_i18n_tools

provision/playbooks/middleware.yml

@@ -85,15 +85,27 @@
         name: mailcatcher
         state: latest
         user_install: no
+      when: vccw.mailcatcher
     - name: Add mailcatcher to service
       become: yes
       template:
         src: templates/mailcatcher.service
         dest: /etc/systemd/system/mailcatcher.service
         mode: 0644
+      when: vccw.mailcatcher
     - name: Start mailcatcher
       become: yes
       service: name=mailcatcher enabled=yes state=started
+      when: vccw.mailcatcher
+    - name: Update php.ini for mailcatcher
+      become: yes
+      lineinfile:
+        dest: /etc/php/7.0/apache2/conf.d/99-vccw.ini
+        create: yes
+        line: "  sendmail_path = /usr/bin/env catchmail"
+      when: vccw.mailcatcher
+      notify:
+        - restart apache
 
   handlers:
     - name: restart apache

provision/playbooks/templates/vccw.sh

@@ -21,7 +21,9 @@ if which phpcs >/dev/null; then
   alias wpcs="phpcs --standard=WordPress"
 fi
 
+if [ -e $HOME/.wp-i18n/makepot.php ]; then
 alias makepot="/usr/bin/env php $HOME/.wp-i18n/makepot.php"
+fi
 
 # For wp plugin's unit testing
 function install-wp-tests {