diff --git a/.travis.yml b/.travis.yml index 7d6fc39..6ba35e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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)' diff --git a/COPYING b/COPYING index 0ebaf37..fa32766 100644 --- a/COPYING +++ b/COPYING @@ -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 diff --git a/LICENSE b/LICENSE index 059452d..1853949 100644 --- a/LICENSE +++ b/LICENSE @@ -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: diff --git a/defaults/main.yml b/defaults/main.yml index 8ef95cd..12f9f3e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,7 +3,7 @@ --- -php_version: '7.1' +php_version: '7.2' php_ppa: php_repos: php_enable_repo: '' diff --git a/docs/README.md b/docs/README.md index f1f289a..19fcb56 100644 --- a/docs/README.md +++ b/docs/README.md @@ -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: @@ -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' diff --git a/meta/main.yml b/meta/main.yml index c4d3959..86500fa 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -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' diff --git a/tasks/main.yml b/tasks/main.yml index 965c222..d594934 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -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' diff --git a/tests/test-verify.sh b/tests/test-verify.sh index 915a5a1..431ab27 100644 --- a/tests/test-verify.sh +++ b/tests/test-verify.sh @@ -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 \ No newline at end of file diff --git a/vars/Debian.yml b/vars/Debian.yml index 3edf2ec..92f269b 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -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' diff --git a/vars/RedHat.yml b/vars/RedHat.yml index eb641ab..fe47bd8 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -14,7 +14,6 @@ php_default_packages: - name: 'intl' - name: 'ldap' - name: 'mbstring' - - name: 'mcrypt' - name: 'opcache' - name: 'pdo' - name: 'soap'