Merge pull request #6 from bogdanr/master

New modules: mbstring and xml
This commit is contained in:
Joseph Hall 2014-02-06 07:15:36 -07:00
commit 354d3aa768
3 changed files with 16 additions and 0 deletions

View File

@ -5,12 +5,14 @@
'curl_pkg': 'php5-curl',
'fpm_pkg': 'php5-fpm',
'gd_pkg': 'php5-gd',
'mbstring_pkg': 'php5',
'mcrypt_pkg': 'php5-mcrypt',
'memcache_pkg': 'php5-memcache',
'memcached_pkg': 'php5-memcached',
'mysql_pkg': 'php5-mysql',
'pear_pkg': ' php-pear',
'fpm_service': 'php5-fpm',
'xml_pkg': ' php5',
},
'RedHat': {
'php_pkg': 'php',
@ -18,11 +20,13 @@
'curl_pkg': 'curl',
'fpm_pkg': 'php-fpm',
'gd_pkg': 'php-gd',
'mbstring_pkg': 'php-mbstring',
'mcrypt_pkg': 'php-mcrypt',
'memcache_pkg': 'php-pecl-memcache',
'memcached_pkg': 'php-pecl-memcached',
'mysql_pkg': 'php-mysql',
'pear_pkg': ' php-pear',
'fpm_service': 'php-fpm',
'xml_pkg': ' php-xml',
},
}, merge=salt['pillar.get']('php:lookup')) %}

6
php/mbstring.sls Normal file
View File

@ -0,0 +1,6 @@
{% from "php/map.jinja" import php with context %}
php-mbstring:
pkg:
- installed
- name: {{ php.mbstring_pkg }}

6
php/xml.sls Normal file
View File

@ -0,0 +1,6 @@
{% from "php/map.jinja" import php with context %}
php-xml:
pkg:
- installed
- name: {{ php.xml_pkg }}