Skip to content

Commit

Permalink
Merge pull request #194 from lemberg/task/193-update-ansible-roles
Browse files Browse the repository at this point in the history
Update all Ansible roles
  • Loading branch information
T2L committed Apr 27, 2020
2 parents 7a59674 + fc451c4 commit b6968a8
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 16 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

Updates:

- [GH-193](https://github.com/lemberg/draft-environment/issues/193) - Update all Ansible roles:
* oefenweb.swapfile (v2.0.24 => v2.0.26)
* geerlingguy.mysql (3.0.0 => 3.1.0)
* T2L.php (1.2.1 => 1.3.0)
* T2L.java (1.2.0 => 1.3.0)
* T2L.solr (2.1.1 => 2.2.0)

Bump the following defaults:

* Solr version: 7.7.3
- [GH-190](https://github.com/lemberg/draft-environment/issues/175) - Add Ubuntu 20.04 to the test package on Travis
- [GH-175](https://github.com/lemberg/draft-environment/issues/175) - Add GrumPHP support
- [GH-161](https://github.com/lemberg/draft-environment/issues/161) - Updated Ansible MySQL role to 3.0.0
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.24](https://github.com/Oefenweb/ansible-swapfile/tree/v2.0.24)
- [oefenweb.swapfile @ v2.0.26](https://github.com/Oefenweb/ansible-swapfile/tree/v2.0.26)
- [geerlingguy.mailhog @ 2.2.0](https://github.com/geerlingguy/ansible-role-mailhog/tree/2.2.0)
- git_config (internal)
- apache2 (internal)
- [geerlingguy.mysql @ 3.0.0](https://github.com/geerlingguy/ansible-role-mysql/tree/3.0.0)
- [T2L.php @ 1.2.1](https://github.com/T2L/ansible-role-php/tree/1.2.1)
- [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)
- [T2L.composer @ 2.0.2](https://github.com/T2L/ansible-role-composer/tree/2.0.2)
- [T2L.java @ 1.2.0](https://github.com/T2L/ansible-role-java/tree/1.2.0)
- [T2L.solr @ 2.1.1](https://github.com/T2L/ansible-role-solr/tree/2.1.1)
- [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)

1. 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 @@ -103,7 +103,7 @@ draft_features:

ssh_default_directory: '{{ vagrant.base_directory }}'

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

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

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

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

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

# PHP version to install. Possible values: 7.2, 7.3 and 7.4
php_version: '7.3'
Expand Down Expand Up @@ -323,7 +323,7 @@ composer_keep_updated: true
# PHP executable name.
composer_php_executable: php

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

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

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

# Solr user and group. Defaults to solr:solr.
solr_user: solr
solr_group: '{{ solr_user }}'

# Solr version to install. Minimum supported version is 5.0.0.
solr_version: 7.7.2
solr_version: 7.7.3

# Port Solr should bind to.
solr_port: 8983
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.24
version: v2.0.26
- src: geerlingguy.mailhog
version: 2.2.0
- src: geerlingguy.mysql
version: 3.0.0
version: 3.1.0
- src: T2L.php
version: 1.2.1
version: 1.3.0
- src: T2L.composer
version: 2.0.2
- src: T2L.java
version: 1.2.0
version: 1.3.0
- src: T2L.solr
version: 2.1.1
version: 2.2.0

0 comments on commit b6968a8

Please sign in to comment.