diff --git a/docs/rolereference.rst b/docs/rolereference.rst index f8ee12ec4defba9fdabbc2e2ef9a1922163789cf..68f80de3498ba2781585f7dc3c2e84575de2931b 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -1605,7 +1605,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 8 (Jessie) - Debian 9 (Stretch) diff --git a/roles/php_website/defaults/main.yml b/roles/php_website/defaults/main.yml index 97d804a2e9811da9b786a8c8e9ce2b55f1474722..f97b71849db42e5bd4e409eaadd799349f20f5d5 100644 --- a/roles/php_website/defaults/main.yml +++ b/roles/php_website/defaults/main.yml @@ -18,7 +18,6 @@ environment_indicator: null admin: "admin-{{ fqdn | replace('.', '_') }}" user: "web-{{ fqdn | replace('.', '_') }}" home: "/var/www/{{ fqdn }}" -php_fpm_pool_directory: "{% if ansible_distribution_release == 'jessie' %}/etc/php5/fpm/pool.d\ -{% elif ansible_distribution_release == 'stretch' %}/etc/php/7.0/fpm/pool.d{% endif %}" -php_fpm_binary: "{% if ansible_distribution_release == 'jessie' %}php5-fpm{% elif ansible_distribution_release == 'stretch' %}php-fpm7.0{% endif %}" -php_fpm_service_name: "{% if ansible_distribution_release == 'jessie' %}php5-fpm{% elif ansible_distribution_release == 'stretch' %}php7.0-fpm{% endif %}" +php_fpm_pool_directory: "/etc/php/7.0/fpm/pool.d" +php_fpm_binary: "php-fpm7.0" +php_fpm_service_name: "php7.0-fpm" diff --git a/roles/php_website/molecule/default/molecule.yml b/roles/php_website/molecule/default/molecule.yml index 7ba57337d48afa1d5ef1e339538c663d6a610a57..89b9a555c9bd4b277f94abe6ad9d912153b1b703 100644 --- a/roles/php_website/molecule/default/molecule.yml +++ b/roles/php_website/molecule/default/molecule.yml @@ -14,15 +14,6 @@ lint: platforms: - - name: php-website-jessie64 - groups: - - parameters-mandatory - - parameters-optional - - jessie - box: debian/contrib-jessie64 - memory: 512 - cpus: 1 - - name: php-website-stretch64 groups: - parameters-mandatory diff --git a/roles/php_website/molecule/default/playbook.yml b/roles/php_website/molecule/default/playbook.yml index b6bb3f529a367cb8ceca95103fc4efbbd6f374a8..67afc4b73cad417c0580eb5bda30a75638d1fd50 100644 --- a/roles/php_website/molecule/default/playbook.yml +++ b/roles/php_website/molecule/default/playbook.yml @@ -46,10 +46,9 @@ - '^/rewrite_to_index1/(.*) /myindex.php last' - '^/rewrite_to_index2/(.*) /myindex.php last' packages: - - "{% if ansible_distribution_release == 'jessie' %}php5-ldap{% elif ansible_distribution_release == 'stretch' %}php-ldap{% endif %}" - - "{% if ansible_distribution_release == 'jessie' %}php5-json{% elif ansible_distribution_release == 'stretch' %}php-json{% endif %}" - - "{% if ansible_distribution_release == 'jessie' %}libmariadb-client-lgpl-dev-compat\ -{% elif ansible_distribution_release == 'stretch' %}libmariadbclient-dev-compat{% endif %}" + - "php-ldap" + - "php-json" + - "libmariadbclient-dev-compat" uid: 5001 website_mail_recipients: user diff --git a/roles/php_website/molecule/default/tests/test_parameters_mandatory.py b/roles/php_website/molecule/default/tests/test_parameters_mandatory.py index 877d872744e0f8b9f06744511e711e0ce16b45ae..2f18afce6283023114a87af108aff890a2c2cd82 100644 --- a/roles/php_website/molecule/default/tests/test_parameters_mandatory.py +++ b/roles/php_website/molecule/default/tests/test_parameters_mandatory.py @@ -137,12 +137,7 @@ def test_php_fpm_configuration_file(host): Tests if PHP FPM configuration file has been correctly deployed. """ - ansible_facts = host.ansible("setup")["ansible_facts"] - - if ansible_facts['ansible_distribution_release'] == 'jessie': - config_file_path = '/etc/php5/fpm/pool.d/parameters-mandatory.conf' - elif ansible_facts['ansible_distribution_release'] == 'stretch': - config_file_path = '/etc/php/7.0/fpm/pool.d/parameters-mandatory.conf' + config_file_path = '/etc/php/7.0/fpm/pool.d/parameters-mandatory.conf' with host.sudo(): diff --git a/roles/php_website/molecule/default/tests/test_parameters_optional.py b/roles/php_website/molecule/default/tests/test_parameters_optional.py index c0bfca2c16836bb9b7e33056771c097190d23a26..a8e622338ba2dae17b09ae758be2915c957b4d43 100644 --- a/roles/php_website/molecule/default/tests/test_parameters_optional.py +++ b/roles/php_website/molecule/default/tests/test_parameters_optional.py @@ -137,20 +137,9 @@ def test_installed_packages(host): Tests if additional packages are installed. """ - ansible_facts = host.ansible("setup")["ansible_facts"] - - if ansible_facts['ansible_distribution_release'] == 'jessie': - php_ldap_package = 'php5-ldap' - php_json_package = 'php5-json' - mariadb_compat_package = 'libmariadb-client-lgpl-dev-compat' - elif ansible_facts['ansible_distribution_release'] == 'stretch': - php_ldap_package = 'php-ldap' - php_json_package = 'php-json' - mariadb_compat_package = 'libmariadbclient-dev-compat' - - assert host.package(php_ldap_package).is_installed - assert host.package(php_json_package).is_installed - assert host.package(mariadb_compat_package).is_installed + assert host.package('php-ldap').is_installed + assert host.package('php-json').is_installed + assert host.package('libmariadbclient-dev-compat').is_installed def test_nginx_tls_files(host): diff --git a/roles/php_website/molecule/default/tests/test_parameters_optional_jessie.py b/roles/php_website/molecule/default/tests/test_parameters_optional_jessie.py deleted file mode 100644 index 4eac8178ce8fdda604a56d6e586e55516a9a51a1..0000000000000000000000000000000000000000 --- a/roles/php_website/molecule/default/tests/test_parameters_optional_jessie.py +++ /dev/null @@ -1,17 +0,0 @@ -import os - -import testinfra.utils.ansible_runner - -testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('jessie') - - -def test_mariadb_compat_symlink(host): - """ - Tests if compatibility symlink is set-up for mysql_config binary if - libmariadb-client-lgpl-dev-compat is installed. - """ - - link = host.file('/usr/bin/mysql_config') - assert link.is_symlink - assert link.linked_to == "/usr/bin/mariadb_config" diff --git a/roles/php_website/tasks/main.yml b/roles/php_website/tasks/main.yml index 00a9dac0ca845ce689ae688cf7afee5e96d14129..4fdb2e6a18df5d3381f80d4fe710ade196e03975 100644 --- a/roles/php_website/tasks/main.yml +++ b/roles/php_website/tasks/main.yml @@ -62,13 +62,6 @@ name: "{{ packages }}" state: present -- name: Set-up MariaDB mysql_config symbolic link for compatibility on Jessie (workaround for Debian bug 766996) - file: - src: "/usr/bin/mariadb_config" - dest: "/usr/bin/mysql_config" - state: link - when: "'libmariadb-client-lgpl-dev-compat' in packages and ansible_distribution_release == 'jessie'" - - name: Deploy PHP FPM configuration file for website template: src: "fpm_site.conf.j2"