Skip to content

Commit

Permalink
Merge pull request #217 from lemberg/task/216-update-ansible-roles
Browse files Browse the repository at this point in the history
Update Ansible roles
  • Loading branch information
T2L committed Aug 21, 2020
2 parents d8e817c + c0b2af0 commit b1810dc
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 17 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ Fixes:

- [GH-53](https://github.com/lemberg/draft-environment/issues/53) - Expose draft environment via environment variable `DRAFT_ENVIRONMENT`
- [GH-214](https://github.com/lemberg/draft-environment/issues/214) - Address newly introduced issue(s) with file permissions. See https://github.com/ansible/ansible/pull/70221 and https://github.com/ansible/ansible/issues/71200
- [GH-216](https://github.com/lemberg/draft-environment/issues/216) - Update all Ansible roles:
* oefenweb.swapfile (v2.0.26 => v2.0.28)
* geerlingguy.mysql (3.1.0 => 3.3.0)
* T2L.php (1.3.0 => 1.3.1)
* T2L.java (1.3.0 => 1.3.1)
* T2L.solr (2.2.0 => 2.2.1)

Bump the following defaults:

* PHP version: 7.4

## Draft Environment 3.1.1, 2020-08-12

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ Dramatically increases disk IO on Windows by adding NFS support.
Here's the list of used roles:

- draft (internal)
- [oefenweb.swapfile @ v2.0.26](https://github.com/Oefenweb/ansible-swapfile/tree/v2.0.26)
- [oefenweb.swapfile @ v2.0.28](https://github.com/Oefenweb/ansible-swapfile/tree/v2.0.28)
- [geerlingguy.mailhog @ 2.2.0](https://github.com/geerlingguy/ansible-role-mailhog/tree/2.2.0)
- git_config (internal)
- apache2 (internal)
- [geerlingguy.mysql @ 3.1.0](https://github.com/geerlingguy/ansible-role-mysql/tree/3.1.0)
- [T2L.php @ 1.3.0](https://github.com/T2L/ansible-role-php/tree/1.3.0)
- [geerlingguy.mysql @ 3.3.0](https://github.com/geerlingguy/ansible-role-mysql/tree/3.3.0)
- [T2L.php @ 1.3.1](https://github.com/T2L/ansible-role-php/tree/1.3.1)
- [T2L.composer @ 2.0.2](https://github.com/T2L/ansible-role-composer/tree/2.0.2)
- [T2L.java @ 1.3.0](https://github.com/T2L/ansible-role-java/tree/1.3.0)
- [T2L.solr @ 2.2.0](https://github.com/T2L/ansible-role-solr/tree/2.2.0)
- [T2L.java @ 1.3.1](https://github.com/T2L/ansible-role-java/tree/1.3.1)
- [T2L.solr @ 2.2.1](https://github.com/T2L/ansible-role-solr/tree/2.2.1)

2. Create and provision the guest machine:

Expand Down
12 changes: 6 additions & 6 deletions default.vm-settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ draft_features:

ssh_default_directory: '{{ vagrant.destination_directory }}'

# Role: oefenweb.swapfile @ v2.0.26
# Role: oefenweb.swapfile @ v2.0.28

# Set swap file size.
swapfile_size: 2GB
Expand All @@ -130,7 +130,7 @@ apache2_document_root: docroot
# Log level to use
apache2_log_level: error

# Role: geerlingguy.mysql @ 3.1.0
# Role: geerlingguy.mysql @ 3.3.0

# Set this to the user ansible is logging in as - should have root
# or sudo access
Expand Down Expand Up @@ -259,10 +259,10 @@ mysql_replication_master: ''
# Same keys as `mysql_users` above.
mysql_replication_user: []

# Role: T2L.php @ 1.2.0
# Role: T2L.php @ 1.3.1

# PHP version to install. Possible values: 7.2, 7.3 and 7.4
php_version: '7.3'
php_version: '7.4'

# Configure PHP.
php_configuration:
Expand Down Expand Up @@ -334,7 +334,7 @@ composer_keep_updated: true
# PHP executable name.
composer_php_executable: php

# Role: T2L.java @ 1.3.0
# Role: T2L.java @ 1.3.1

# Open JDK version(s) and package type (jre or jdk).
# Currently supported versions are 6-13 (however not every Java version is
Expand All @@ -354,7 +354,7 @@ java_default_alternative:
provider: openjdk
version: 8

# Role: T2L.solr @ 2.2.0
# Role: T2L.solr @ 2.2.1

# Solr user and group. Defaults to solr:solr.
solr_user: solr
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
- T2L.php
- T2L.composer
- T2L.java
- { role: T2L.solr, solr_cleanup_downloads: false, solr_cleanup_gpg: false }
- T2L.solr
vars:
ansible_python_interpreter: /usr/bin/python3
vars_files:
Expand Down
10 changes: 5 additions & 5 deletions provisioning/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
- src: oefenweb.swapfile
version: v2.0.26
version: v2.0.28
- src: geerlingguy.mailhog
version: 2.2.0
- src: geerlingguy.mysql
version: 3.1.0
version: 3.3.0
- src: T2L.php
version: 1.3.0
version: 1.3.1
- src: T2L.composer
version: 2.0.2
- src: T2L.java
version: 1.3.0
version: 1.3.1
- src: T2L.solr
version: 2.2.0
version: 2.2.1

0 comments on commit b1810dc

Please sign in to comment.