diff --git a/php/map.jinja b/php/map.jinja index 8bbd1dd..31ada9b 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -23,6 +23,7 @@ 'suhosin_pkg': 'php7.0-suhosin', 'pgsql_pkg': 'php5-pgsql', 'dev_pkg': 'php7.0-dev', + 'zip_pkg': 'php7.0-zip', 'php_ini': '/etc/php7.0/apache2/php.ini', }, }, merge=salt['pillar.get']('php:lookup')) %} @@ -64,6 +65,7 @@ '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', @@ -104,6 +106,7 @@ 'ldap_pkg': 'php-ldap', 'php_ini': '/etc/php.ini', 'dev_pkg': 'php-dev', + 'zip_pkg': 'php', 'mongo_pecl': 'mongo', 'mongo_ext': 'mongo.so', 'ext_conf_path': '/etc/php5/conf.d', @@ -135,6 +138,7 @@ 'ldap_pkg': 'php5-ldap', 'php_ini': '/etc/php5/apache2/php.ini', 'dev_pkg': 'php5-devel', + 'zip_pkg': 'php5-zip', 'mongo_pecl': 'mongo', 'mongo_ext': 'mongo.so', 'ext_conf_path': '/etc/php5/conf.d', diff --git a/php/ng/map.jinja b/php/ng/map.jinja index 20ba450..922b8f8 100644 --- a/php/ng/map.jinja +++ b/php/ng/map.jinja @@ -17,10 +17,11 @@ 'mcrypt': 'php7.0-mcrypt', 'mysql': 'php7.0-mysql', 'pspell': 'php7.0-pspell', - 'soap': 'phpi7.0-soap', + 'soap': 'php7.0-soap', 'sqlite': 'php7.0-sqlite3', 'xsl': 'php7.0-xsl', 'xml': 'php7.0-xml', + 'zip': 'php7.0-zip', 'imap': 'php7.0-imap', 'pgsql': 'php7.0-pgsql', 'ldap': 'php7.0-ldap', @@ -313,6 +314,7 @@ 'xdebug': 'php5-xdebug', 'xsl': 'php5-xsl', 'xml': 'php5', + 'zip': 'php5', 'redis': 'php5-redis', 'imagick': 'php5-imagick', 'suhosin': 'php5-suhosin', @@ -394,6 +396,7 @@ 'sqlite': 'php5-sqlite', 'xcache': 'php-xcache', 'xml': 'php-xml', + 'zip': 'php', 'redis': 'php-redis', 'imagick': 'php-imagick', 'suhosin': 'php-suhosin', @@ -440,6 +443,7 @@ 'soap': 'php5-soap', 'sqlite': 'php5-sqlite', 'xml': ['php5-xmlreader','php5-xmlwriter','php5-xmlrpc'], + 'zip': 'php5-zip', 'suhosin': 'php5-suhosin', 'imap': 'php5-imap', 'adodb': 'php5-dba', diff --git a/php/ng/zip.sls b/php/ng/zip.sls new file mode 100644 index 0000000..1c5bd28 --- /dev/null +++ b/php/ng/zip.sls @@ -0,0 +1,2 @@ +{% set state = 'zip' %} +{% include "php/ng/installed.jinja" %} diff --git a/php/zip.sls b/php/zip.sls new file mode 100644 index 0000000..d7420bf --- /dev/null +++ b/php/zip.sls @@ -0,0 +1,5 @@ +{% from "php/map.jinja" import php with context %} + +php-zip: + pkg.installed: + - name: {{ php.zip_pkg }}