saltstack-formulas/php-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64 from danoe/dev

Browse Source 
manage xcache.ini in pillar
This commit is contained in:
Forrest 2015-10-23 15:36:52 -07:00
commit 256145736a
6 changed files with 171 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
README.rst
View File

@ -75,7 +75,6 @@ Installs the php-gd package.
Installs the php-intl package.
``php.imagick``
---------------
@ -107,7 +106,6 @@ Installs the php-mbstring package.
Installs the php-mcrypt package.
``php.memcache``
----------------
@ -196,6 +194,21 @@ Installs the php package.
Installs the php-adodb package.
``php.ng.apache2``
----------------
Meta-state that combines `php.ng.apache2.install`_ and `php.ng.apache2.ini`_.
``php.ng.apache2.ini``
--------------
Manages the apache2 php.ini file
``php.ng.apache2.install``
--------------
Installs the apache2 and libapache2-mod-php5 package. Debian Only.
``php.ng.apc``
--------------
@ -219,16 +232,16 @@ Disabled on opensuse only php5-fastcgi available.
Meta-state that combines `php.ng.cli.install`_ and `php.ng.cli.ini`_.
``php.ng.cli.install``
----------------------
Installs the php-cli package.
``php.ng.cli.ini``
------------------
Manages the php-cli ini file.
``php.ng.cli.install``
----------------------
Installs the php-cli package.
``php.ng.curl``
---------------
@ -246,30 +259,41 @@ Meta-state that combines all php.ng.fpm states.
Manages the (non-pool) php-fpm config files.
``php.ng.fpm.install``
----------------------
Installs the php-fpm package.
``php.ng.fpm.pools``
--------------------
Meta-state that combines `php.ng.fpm.service`_ and `php.ng.fpm.pools_config`_
``php.ng.fpm.pools_config``
---------------------------
Manages php-fpm pool config files.
``php.ng.fpm.service``
----------------------
Manages the php-fpm service.
``php.ng.gd``
-------------
Installs the php-gd package.
``php.ng.geoip``
----------------------
Installs the php-geoip package.
``php.ng.gmp``
----------
Installs the php-gmp package. Debian Only.
``php.ng.hhvm``
---------------
@ -295,12 +319,6 @@ Configures the hhvm repo for debian/ubuntu
Manages the php-hhvm service.
``php.ng.gd``
-------------
Installs the php-gd package.
``php.ng.imagick``
------------------
@ -337,21 +355,18 @@ Installs the php-mbstring package.
Installs the php-mcrypt package.
``php.ng.memcache``
-------------------
Installs the php-memcache package.
Disabled on opensuse need server:php:extensions repo
``php.ng.memcached``
--------------------
Installs the php-memcached package.
Disabled on opensuse need server:php:extensions repo
``php.ng.mysql``
----------------
@ -363,23 +378,32 @@ Installs the php-mysql package.
Installs the php-mysqlnd package.
Disabled on opensuse no package.
``php.ng.oauth``
---------------
Installs the php-oauth package.
``php.ng.pear``
---------------
Installs the php-pear package.
``php.ng.pgsql``
----------------
Installs the php-pgsql package.
``php.ng.pspell``
----------------
Installs the php-pspell package.
``php.ng.redis``
---------------
Installs the php-redis package.
Disabled on opensuse need server:php:extensions repo
``php.ng.pgsql``
----------------
Installs the php-pgsql package.
``php.ng.soap``
---------------
@ -395,7 +419,33 @@ Installs the php-sqlite package,
Installs the php-suhosin package.
``php.ng.xcache``
---------------
Meta-state that combines `php.ng.xcache.install`_ and `php.ng.xcache.ini`_.
``php.ng.xcache.ini``
---------------
Manages the php-xcache ini file
``php.ng.xcache.install``
---------------
Installs the php-xcache package.
Disabled on opensuse need server:php:extensions repo
``php.ng.xdebug``
--------------
Installs the php-xdebug package.
``php.ng.xml``
--------------
Installs the php-xml package.
``php.ng.xsl``
--------------
Installs the php-xsl package.

57
php/ng/map.jinja
View File

@ -26,6 +26,7 @@
'pspell': 'php5-pspell',
'soap': 'php-soap',
'sqlite': 'php5-sqlite',
'xcache': 'php5-xcache',
'xdebug': 'php5-xdebug',
'xsl': 'php5-xsl',
'xml': 'php5',
@ -81,6 +82,10 @@
'apache2': {
'ini': '/etc/php5/apache2/php.ini',
},
'xcache': {
'ini': '/etc/php5/mods-available/xcache.ini',
'defaults': {},
},
},
'RedHat': {
'pkgs': {
@ -103,6 +108,7 @@
'pear': 'php-pear',
'soap': 'php-soap',
'sqlite': 'php5-sqlite',
'xcache': 'php-xcache',
'xml': 'php-xml',
'redis': 'php-redis',
'imagick': 'php-imagick',
@ -129,6 +135,9 @@
'cli': {
'ini': '/etc/php.ini',
},
'xcache': {
'ini': '/etc/php.d/xcache.ini',
},
},
'Suse': {
'pkgs': {
@ -185,6 +194,7 @@
'memcached': 'php-memcached',
'pear': 'php-pear',
'sqlite': 'php-sqlite',
'xcache': 'php-xcache',
'pgsql': 'php-pgsql',
'ldap': 'php-ldap',
},
@ -204,6 +214,9 @@
'cli': {
'ini': '/etc/php.ini',
},
'xcache': {
'ini': '/etc/php/conf.d/xcache.ini',
},
},
}),
'fpm': {
@ -251,6 +264,50 @@
'settings': {},
}
},
'xcache': {
'ini': {
'defaults': {
'xcache-common': {
'extension': 'xcache.so',
},
'xcache.admin': {
'xcache.admin.enable_auth': 'On',
},
'xcache': {
'xcache.shm_scheme': '"mmap"',
'xcache.size': '60M',
'xcache.count': '1',
'xcache.slots': '8K',
'xcache.ttl': '0',
'xcache.gc_interval': '0',
'xcache.var_size': '4M',
'xcache.var_count': '1',
'xcache.var_slots': '8K',
'xcache.var_ttl': '0',
'xcache.var_maxttl': '0',
'xcache.var_gc_interval': '300',
'xcache.var_namespace_mode': '0',
'xcache.var_namespace': '""',
'xcache.readonly_protection': 'Off',
'xcache.mmap_path': '"/dev/zero"',
'xcache.coredump_directory': '""',
'xcache.coredump_type': '0',
'xcache.disable_on_crash': 'Off',
'xcache.experimental': 'Off',
'xcache.cacher': 'On',
'xcache.stat': 'On',
'xcache.optimizer': 'Off',
},
'xcache.coverager': {
'xcache.coverager': 'Off',
'xcache.coverager_autostart': 'On',
'xcache.coveragedump_directory': '""',
},
},
'opts': {},
'settings': {},
}
},
'ini': {
'defaults': {
'PHP': {

15
php/ng/xcache/ini.sls Normal file
View File

@ -0,0 +1,15 @@
# Manages the php cli main ini file
{% from 'php/ng/map.jinja' import php with context %}
{% from "php/ng/ini.jinja" import php_ini %}
{% set settings = php.xcache.ini.defaults %}
{% for key, value in php.xcache.ini.settings.iteritems() %}
{% if settings[key] is defined %}
{% do settings[key].update(value) %}
{% else %}
{% do settings.update({key: value}) %}
{% endif %}
{% endfor %}
php_xcache_ini:
{{ php_ini(php.lookup.xcache.ini, php.xcache.ini.opts, settings) }}

11
php/ng/xcache/init.sls Normal file
View File

@ -0,0 +1,11 @@
# Installs php-xcache and manages the associated xcache.ini
include:
- php.ng.xcache.install
- php.ng.xcache.ini
extend:
php_xcache_ini:
file:
- require:
- sls: php.ng.xcache.install

2
php/ng/xcache/install.sls Normal file
View File

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

10
pillar.example
View File

@ -134,6 +134,16 @@ php:
PHP:
engine: 'Off'
# php-xcache settings
xcache:
ini:
opts: {}
# contents of the xcache.ini file that are merged with defaults
# from php.xcache.ini.defaults. See php.ng.ini.defaults for ini-style
settings:
xcache:
xcache.size: 90M
# global php.ini settings
ini:
# Default php.ini contents. These follow a strict format. The top-