Merge pull request #8 from fintanmm/master

Added additional modules.
This commit is contained in:
Seth House 2014-04-02 16:40:56 -07:00
commit 0dff46b6f2
8 changed files with 106 additions and 1 deletions

View File

@ -25,6 +25,11 @@ Installs the php package.
Installs the php-apc package. Installs the php-apc package.
``php.adodb``
------------
Installs the php-adodb package.
``php.curl`` ``php.curl``
------------ ------------
@ -42,11 +47,43 @@ Installs the php-fpm package, starts the service, and enables it.
Installs the php-gd package. Installs the php-gd package.
``php.imagick``
------------
Installs the php-imagick package.
``php.imap``
------------
Installs the php-imap package.
``php.ldap``
------------
Installs the php-ldap package.
``php.mbstring``
---------------
Installs the php-mbstring package.
``php.mcrypt`` ``php.mcrypt``
-------------- --------------
Installs the php-mcrypt package. Installs the php-mcrypt package.
``php.memcache``
------------
Installs the php-memcache package.
``php.memcached``
------------
Installs the php-memcached package.
``php.mysql`` ``php.mysql``
------------- -------------
@ -56,3 +93,23 @@ Installs the php-mysql package.
------------ ------------
Installs the php-pear package. Installs the php-pear package.
``php.pgsql``
------------
Installs the php-pgsql package.
``php.soap``
------------
Installs the php-soap package.
``php.suhosin``
------------
Installs the php-suhosin package.
``php.xml``
------------
Installs the php-xml package.

6
php/adodb.sls Normal file
View File

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

6
php/imagick.sls Normal file
View File

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

6
php/imap.sls Normal file
View File

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

6
php/ldap.sls Normal file
View File

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

View File

@ -13,7 +13,13 @@
'pear_pkg': ' php-pear', 'pear_pkg': ' php-pear',
'soap_pkg': ' php-soap', 'soap_pkg': ' php-soap',
'fpm_service': 'php5-fpm', 'fpm_service': 'php5-fpm',
'xml_pkg': ' php5', 'xml_pkg': ' php5-xml',
'imagick_pkg': 'php5-imagick',
'suhosin_pkg': 'php5-suhosin',
'imap_pkg': 'php5-imap',
'adodb_pkg': 'php5-adodb',
'pgsql_pkg': 'php5-pgsql',
'ldap_pkg': 'php5-ldap',
}, },
'RedHat': { 'RedHat': {
'php_pkg': 'php', 'php_pkg': 'php',
@ -30,5 +36,11 @@
'soap_pkg': ' php-soap', 'soap_pkg': ' php-soap',
'fpm_service': 'php-fpm', 'fpm_service': 'php-fpm',
'xml_pkg': ' php-xml', 'xml_pkg': ' php-xml',
'imagick_pkg': 'php-imagick',
'suhosin_pkg': 'php-suhosin',
'imap_pkg': 'php-imap',
'adodb_pkg': 'php-adodb',
'pgsql_pkg': 'php-pgsql',
'ldap_pkg': 'php-ldap',
}, },
}, merge=salt['pillar.get']('php:lookup')) %} }, merge=salt['pillar.get']('php:lookup')) %}

6
php/pgsql.sls Normal file
View File

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

6
php/suhosin.sls Normal file
View File

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