Update to Trellis 1.0.0

.travis.yml

@@ -1,5 +1,7 @@
 language: python
-python: 2.7
+python:
+  - 2.7
+  - 3.6
 sudo: false
 cache: pip
 install:

CHANGELOG.md

@@ -1,4 +1,22 @@
-### HEAD
+### 1.0.0: December 27th, 2018
+* Hyper-V and SMB folder sync compatibility ([#1035](https://github.com/roots/trellis/pull/1035))
+* Use Ruby script for ssh-config trigger ([#1053](https://github.com/roots/trellis/pull/1053))
+* Update to PHP 7.3 ([#1052](https://github.com/roots/trellis/pull/1052))
+* Enable per-user `update_password` behavior ([#767](https://github.com/roots/trellis/pull/767))
+* Fix Vagrant trigger path ([#1051](https://github.com/roots/trellis/pull/1051))
+* Fix: `vault_wordpress_env_defaults` not populated during deploy ([#1049](https://github.com/roots/trellis/pull/1049))
+* Add `vault_wordpress_env_defaults` ([#1048](https://github.com/roots/trellis/pull/1048))
+* Allow overriding rollback variables ([#1047](https://github.com/roots/trellis/pull/1047))
+* Require Vagrant >= 2.1.0 ([#1046](https://github.com/roots/trellis/pull/1046))
+* Bump Ansible `version_tested_max` to 2.7.5 ([#1045](https://github.com/roots/trellis/pull/1045))
+* Add Vagrant `ssh-config` to `~/.ssh/config` on `vagrant up` ([#1042](https://github.com/roots/trellis/pull/1042))
+* [BREAKING] Add Ubuntu 18.04 support and default to it ([#992](https://github.com/roots/trellis/pull/992))
+* Python 3 support ([#1031](https://github.com/roots/trellis/pull/1031))
+* Allow customizing Nginx `worker_connections` ([#1021](https://github.com/roots/trellis/pull/1021))
+* Update wp-cli to 2.0.1 ([#1019](https://github.com/roots/trellis/pull/1019))
+* [BREAKING] Update wp-cli to 2.0.0 and verify its PGP signature ([#1014](https://github.com/roots/trellis/pull/1014))
+* Deploy: Remove obsoleted `git` remote checking ([#999](https://github.com/roots/trellis/pull/999))
+* Update xdebug tunnel configuration ([#1007](https://github.com/roots/trellis/pull/1007))
 * Verify `wp-cli.phar` checksum ([#996](https://github.com/roots/trellis/pull/996))
 * Enable `fastcgi_cache_background_update` by default ([#962](https://github.com/roots/trellis/pull/962))
 * Bump Ansible `version_tested_max` to 2.5.3 ([#981](https://github.com/roots/trellis/pull/981))

README.md

@@ -6,26 +6,25 @@ Ansible playbooks for setting up a LEMP stack for WordPress.
 
 - Local development environment with Vagrant
 - High-performance production servers
-- One-command deploys for your [Bedrock](https://roots.io/bedrock/)-based WordPress sites
+- Zero-downtime deploys for your [Bedrock](https://roots.io/bedrock/)-based WordPress sites
 
 ## What's included
 
 Trellis will configure a server with the following and more:
 
-* Ubuntu 16.04 Xenial LTS
+* Ubuntu 18.04 Bionic LTS
 * Nginx (with optional FastCGI micro-caching)
-* PHP 7.2
+* PHP 7.3
 * MariaDB (a drop-in MySQL replacement)
 * SSL support (scores an A+ on the [Qualys SSL Labs Test](https://www.ssllabs.com/ssltest/))
-* Let's Encrypt integration for free SSL certificates
+* Let's Encrypt for free SSL certificates
 * HTTP/2 support (requires SSL)
 * Composer
 * WP-CLI
 * sSMTP (mail delivery)
 * MailHog
 * Memcached
-* Fail2ban
-* ferm
+* Fail2ban and ferm
 
 ## Documentation
 
@@ -35,8 +34,9 @@ Full documentation is available at [https://roots.io/trellis/docs/](https://root
 
 Make sure all dependencies have been installed before moving on:
 
+* [Composer](https://getcomposer.org/doc/00-intro.md#installation-linux-unix-osx)
 * [Virtualbox](https://www.virtualbox.org/wiki/Downloads) >= 4.3.10
-* [Vagrant](https://www.vagrantup.com/downloads.html) >= 2.0.1
+* [Vagrant](https://www.vagrantup.com/downloads.html) >= 2.1.0
 
 ## Installation
 
@@ -53,24 +53,34 @@ example.com/      # → Root folder for the project
 
 See a complete working example in the [roots-example-project.com repo](https://github.com/roots/roots-example-project.com).
 
-1. Create a new project directory: `$ mkdir example.com && cd example.com`
-2. Clone Trellis: `$ git clone --depth=1 [email protected]:roots/trellis.git && rm -rf trellis/.git`
-3. Clone Bedrock: `$ git clone --depth=1 [email protected]:roots/bedrock.git site && rm -rf site/.git`
+1. Create a new project directory:
+```plain
+$ mkdir example.com && cd example.com
+```
+2. Install Trellis:
+```plain
+$ git clone --depth=1 [email protected]:roots/trellis.git && rm -rf trellis/.git
+```
+3. Install Bedrock into the `site` directory:
+```plain
+$ composer create-project roots/bedrock site
+```
 
 Windows user? [Read the Windows docs](https://roots.io/trellis/docs/windows/) for slightly different installation instructions. VirtualBox is known to have poor performance in Windows — use VMware or [see some possible solutions](https://discourse.roots.io/t/virtualbox-performance-in-windows/3932).
 
 ## Local development setup
 
 1. Configure your WordPress sites in `group_vars/development/wordpress_sites.yml` and in `group_vars/development/vault.yml`
-2. Run `vagrant up`
+2. Ensure you're in the trellis directory: `cd trellis`
+3. Run `vagrant up`
 
 [Read the local development docs](https://roots.io/trellis/docs/local-development-setup/) for more information.
 
 ## Remote server setup (staging/production)
 
 For remote servers, installing Ansible locally is an additional requirement. See the [docs](https://roots.io/trellis/docs/remote-server-setup/#requirements) for more information.
 
-A base Ubuntu 16.04 server is required for setting up remote servers. OS X users must have [passlib](http://pythonhosted.org/passlib/install.html#installation-instructions) installed.
+A base Ubuntu 18.04 (Bionic) server is required for setting up remote servers. OS X users must have [passlib](http://pythonhosted.org/passlib/install.html#installation-instructions) installed.
 
 1. Configure your WordPress sites in `group_vars/<environment>/wordpress_sites.yml` and in `group_vars/<environment>/vault.yml` (see the [Vault docs](https://roots.io/trellis/docs/vault/) for how to encrypt files containing passwords)
 2. Add your server IP/hostnames to `hosts/<environment>`
@@ -92,11 +102,11 @@ A base Ubuntu 16.04 server is required for setting up remote servers. OS X users
 
 Contributions are welcome from everyone. We have [contributing guidelines](https://github.com/roots/guidelines/blob/master/CONTRIBUTING.md) to help you get started.
 
-## Gold sponsors
+## Trellis sponsors
 
-Help support our open-source development efforts by [contributing to Trellis on OpenCollective](https://opencollective.com/trellis).
+Help support our open-source development efforts by [becoming a patron](https://www.patreon.com/rootsdev).
 
-<a href="https://kinsta.com/?kaid=OFDHAJIXUDIV"><img src="https://roots.io/app/uploads/kinsta.svg" alt="Kinsta" width="200" height="150"></a> <a href="https://www.harnessup.com/"><img src="https://roots.io/app/uploads/harness-software.svg" alt="Harness Software" width="200" height="150"></a> <a href="https://k-m.com/"><img src="https://roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="200" height="150"></a> <a href="https://themeisle.com/"><img src="https://roots.io/app/uploads/sponsor-themeisle.svg" alt="ThemeIsle" width="200" height="150"></a>
+<a href="https://kinsta.com/?kaid=OFDHAJIXUDIV"><img src="https://cdn.roots.io/app/uploads/kinsta.svg" alt="Kinsta" width="200" height="150"></a> <a href="https://www.harnessup.com/"><img src="https://cdn.roots.io/app/uploads/harness-software.svg" alt="Harness Software" width="200" height="150"></a> <a href="https://k-m.com/"><img src="https://cdn.roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="200" height="150"></a> <a href="https://www.itineris.co.uk/"><img src="https://cdn.roots.io/app/uploads/itineris.svg" alt="itineris" width="200" height="150"></a> <a href="https://www.hebergeurweb.ca"><img src="https://cdn.roots.io/app/uploads/hebergeurweb.svg" alt="Hébergement Web Québec" width="200" height="150"></a>
 
 ## Community
 

Vagrantfile

@@ -1,8 +1,5 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
 ANSIBLE_PATH = __dir__ # absolute path to Ansible directory on host machine
-ANSIBLE_PATH_ON_VM = '/home/vagrant/trellis' # absolute path to Ansible directory on virtual machine
+ANSIBLE_PATH_ON_VM = '/home/vagrant/trellis'.freeze # absolute path to Ansible directory on virtual machine
 
 require File.join(ANSIBLE_PATH, 'lib', 'trellis', 'vagrant')
 require File.join(ANSIBLE_PATH, 'lib', 'trellis', 'config')
@@ -19,7 +16,7 @@ ensure_plugins(vconfig.fetch('vagrant_plugins')) if vconfig.fetch('vagrant_insta
 
 trellis_config = Trellis::Config.new(root_path: ANSIBLE_PATH)
 
-Vagrant.require_version '>= 2.0.1'
+Vagrant.require_version '>= 2.1.0'
 
 Vagrant.configure('2') do |config|
   config.vm.box = vconfig.fetch('vagrant_box')
@@ -29,7 +26,7 @@ Vagrant.configure('2') do |config|
 
   # Fix for: "stdin: is not a tty"
   # https://github.com/mitchellh/vagrant/issues/1673#issuecomment-28288042
-  config.ssh.shell = %{bash -c 'BASH_ENV=/etc/profile exec bash'}
+  config.ssh.shell = %(bash -c 'BASH_ENV=/etc/profile exec bash')
 
   # Required for NFS to work
   if vconfig.fetch('vagrant_ip') == 'dhcp'
@@ -39,7 +36,7 @@ Vagrant.configure('2') do |config|
     config.hostmanager.ip_resolver = proc do |vm, _resolving_vm|
       if cached_addresses[vm.name].nil?
         if vm.communicate.ready?
-          vm.communicate.execute("hostname -I | cut -d ' ' -f 2") do |type, contents|
+          vm.communicate.execute("hostname -I | cut -d ' ' -f 2") do |_type, contents|
             cached_addresses[vm.name] = contents.split("\n").first[/(\d+\.\d+\.\d+\.\d+)/, 1]
           end
         end
@@ -69,26 +66,36 @@ Vagrant.configure('2') do |config|
 
   bin_path = File.join(ANSIBLE_PATH_ON_VM, 'bin')
 
-  if Vagrant::Util::Platform.wsl? || (Vagrant::Util::Platform.windows? and !Vagrant.has_plugin? 'vagrant-winnfsd')
+  vagrant_mount_type = vconfig.fetch('vagrant_mount_type')
+
+  extra_options = if vagrant_mount_type == 'smb'
+    {
+      smb_username: vconfig.fetch('vagrant_smb_username', 'vagrant'),
+      smb_password: vconfig.fetch('vagrant_smb_password', 'vagrant'),
+    }
+  else
+    {}
+  end
+
+  if vagrant_mount_type != 'nfs' || Vagrant::Util::Platform.wsl? || (Vagrant::Util::Platform.windows? && !Vagrant.has_plugin?('vagrant-winnfsd'))
+    vagrant_mount_type = nil if vagrant_mount_type == 'nfs'
     trellis_config.wordpress_sites.each_pair do |name, site|
-      config.vm.synced_folder local_site_path(site), remote_site_path(name, site), owner: 'vagrant', group: 'www-data', mount_options: ['dmode=776', 'fmode=775']
+      config.vm.synced_folder local_site_path(site), remote_site_path(name, site), owner: 'vagrant', group: 'www-data', mount_options: mount_options(vagrant_mount_type, dmode: 776, fmode: 775), type: vagrant_mount_type, **extra_options
     end
 
-    config.vm.synced_folder ANSIBLE_PATH, ANSIBLE_PATH_ON_VM, mount_options: ['dmode=755', 'fmode=644']
-    config.vm.synced_folder File.join(ANSIBLE_PATH, 'bin'), bin_path, mount_options: ['dmode=755', 'fmode=755']
+    config.vm.synced_folder ANSIBLE_PATH, ANSIBLE_PATH_ON_VM, mount_options: mount_options(vagrant_mount_type, dmode: 755, fmode: 644), type: vagrant_mount_type, **extra_options
+    config.vm.synced_folder File.join(ANSIBLE_PATH, 'bin'), bin_path, mount_options: mount_options(vagrant_mount_type, dmode: 755, fmode: 755), type: vagrant_mount_type, **extra_options
+  elsif !Vagrant.has_plugin?('vagrant-bindfs')
+    fail_with_message "vagrant-bindfs missing, please install the plugin with this command:\nvagrant plugin install vagrant-bindfs"
   else
-    if !Vagrant.has_plugin? 'vagrant-bindfs'
-      fail_with_message "vagrant-bindfs missing, please install the plugin with this command:\nvagrant plugin install vagrant-bindfs"
-    else
-      trellis_config.wordpress_sites.each_pair do |name, site|
-        config.vm.synced_folder local_site_path(site), nfs_path(name), type: 'nfs'
-        config.bindfs.bind_folder nfs_path(name), remote_site_path(name, site), u: 'vagrant', g: 'www-data', o: 'nonempty'
-      end
-
-      config.vm.synced_folder ANSIBLE_PATH, '/ansible-nfs', type: 'nfs'
-      config.bindfs.bind_folder '/ansible-nfs', ANSIBLE_PATH_ON_VM, o: 'nonempty', p: '0644,a+D'
-      config.bindfs.bind_folder bin_path, bin_path, perms: '0755'
+    trellis_config.wordpress_sites.each_pair do |name, site|
+      config.vm.synced_folder local_site_path(site), nfs_path(name), type: 'nfs'
+      config.bindfs.bind_folder nfs_path(name), remote_site_path(name, site), u: 'vagrant', g: 'www-data', o: 'nonempty'
     end
+
+    config.vm.synced_folder ANSIBLE_PATH, '/ansible-nfs', type: 'nfs'
+    config.bindfs.bind_folder '/ansible-nfs', ANSIBLE_PATH_ON_VM, o: 'nonempty', p: '0644,a+D'
+    config.bindfs.bind_folder bin_path, bin_path, perms: '0755'
   end
 
   vconfig.fetch('vagrant_synced_folders', []).each do |folder|
@@ -121,6 +128,7 @@ Vagrant.configure('2') do |config|
     ansible.playbook = File.join(provisioning_path, 'dev.yml')
     ansible.galaxy_role_file = File.join(provisioning_path, 'requirements.yml') unless vconfig.fetch('vagrant_skip_galaxy') || ENV['SKIP_GALAXY']
     ansible.galaxy_roles_path = File.join(provisioning_path, 'vendor/roles')
+    ansible.galaxy_command = 'ansible-galaxy install --role-file=%{role_file} --roles-path=%{roles_path}'
 
     ansible.groups = {
       'web' => ['default'],
@@ -130,13 +138,23 @@ Vagrant.configure('2') do |config|
     ansible.tags = ENV['ANSIBLE_TAGS']
     ansible.extra_vars = { 'vagrant_version' => Vagrant::VERSION }
 
-    if vars = ENV['ANSIBLE_VARS']
+    if (vars = ENV['ANSIBLE_VARS'])
       extra_vars = Hash[vars.split(',').map { |pair| pair.split('=') }]
       ansible.extra_vars.merge!(extra_vars)
     end
+
+    if !Vagrant::Util::Platform.windows?
+      config.trigger.after :up do |trigger|
+        # Add Vagrant ssh-config to ~/.ssh/config
+        trigger.info = "Adding vagrant ssh-config for #{main_hostname } to ~/.ssh/config"
+        trigger.ruby do
+          update_ssh_config(main_hostname)
+        end
+      end
+    end
   end
 
-  # Virtualbox settings
+  # VirtualBox settings
   config.vm.provider 'virtualbox' do |vb|
     vb.name = config.vm.hostname
     vb.customize ['modifyvm', :id, '--cpus', vconfig.fetch('vagrant_cpus')]
@@ -149,19 +167,28 @@ Vagrant.configure('2') do |config|
   end
 
   # VMware Workstation/Fusion settings
-  ['vmware_fusion', 'vmware_workstation'].each do |provider|
-    config.vm.provider provider do |vmw, override|
+  %w(vmware_fusion vmware_workstation).each do |provider|
+    config.vm.provider provider do |vmw, _override|
       vmw.name = config.vm.hostname
       vmw.vmx['numvcpus'] = vconfig.fetch('vagrant_cpus')
       vmw.vmx['memsize'] = vconfig.fetch('vagrant_memory')
     end
   end
 
   # Parallels settings
-  config.vm.provider 'parallels' do |prl, override|
+  config.vm.provider 'parallels' do |prl, _override|
     prl.name = config.vm.hostname
     prl.cpus = vconfig.fetch('vagrant_cpus')
     prl.memory = vconfig.fetch('vagrant_memory')
     prl.update_guest_tools = true
   end
+
+  # Hyper-V settings
+  config.vm.provider 'hyperv' do |h|
+    h.vmname = config.vm.hostname
+    h.cpus = vconfig.fetch('vagrant_cpus')
+    h.memory = vconfig.fetch('vagrant_memory')
+    h.enable_virtualization_extensions = true
+    h.linked_clone = true
+  end
 end

bin/xdebug-tunnel.sh

@@ -1,5 +1,4 @@
-#!/usr/bin/env bash
-
+#!/bin/bash
 show_usage() {
   echo "
 Usage: bin/xdebug-tunnel.sh <action> <host>
@@ -16,8 +15,10 @@ Examples:
 "
 }
 
+ENABLE_TCP_FORWARDING=
 if [[ $1 == "open" ]]; then
   REMOTE_ENABLE=1
+  ENABLE_TCP_FORWARDING="-e sshd_allow_tcp_forwarding=yes"
 elif [[ $1 == "close" ]]; then
   REMOTE_ENABLE=0
 else
@@ -39,4 +40,4 @@ if [[ -n $DEBUG ]]; then
   PARAMS="$PARAMS ${VERBOSITY:--vvvv}"
 fi
 
-ansible-playbook xdebug-tunnel.yml $XDEBUG_ENABLE $SSH_HOST $PARAMS
+ansible-playbook xdebug-tunnel.yml $XDEBUG_ENABLE $ENABLE_TCP_FORWARDING $SSH_HOST $PARAMS

deploy-hooks/build-before.yml

@@ -9,7 +9,7 @@
 # ---
 # - name: Install npm dependencies
 #   command: yarn
-#   connection: local
+#   delegate_to: localhost
 #   args:
 #     chdir: "{{ project_local_path }}/web/app/themes/sage"
 #
@@ -20,7 +20,7 @@
 #
 # - name: Compile assets for production
 #   command: yarn build:production
-#   connection: local
+#   delegate_to: localhost
 #   args:
 #     chdir: "{{ project_local_path }}/web/app/themes/sage"
 #

deploy.yml

@@ -16,12 +16,12 @@
   remote_user: "{{ web_user }}"
   pre_tasks:
     - name: Ensure site is valid
-      connection: local
+      delegate_to: localhost
       fail:
         msg: "Site `{{ site | default('') }}` is not valid. Available sites to deploy: {{ wordpress_sites.keys() | join(', ') }}"
       when: wordpress_sites[site | default('')] is not defined
     - name: Ensure repo is valid
-      connection: local
+      delegate_to: localhost
       fail:
         msg: |
           Invalid Git repository.

dev.yml

@@ -1,5 +1,12 @@
 ---
-- name: "WordPress Server: Install LEMP Stack with PHP 7.2 and MariaDB MySQL"
+- name: Set ansible_python_interpreter
+  hosts: web:&development
+  gather_facts: false
+  become: yes
+  roles:
+    - { role: python_interpreter, tags: [always] }
+
+- name: "WordPress Server: Install LEMP Stack with PHP 7.3 and MariaDB MySQL"
   hosts: web:&development
   become: yes
   remote_user: vagrant

group_vars/all/helpers.yml

@@ -9,7 +9,7 @@ wordpress_env_defaults:
   wp_siteurl: "{{ ssl_enabled | ternary('https', 'http') }}://{{ site_hosts_canonical | first }}/wp"
   domain_current_site: "{{ site_hosts_canonical | first }}"
 
-site_env: "{{ wordpress_env_defaults | combine(item.value.env | default({}), vault_wordpress_sites[item.key].env) }}"
+site_env: "{{ wordpress_env_defaults | combine(vault_wordpress_env_defaults | default({}), item.value.env | default({}), vault_wordpress_sites[item.key].env) }}"
 site_hosts_canonical: "{{ item.value.site_hosts | map(attribute='canonical') | list }}"
 site_hosts_redirects: "{{ item.value.site_hosts | selectattr('redirects', 'defined') | sum(attribute='redirects', start=[]) | list }}"
 site_hosts: "{{ site_hosts_canonical | union(site_hosts_redirects) }}"

group_vars/all/main.yml

@@ -11,10 +11,13 @@ apt_packages_custom:
   ghostscript: "{{ apt_package_state }}"
   imagemagick: "{{ apt_package_state }}"
   poppler-utils: "{{ apt_package_state }}"
-  python-lxml: "{{ apt_package_state }}"
+  python3-lxml: "{{ apt_package_state }}"
   unzip: "{{ apt_package_state }}"
   nano: "{{ apt_package_state }}"
   ccze: "{{ apt_package_state }}"
+wp_cli_packages:
+  - aaemnnosttv/wp-cli-login-command
+  - runcommand/find-unused-themes
 ntp_timezone: Etc/UTC
 ntp_manage_config: true
 www_root: /srv/www
@@ -30,4 +33,5 @@ raw_vars:
   - vault_mysql_root_password
   - vault_users.*.password
   - vault_users.*.salt
+  - vault_wordpress_env_defaults
   - vault_wordpress_sites

group_vars/all/users.yml

@@ -19,4 +19,4 @@ users:
 web_user: web
 web_group: www-data
 web_sudoers:
-  - "/usr/sbin/service php7.2-fpm *"
+  - "/usr/sbin/service php7.3-fpm *"