Merge pull request #21 from Cottser/use_ppa_optional

Make use_ppa optional
This commit is contained in:
Nitin Madhok 2014-10-24 17:46:06 -07:00
commit 094a2d499c

View File

@ -1,9 +1,9 @@
{% from "php/map.jinja" import php with context %}
{% if grains['os_family']=="Debian" %}
{% set use_ppa = salt['pillar.get']('php:use_ppa', none) %}
{% if use_ppa is not none %}
{% set use_ppa = salt['pillar.get']('php:use_ppa', none) %}
{% set ppa_name = salt['pillar.get']('php:ppa_name', 'ondrej/php5') %}
php54: