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

Remove dotdeb from php state
2016-08-25 09:08:07 -07:00 · 2016-08-25 09:08:07 -07:00 · e3dc107a91
commit e3dc107a91
parent 36bee3cf9d 8e9e51d692
1 changed files with 0 additions and 5 deletions
--- a/php/init.sls
+++ b/php/init.sls
@ -5,11 +5,6 @@
 {% if grains['os_family']=="Debian" %}
 {% 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 %}

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