Browse Source

Added the readline PHP package and support for PHP7 in Debian.

tags/v0.34.0
Bogdan Radulescu 8 years ago
parent
commit
8fc048a4b5
3 changed files with 37 additions and 3 deletions
  1. +7
    -0
      php/init.sls
  2. +24
    -3
      php/map.jinja
  3. +6
    -0
      php/readline.sls

+ 7
- 0
php/init.sls View File



{% if grains['os_family']=="Debian" %} {% if grains['os_family']=="Debian" %}
{% set use_ppa = salt['pillar.get']('php:use_ppa', none) %} {% set use_ppa = salt['pillar.get']('php:use_ppa', none) %}

{% if (grains['oscodename']=="Jessie" and salt['pillar.get']('php:version')=="7.0") or salt['pillar.get']('php:use_dotdeb') %}
include:
- php.dotdeb
{% endif %}

{% if use_ppa is not none %} {% if use_ppa is not none %}


{% set ppa_name = salt['pillar.get']('php:ppa_name', 'ondrej/php5') %} {% set ppa_name = salt['pillar.get']('php:ppa_name', 'ondrej/php5') %}
pkg.latest: pkg.latest:
- name: php5 - name: php5
- refresh: True - refresh: True

{% endif %} {% endif %}
{% endif %} {% endif %}



+ 24
- 3
php/map.jinja View File

{% if salt['pillar.get']('php:version')|string == '7.0' %}

{% set php = salt['grains.filter_by']({
'Debian': {
'php_pkg': 'php7.0',
'apcu_pkg': 'php7.0-apcu',
'fpm_pkg': 'php7.0-fpm',
'json_pkg': 'php7.0-json',
'memcached_pkg': 'php7.0-memcached',
'redis_pkg': 'php7.0-redis',
'dev_pkg': 'php7.0-dev',
'php_ini': '/etc/php7.0/apache2/php.ini',
},
}, merge=salt['pillar.get']('php:lookup')) %}

{% else %}

{% set php = salt['grains.filter_by']({ {% set php = salt['grains.filter_by']({
'Debian': { 'Debian': {
'php_pkg': 'php5', 'php_pkg': 'php5',
'mysql_pkg': 'php5-mysql', 'mysql_pkg': 'php5-mysql',
'mysqlnd_pkg': 'php5-mysqlnd', 'mysqlnd_pkg': 'php5-mysqlnd',
'pear_pkg': 'php-pear', 'pear_pkg': 'php-pear',
'readline_pkg': ' php5-readline',
'soap_pkg': 'php-soap', 'soap_pkg': 'php-soap',
'sqlite_pkg': 'php5-sqlite',
'sqlite_pkg': 'php5-sqlite',
'redis_pkg': 'php5-redis', 'redis_pkg': 'php5-redis',
'fpm_service': 'php5-fpm',
'xml_pkg': 'php5', 'xml_pkg': 'php5',
'imagick_pkg': 'php5-imagick', 'imagick_pkg': 'php5-imagick',
'suhosin_pkg': 'php5-suhosin', 'suhosin_pkg': 'php5-suhosin',
'mysql_pkg': 'php-mysql', 'mysql_pkg': 'php-mysql',
'mysqlnd_pkg': 'php-mysqlnd', 'mysqlnd_pkg': 'php-mysqlnd',
'pear_pkg': 'php-pear', 'pear_pkg': 'php-pear',
'readline_pkg': ' php-readline',
'soap_pkg': 'php-soap', 'soap_pkg': 'php-soap',
'sqlite_pkg': 'php5-sqlite',
'sqlite_pkg': 'php5-sqlite',
'redis_pkg': 'php-redis', 'redis_pkg': 'php-redis',
'fpm_service': 'php-fpm', 'fpm_service': 'php-fpm',
'xml_pkg': 'php-xml', 'xml_pkg': 'php-xml',
'mcrypt_pkg': 'php5-mcrypt', 'mcrypt_pkg': 'php5-mcrypt',
'mysql_pkg': 'php5-mysql', 'mysql_pkg': 'php5-mysql',
'pear_pkg': 'php5-pear', 'pear_pkg': 'php5-pear',
'readline_pkg': ' php5-readline',
'soap_pkg': 'php5-soap', 'soap_pkg': 'php5-soap',
'sqlite_pkg': 'php5-sqlite', 'sqlite_pkg': 'php5-sqlite',
'fpm_service': 'php5-fpm', 'fpm_service': 'php5-fpm',
'composer_hash': 'sha256=6a1ba6495f0bdb8e7735a7a76948b61c54b4a57b56837a9e9f93b4a0ac1f83a5', 'composer_hash': 'sha256=6a1ba6495f0bdb8e7735a7a76948b61c54b4a57b56837a9e9f93b4a0ac1f83a5',
}, },
}, merge=salt['pillar.get']('php:lookup')) %} }, merge=salt['pillar.get']('php:lookup')) %}

{% endif %}

+ 6
- 0
php/readline.sls View File

{% from "php/map.jinja" import php with context %}

php-readline:
pkg:
- installed
- name: {{ php.readline_pkg }}

Loading…
Cancel
Save