saltstack-formulas/php-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dotdeb from php state

Browse Source 
The included state was never submitted in
https://github.com/saltstack-formulas/php-formula/pull/77 and we
therefore remove inclusion here to allow users to use the php state
again.
This commit is contained in:
Wolodja Wentland 2016-08-25 16:50:19 +02:00
parent 36bee3cf9d
commit 8e9e51d692
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
php/init.sls
View File

@ -5,11 +5,6 @@
{% 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') %}