From 41f417be16ebd063e1751f4bffac2839ef24ea76 Mon Sep 17 00:00:00 2001 From: Wolodja Wentland Date: Mon, 25 Jul 2016 14:50:56 +0200 Subject: [PATCH] Remove duplicate `dev_pkg` entries. This was introduced in #86 and really should have never been released. --- php/map.jinja | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/php/map.jinja b/php/map.jinja index 5d49601..031dba6 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -117,7 +117,6 @@ 'ldap_pkg': 'php5-ldap', 'php_ini': '/etc/php5/apache2/php.ini', 'dev_pkg': 'php5-dev', - 'dev_pkg': 'php5', 'mongo_pecl': 'mongo', 'mongo_ext': 'mongo.so', 'ext_conf_path': '/etc/php5/mods-available', @@ -164,7 +163,6 @@ 'ldap_pkg': 'php5-ldap', 'php_ini': '/etc/php5/apache2/php.ini', 'dev_pkg': 'php5-dev', - 'dev_pkg': 'php5', 'mongo_pecl': 'mongo', 'mongo_ext': 'mongo.so', 'ext_conf_path': '/etc/php5/mods-available', @@ -245,7 +243,7 @@ 'temp_dir': '/tmp', 'composer_bin': 'composer', }, - + }, merge=salt['pillar.get']('php:lookup')) %} {% endif %} {% endif %}