Skip to content

Commit

Permalink
Added Ansible 2.4 support
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdyson committed May 22, 2018
1 parent 2b310aa commit 3b9cabf
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ env:
- distribution: 'ubuntu'
version: '16.04'
playbook: 'test-php-5.3.yml'
- distribution: 'ubuntu'
version: '18.04'

before_install:
- 'export container_id=$(date +%s)'
Expand Down
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2010-2017 Ontic. (http://www.ontic.com.au). All rights reserved.
Copyright (c) 2010-2018 Ontic. (http://www.ontic.com.au). All rights reserved.

Each Ontic source file included in this distribution is subject to the New BSD license
that is bundled with this package in the LICENSE file. To understand any restrictions on
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2010-2017 Ontic. (http://www.ontic.com.au). All rights reserved.
Copyright (c) 2010-2018 Ontic. (http://www.ontic.com.au). All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

---

php_version: '7.1'
php_version: '7.2'
php_ppa:
php_repos:
php_enable_repo: ''
Expand Down
13 changes: 11 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Example

```
php_version: '7.1'
php_version: '7.2'
php_ppa: 'ppa:ondrej/php'
php_fpm_conf_template: 'example.com.php-fpm.conf.j2'
php_fpm_pool_templates:
Expand All @@ -24,12 +24,21 @@ php_packages:
- name: 'intl'
- name: 'ldap'
- name: 'mbstring'
- name: 'mcrypt'
- name: 'mysql'
- name: 'opcache'
- name: 'soap'
- name: 'sqlite3'
- name: 'tidy'
- name: 'xml'
- name: 'xmlrpc'
- name: 'zip'
- name: 'php-apcu'
- name: 'php-geoip'
- name: 'php-igbinary'
- name: 'php-imagick'
- name: 'php-redis'
- name: 'php-uuid'
- name: 'php-xdebug'
php_pecl_extensions:
- name: 'igbinary'
- name: 'amfext'
Expand Down
3 changes: 2 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ galaxy_info:
description: 'This role installs PHP on RedHat/CentOS and Debian/Ubuntu Linux servers.'
company: 'Ontic'
license: 'BSD-3-Clause'
min_ansible_version: '2.3'
min_ansible_version: '2.4'
platforms:
- name: 'Ubuntu'
versions:
- 'xenial'
- 'bionic'
- name: 'Debian'
versions:
- 'stretch'
Expand Down
6 changes: 3 additions & 3 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,19 @@
- 'configure'
- 'service'

- include: 'package.yml'
- import_tasks: 'package.yml'
tags:
- 'php'
- 'php-package'
- 'package'

- include: 'configure.yml'
- import_tasks: 'configure.yml'
tags:
- 'php'
- 'php-configure'
- 'configure'

- include: 'service.yml'
- import_tasks: 'service.yml'
tags:
- 'php'
- 'php-service'
Expand Down
10 changes: 5 additions & 5 deletions tests/test-verify.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash
# Copyright (c) Ontic. (http://www.ontic.com.au). All rights reserved.
# See the COPYING file bundled with this package for license details.

# Verify the installed PHP location.
# Verify the installed location.
docker exec --tty ${container_id} env TERM=xterm which php

# Verify the installed PHP version.
# Verify the installed version.
docker exec --tty ${container_id} env TERM=xterm php --version

# Verify the installed PHP modules.
# Verify the installed modules.
docker exec --tty ${container_id} env TERM=xterm php -m
4 changes: 3 additions & 1 deletion vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ php_default_packages:
- name: 'intl'
- name: 'ldap'
- name: 'mbstring'
- name: 'mcrypt'
- name: 'mysql'
- name: 'opcache'
- name: 'soap'
- name: 'sqlite3'
- name: 'tidy'
- name: 'xml'
- name: 'xmlrpc'
- name: 'zip'

Expand Down
1 change: 0 additions & 1 deletion vars/RedHat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ php_default_packages:
- name: 'intl'
- name: 'ldap'
- name: 'mbstring'
- name: 'mcrypt'
- name: 'opcache'
- name: 'pdo'
- name: 'soap'
Expand Down

0 comments on commit 3b9cabf

Please sign in to comment.