Finishes first-pass documentation and fixes minor niggle in pools_config.
This commit is contained in:
parent
ef19addb98
commit
7f90be9f9f
@ -16,12 +16,12 @@
|
|||||||
{{ state }}:
|
{{ state }}:
|
||||||
{% if config.enabled %}
|
{% if config.enabled %}
|
||||||
file.managed:
|
file.managed:
|
||||||
{{ sls_block(config.opts) }}
|
{{ sls_block(config.get('opts', {})) }}
|
||||||
- name: {{ fpath }}
|
- name: {{ fpath }}
|
||||||
- source: salt://php/ng/files/php.ini
|
- source: salt://php/ng/files/php.ini
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- context:
|
- context:
|
||||||
config: {{ serialize(config.settings) }}
|
config: {{ serialize(config.get('settings', {})) }}
|
||||||
{% else %}
|
{% else %}
|
||||||
file.absent:
|
file.absent:
|
||||||
- name: {{ fpath }}
|
- name: {{ fpath }}
|
||||||
|
@ -107,3 +107,34 @@ php:
|
|||||||
pm.min_spare_servers: 1
|
pm.min_spare_servers: 1
|
||||||
pm.max_spare_servers: 3
|
pm.max_spare_servers: 3
|
||||||
'php_admin_value[memory_limit]': 300M
|
'php_admin_value[memory_limit]': 300M
|
||||||
|
|
||||||
|
# php-cli settings
|
||||||
|
cli:
|
||||||
|
# settings to manage the cli's php.ini
|
||||||
|
ini:
|
||||||
|
# opts passed forward directly to file.managed
|
||||||
|
opts:
|
||||||
|
replace: False
|
||||||
|
# contents of the php.ini file that are merged with defaults
|
||||||
|
# from php.ng.ini.defaults. See php.ng.ini.defaults for ini-style
|
||||||
|
# syntax guidelines
|
||||||
|
settings:
|
||||||
|
PHP:
|
||||||
|
engine: 'Off'
|
||||||
|
|
||||||
|
# global php.ini settings
|
||||||
|
ini:
|
||||||
|
# Default php.ini contents. These follow a strict format. The top-
|
||||||
|
# level dict keys form ini group headings. Nested key/value
|
||||||
|
# pairs represent setting=value statements. If a value is a list,
|
||||||
|
# its contents will be joined by commas in final rendering.
|
||||||
|
defaults:
|
||||||
|
PHP:
|
||||||
|
engine: on
|
||||||
|
output_buffering: 4096
|
||||||
|
disable_functions:
|
||||||
|
- pcntl_alarm
|
||||||
|
- pcntl_fork
|
||||||
|
- pcntl_wait
|
||||||
|
'CLI Server':
|
||||||
|
cli_server_color: 'On'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user