Cleaned up the installed package bit.

This commit is contained in:
Chad Heuschober 2014-05-20 22:07:16 -04:00
parent 5e304544ed
commit 5b18a9a4b7
2 changed files with 5 additions and 66 deletions

View File

@ -1,6 +1,8 @@
# Template for installing packages. # Template for installing packages.
{% from "php/ng/map.jinja" import php, sls_block with context %} {% from "php/ng/map.jinja" import php, sls_block with context %}
{% set opts = php.installed.get(state, {}) %}
php_install_{{ state }}: php_install_{{ state }}:
pkg.installed: pkg.installed:
{{ sls_block(php.get(state).pkg_opts) }} {{ sls_block(opts) }}
- name: {{ php.lookup.pkgs.get(state) }} - name: {{ php.lookup.pkgs.get(state) }}

View File

@ -87,23 +87,8 @@
'apache2_mod_php_ini': '/etc/php.ini', 'apache2_mod_php_ini': '/etc/php.ini',
}, },
}), }),
'adodb': { 'installed': {},
'pkg_opts': {},
},
'apc': {
'pkg_opts': {},
},
'cgi': {
'pkg_opts': {},
},
'cli': {
'pkg_opts': {},
},
'curl': {
'pkg_opts': {},
},
'fpm': { 'fpm': {
'pkg_opts': {},
'service': { 'service': {
'enabled': True, 'enabled': True,
'opts': {}, 'opts': {},
@ -124,15 +109,6 @@
'managed': {}, 'managed': {},
}, },
}, },
'gd': {
'pkg_opts': {},
},
'imagick': {
'pkg_opts': {},
},
'imap': {
'pkg_opts': {},
},
'ini': { 'ini': {
'defaults': { 'defaults': {
'PHP': { 'PHP': {
@ -294,43 +270,4 @@
}, },
}, },
}, },
'init': {
'pkg_opts': {},
},
'ldap': {
'pkg_opts': {},
},
'mbstring': {
'pkg_opts': {},
},
'mcrypt': {
'pkg_opts': {},
},
'memcache': {
'pkg_opts': {},
},
'memcached': {
'pkg_opts': {},
},
'mysql': {
'pkg_opts': {},
},
'mysqlnd': {
'pkg_opts': {},
},
'pear': {
'pkg_opts': {},
},
'pgsql': {
'pkg_opts': {},
},
'soap': {
'pkg_opts': {},
},
'suhosin': {
'pkg_opts': {},
},
'xml': {
'pkg_opts': {},
},
}, merge=True) %} }, merge=True) %}