diff --git a/tests/test-vars-ubuntu1204.yml b/tests/test-vars-ubuntu1204.yml index 9fabcac..49c96b8 100644 --- a/tests/test-vars-ubuntu1204.yml +++ b/tests/test-vars-ubuntu1204.yml @@ -1,23 +1,21 @@ --- -php_version: "5.6" php_packages: - - php5 - - php5-mcrypt - - php5-cli - - php5-common - - php5-curl - - php5-dev - - php5-fpm - - php5-gd - - php-pear + - php5.6 + - php5.6-mcrypt + - php5.6-cli + - php5.6-common + - php5.6-curl + - php5.6-dev + - php5.6-fpm + - php5.6-gd - libpcre3-dev php_conf_paths: - - /etc/php5/fpm - - /etc/php5/apache2 - - /etc/php5/cli + - /etc/php/5.6/fpm + - /etc/php/5.6/apache2 + - /etc/php/5.6/cli php_extension_conf_paths: - - /etc/php5/fpm/conf.d - - /etc/php5/apache2/conf.d - - /etc/php5/cli/conf.d -php_fpm_daemon: php5-fpm -php_fpm_conf_path: "/etc/php5/fpm" + - /etc/php/5.6/fpm/conf.d + - /etc/php/5.6/apache2/conf.d + - /etc/php/5.6/cli/conf.d +php_fpm_daemon: php5.6-fpm +php_fpm_conf_path: "/etc/php/5.6/fpm" diff --git a/tests/test.yml b/tests/test.yml index 295fcb7..29d42e4 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -5,6 +5,7 @@ php_enable_webserver: false php_memory_limit: "192M" php_enablerepo: "remi,remi-php70" + php_install_recommends: no pre_tasks: - name: Update apt cache. @@ -19,7 +20,7 @@ when: ansible_distribution == 'Ubuntu' and ansible_distribution_version != '12.04' - name: Add repository for PHP 5.6. - apt_repository: repo='ppa:ondrej/php5-5.6' + apt_repository: repo='ppa:ondrej/php' when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04' roles: