Revert "Move state php_{{ phpng_version }}_link to cli/install.sls "

This commit is contained in:
Niels Abspoel 2017-05-05 21:05:00 +02:00 committed by GitHub
parent ec66ff202f
commit 359c8ede8b
2 changed files with 10 additions and 11 deletions

View File

@ -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 }})

View File

@ -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 %}