Browse Source

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

tags/v0.34.0
Niels Abspoel 7 years ago
parent
commit
359c8ede8b
2 changed files with 10 additions and 11 deletions
  1. +0
    -11
      php/ng/cli/install.sls
  2. +10
    -0
      php/ng/installed.jinja

+ 0
- 11
php/ng/cli/install.sls 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 }})

+ 10
- 0
php/ng/installed.jinja 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 %}


Loading…
Cancel
Save