From ec3165539b56e93d6f24a96ddb2c6cebb7d9f87a Mon Sep 17 00:00:00 2001
From: Nathaniel Schweinberg <natanielks@gmail.com>
Date: Mon, 16 Jan 2017 13:19:08 -0800
Subject: [PATCH 1/2] add ability to customize what apt packages are installed

---
 roles/common/defaults/main.yml | 13 +++++++++++++
 roles/common/tasks/main.yml    | 10 +---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
index f60073c0eb..11d200dd07 100644
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -5,3 +5,16 @@ ansible_requirements:
     operator: '!='
 
 ntp_timezone: Etc/UTC
+
+apt_packages_default:
+  - python-software-properties
+  - python-pycurl
+  - build-essential
+  - python-mysqldb
+  - curl
+  - git-core
+  - dbus
+  - libnss-myhostname
+
+apt_packages_custom: []
+apt_packages_install: "{{ default_apt_packages + custom_apt_packages }}"
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index bf7d261c17..5f5184bf8b 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -50,15 +50,7 @@
     state: present
     update_cache: true
     cache_valid_time: "{{ apt_cache_valid_time }}"
-  with_items:
-  - python-software-properties
-  - python-pycurl
-  - build-essential
-  - python-mysqldb
-  - curl
-  - git-core
-  - dbus
-  - libnss-myhostname
+  with_items: "{{ apt_packages_install }}"
 
 - name: Validate timezone variable
   stat:

From 12ae0c98cc1da2c4b8965c39114dcefff5bfd11a Mon Sep 17 00:00:00 2001
From: Scott Walkinshaw <scott.walkinshaw@gmail.com>
Date: Mon, 23 Jan 2017 19:57:47 -0500
Subject: [PATCH 2/2] CHANGELOG entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d226d1148..05ae7e0c90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Add `apt_packages_custom` to customize Apt packages ([#735](https://github.com/roots/trellis/pull/735))
 * Enable Let's Encrypt to detect updated `site_hosts` ([#630](https://github.com/roots/trellis/pull/630))
 * Add `SKIP_GALAXY` env var to skip galaxy install in Vagrant ([#734](https://github.com/roots/trellis/pull/734))
 * Avoid `loop.first` variable in conditional jinja loops ([#729](https://github.com/roots/trellis/pull/729))