Skip to content

Commit

Permalink
Merge pull request #735 from roots/customize-apt-packages
Browse files Browse the repository at this point in the history
Customize installed Apt packages
  • Loading branch information
swalkinshaw authored Jan 24, 2017
2 parents 85a11bf + 12ae0c9 commit 54ab64c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
13 changes: 13 additions & 0 deletions roles/common/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
10 changes: 1 addition & 9 deletions roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 54ab64c

Please sign in to comment.