diff --git a/tasks/php.yml b/tasks/php.yml index 44d273de57ac4e38c494cdcc7925e802a742f806..48021c4894a2dd47f4111b29a4a3f7c79b7f7584 100644 --- a/tasks/php.yml +++ b/tasks/php.yml @@ -159,11 +159,13 @@ when: (php_version_main|default('7') == '7') and (jailkit is not defined or not jailkit) and (php_fpm) - block: - - set_fact: + - name: Set facts for PHP 7 + set_fact: phpLogRotatePrefix: '{{php_version|default("7.0")}}' phpLibPrefix: '' when: php_version_main|default('7') == '7' - - set_fact: + - name: Set facts for PHP 5 + set_fact: phpLogRotatePrefix: '5' phpLibPrefix: '5' when: php_version_main|default('7') != '7' diff --git a/tasks/variables.yml b/tasks/variables.yml index c332577b413b8c2518e2c55efd403d8f85289c7f..9300fdabe41fe57e11c439802eb795b565fc72d6 100644 --- a/tasks/variables.yml +++ b/tasks/variables.yml @@ -2,12 +2,15 @@ # file: roles/php/tasks/variables.yml - block: - - set_fact: + - name: Set default facts + set_fact: phpFpmService: php5-fpm - - set_fact: + - name: Set facts for PHP 5 + set_fact: phpFpmService: php-fpm when: php_version_main|default('7') == '5' - - set_fact: + - name: Set facts for PHP 7 + set_fact: phpFpmService: php{{php_version|default("7.0")}}-fpm when: php_version_main|default('7') == '7' tags: