diff --git a/php/ng/cli/install.sls b/php/ng/cli/install.sls index 85ddf78..c52a6ef 100644 --- a/php/ng/cli/install.sls +++ b/php/ng/cli/install.sls @@ -1,13 +1,2 @@ {% set state = 'cli' %} {% include "php/ng/installed.jinja" %} - - -php_{{ phpng_version }}_link: - alternatives.set: - - name: php - - path: /usr/bin/php{{ phpng_version }} - - require_in: - - pkg: php_install_{{ state }} - - onlyif: - - which php - - test {{ current_php }} != $(which php{{ phpng_version }}) diff --git a/php/ng/installed.jinja b/php/ng/installed.jinja index 14e0028..853e6b6 100644 --- a/php/ng/installed.jinja +++ b/php/ng/installed.jinja @@ -47,6 +47,16 @@ php_ppa_{{ state }}: - onchanges: - pkgrepo: php_ppa_{{ state }} +php_{{ phpng_version }}_link: + alternatives.set: + - name: php + - path: /usr/bin/php{{ phpng_version }} + - require_in: + - pkg: php_install_{{ state }} + - onlyif: + - which php + - test {{ current_php }} != $(which php{{ phpng_version }}) + {% endif %} {% endif %}