Skip to content
Snippets Groups Projects
Commit f5c967fb authored by Niels Abspoel's avatar Niels Abspoel
Browse files

Improve config file handling hhvm.

In order to reuse the default structure of this formula
I changed the config a little bit to configure hhvm files.
parent b3e64eb6
No related branches found
No related tags found
No related merge requests found
......@@ -270,6 +270,31 @@ Manages php-fpm pool config files.
Manages the php-fpm service.
``php.ng.hhvm``
---------------
Meta-state that combines php.ng.hhvm states
``php.ng.hhvm.config``
----------------------
Manages the php-hhvm config files
``php.ng.hhvm.install``
-----------------------
Installs the php-hhvm package
``php.ng.hhvm.repo``
--------------------
Configures the hhvm repo for debian/ubuntu
``php.ng.hhvm.service``
-----------------------
Manages the php-hhvm service.
``php.ng.gd``
-------------
......
......@@ -2,15 +2,15 @@
{% from "php/ng/map.jinja" import php with context %}
{% from "php/ng/ini.jinja" import php_ini %}
{% set ini_settings = php.ini.defaults %}
{% do ini_settings.update(php.hhvm.config.ini.settings) %}
{% set server_settings = php.lookup.hhvm.server %}
{% do server_settings.update(php.hhvm.config.server.settings) %}
{% set conf_settings = php.lookup.hhvm.defaults %}
{% do conf_settings.update(php.hhvm.config.conf.settings) %}
{% set php_settings = php.lookup.hhvm.php %}
{% do php_settings.update(php.hhvm.config.php.settings) %}
php_hhvm_ini_config:
{{ php_ini(php.lookup.hhvm.ini, php.hhvm.config.ini.opts, ini_settings) }}
{{ php_ini(php.lookup.hhvm.conf, php.hhvm.config.server.opts, server_settings) }}
php_hhvm_conf_config:
{{ php_ini(php.lookup.hhvm.conf, php.hhvm.config.conf.opts, conf_settings) }}
{{ php_ini(php.lookup.hhvm.ini, php.hhvm.config.php.opts, php_settings) }}
......@@ -9,7 +9,7 @@ extend:
php_hhvm_service:
service:
- watch:
- file: php_hhvm_ini_cnfig
- file: php_hhvm_ini_config
- file: php_hhvm_conf_config
- require:
- sls: php.ng.hhvm.config
......
......@@ -55,11 +55,24 @@
'conf': '/etc/hhvm/server.ini',
'ini': '/etc/hhvm/php.ini',
'service': 'hhvm',
'defaults': odict([
('global', odict([
'defaults': {},
'server': odict([
('pid', '/var/run/hhvm.pid'),
('error_log', '/var/log/hhvm.log'),
])),
('hhvm.server.port', '9000'),
('hhvm.server.type', 'fastcgi'),
('hhvm.server.default_document', 'index.php'),
('hhvm.log.use_log_file', 'true'),
('hhvm.log.file', '/var/log/hhvm/error.log'),
('hhvm.repo.central.path', '/var/run/hhvm/hhvm.hhbc'),
]),
'php': odict([
('session.save_handler', 'files'),
('session.save_path', '/var/lib/hhvm/sessions'),
('session.gc_maxlifetime', '1440'),
('hhvm.log.level', 'Warning'),
('hhvm.log.always_log_unhandled_exceptions', 'true'),
('hhvm.log.runtime_error_reporting_level', '8191'),
('hhvm.mysql.typed_results', 'false'),
]),
},
'cli': {
......@@ -216,11 +229,11 @@
'opts': {},
},
'config': {
'ini': {
'server': {
'opts': {},
'settings': {},
},
'conf': {
'php': {
'opts': {},
'settings': {},
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment