Merge pull request #70 from hackel/master
Manually add php PPA in UTF-8 locale [Resolves #69]
This commit is contained in:
commit
8ee1b4bbed
@ -26,13 +26,25 @@
|
||||
|
||||
{% set ppa_name = salt['pillar.get']('php:ppa_name', 'ondrej/php5') %}
|
||||
|
||||
php_ppa_env_{{ state }}:
|
||||
cmd.run:
|
||||
- name: apt-add-repository -y ppa:{{ ppa_name }}
|
||||
- env:
|
||||
- LC_ALL: C.UTF-8
|
||||
|
||||
php_ppa_{{ state }}:
|
||||
pkgrepo.managed:
|
||||
- ppa: {{ ppa_name }}
|
||||
- require:
|
||||
- cmd: php_ppa_env_{{ state }}
|
||||
- require_in:
|
||||
- pkg: php_install_{{ state }}
|
||||
pkg.latest:
|
||||
- name: {{ state }}
|
||||
- pkgs: {{ pkgs|json() }}
|
||||
- refresh: True
|
||||
- onchanges:
|
||||
- pkgrepo: php_ppa_{{ state }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user