add libapache2-mod-php5 options on debian only

This commit is contained in:
Niels Abspoel 2015-02-25 21:51:16 +01:00
parent 2147067ca2
commit 9df35f0c82
4 changed files with 35 additions and 0 deletions

9
php/ng/apache2/ini.sls Normal file
View File

@ -0,0 +1,9 @@
# Manages the libapache2-mod-php5 main ini file
{% from 'php/ng/map.jinja' import php with context %}
{% from "php/ng/ini.jinja" import php_ini %}
{% set settings = php.ini.defaults %}
{% do settings.update(php.apache2.ini.settings) %}
php_apache2_ini:
{{ php_ini(php.lookup.apache2.ini, php.apache2.ini.opts, settings) }}

14
php/ng/apache2/init.sls Normal file
View File

@ -0,0 +1,14 @@
# Installs libapache2-mod-php5 package and manages the associated php.ini on os Debian
{% if grains['os_family']=="Debian" %}
include:
- php.ng.apache2.install
- php.ng.apache2.ini
extend:
php_apache2_ini:
file:
- require:
- sls: php.ng.apache2.install
{% endif %} #END: os = debian

View File

@ -0,0 +1,2 @@
{% set state = 'apache2' %}
{% include "php/ng/installed.jinja" %}

View File

@ -6,6 +6,7 @@
'apc': 'php-apc', 'apc': 'php-apc',
'cgi': 'php5-cgi', 'cgi': 'php5-cgi',
'cli': 'php5-cli', 'cli': 'php5-cli',
'apache2': 'libapache2-mod-php5',
'curl': 'php5-curl', 'curl': 'php5-curl',
'fpm': 'php5-fpm', 'fpm': 'php5-fpm',
'gd': 'php5-gd', 'gd': 'php5-gd',
@ -44,6 +45,9 @@
'cli': { 'cli': {
'ini': '/etc/php5/cli/php.ini', 'ini': '/etc/php5/cli/php.ini',
}, },
'apache2': {
'ini': '/etc/php5/apache2/php.ini',
},
}, },
'RedHat': { 'RedHat': {
'pkgs': { 'pkgs': {
@ -114,6 +118,12 @@
'settings': {}, 'settings': {},
} }
}, },
'apache2': {
'ini': {
'opts': {},
'settings': {},
}
},
'ini': { 'ini': {
'defaults': { 'defaults': {
'PHP': { 'PHP': {