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

Merge pull request #106 from babilen/fix-php-dev

Browse Source 
Remove duplicate `dev_pkg` entries.
This commit is contained in:
Nitin Madhok 2016-07-25 09:21:03 -04:00 committed by GitHub
commit 36bee3cf9d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
php/map.jinja
View File

@ -117,7 +117,6 @@
'ldap_pkg': 'php5-ldap', 'ldap_pkg': 'php5-ldap',
'php_ini': '/etc/php5/apache2/php.ini', 'php_ini': '/etc/php5/apache2/php.ini',
'dev_pkg': 'php5-dev', 'dev_pkg': 'php5-dev',
'dev_pkg': 'php5',
'mongo_pecl': 'mongo', 'mongo_pecl': 'mongo',
'mongo_ext': 'mongo.so', 'mongo_ext': 'mongo.so',
'ext_conf_path': '/etc/php5/mods-available', 'ext_conf_path': '/etc/php5/mods-available',
@ -164,7 +163,6 @@
'ldap_pkg': 'php5-ldap', 'ldap_pkg': 'php5-ldap',
'php_ini': '/etc/php5/apache2/php.ini', 'php_ini': '/etc/php5/apache2/php.ini',
'dev_pkg': 'php5-dev', 'dev_pkg': 'php5-dev',
'dev_pkg': 'php5',
'mongo_pecl': 'mongo', 'mongo_pecl': 'mongo',
'mongo_ext': 'mongo.so', 'mongo_ext': 'mongo.so',
'ext_conf_path': '/etc/php5/mods-available', 'ext_conf_path': '/etc/php5/mods-available',
@ -245,7 +243,7 @@
'temp_dir': '/tmp', 'temp_dir': '/tmp',
'composer_bin': 'composer', 'composer_bin': 'composer',
}, },
}, merge=salt['pillar.get']('php:lookup')) %} }, merge=salt['pillar.get']('php:lookup')) %}
{% endif %} {% endif %}
{% endif %} {% endif %}