Skip to content
Snippets Groups Projects
Commit 2c04d3bc authored by jurgenhaas's avatar jurgenhaas
Browse files

Introduce php_version_main and make php_version always format x.y

parent 224d5420
No related branches found
No related tags found
No related merge requests found
php_version: '7.0'
php_version_main: '7'
php_install_redis: true
php_hold_version: false
php_repositories: []
......
File moved
......@@ -23,12 +23,12 @@
- name: "PHP | Install PECL packages"
shell: 'pecl install --soft imagick-3.3.0'
when: php_version|default('5.5') != '7'
when: php_version_main|default('7') != '7'
ignore_errors: true
- name: "PHP | Install PECL packages"
shell: 'pecl install --soft oauth'
when: php_version|default('5.5') == '7'
when: php_version_main|default('7') == '7'
ignore_errors: true
- name: "PHP | Ensure Apache config directory"
......@@ -134,17 +134,17 @@
owner=root
group=root
mode='644'
when: (php_version|default('5.5') == '7') and (jailkit is not defined or not jailkit)
when: (php_version_main|default('7') == '7') and (jailkit is not defined or not jailkit)
- block:
- set_fact:
phpLogRotatePrefix='7.0'
phpLibPrefix=''
when: php_version|default('5.5') == '7'
when: php_version_main|default('7') == '7'
- set_fact:
phpLogRotatePrefix='5'
phpLibPrefix='5'
when: php_version|default('5.5') != '7'
when: php_version_main|default('7') != '7'
- name: "Install logrotate script"
template:
......
......@@ -1988,7 +1988,7 @@ extension=imagick.so
extension=xmlrpc.so
{% endif %}
{% if php_version|default('5.5') == '7' %}
{% if php_version_main|default('7') == '7' %}
[oauth]
extension=oauth.so
{% endif %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment