Browse Source

Merge pull request #109 from babilen/fix-dotdeb-malarkey

Remove dotdeb from php state
tags/v0.34.0
Forrest 8 years ago
parent
commit
e3dc107a91
1 changed files with 0 additions and 5 deletions
  1. +0
    -5
      php/init.sls

+ 0
- 5
php/init.sls View File

{% if grains['os_family']=="Debian" %} {% if grains['os_family']=="Debian" %}
{% set use_ppa = salt['pillar.get']('php:use_ppa', none) %} {% set use_ppa = salt['pillar.get']('php:use_ppa', none) %}


{% if (grains['oscodename']=="Jessie" and salt['pillar.get']('php:version')=="7.0") or salt['pillar.get']('php:use_dotdeb') %}
include:
- php.dotdeb
{% endif %}

{% if use_ppa is not none %} {% if use_ppa is not none %}


{% set ppa_name = salt['pillar.get']('php:ppa_name', 'ondrej/php5') %} {% set ppa_name = salt['pillar.get']('php:ppa_name', 'ondrej/php5') %}

Loading…
Cancel
Save