From 5d7cfd0011e3e88089510fb7745ec54149569c9d Mon Sep 17 00:00:00 2001 From: Paul Lecuq Date: Sun, 25 Oct 2020 16:37:33 +0100 Subject: [PATCH] updated php state --- states/php/config.sls | 4 +- states/php/defaults.yaml | 180 +++++++++++++++++---------------------- 2 files changed, 81 insertions(+), 103 deletions(-) diff --git a/states/php/config.sls b/states/php/config.sls index 55643cb..fd5d75c 100644 --- a/states/php/config.sls +++ b/states/php/config.sls @@ -1,6 +1,6 @@ --- {%- from "php/map.jinja" import php with context %} -{%- if php.fpm.config != None %} +{%- if php.config != None %} php-config: ini.options_present: - name: {{ php.config_file }} @@ -26,4 +26,4 @@ php-extension-enable-{{ extension }}: - name: phpenmod {{ extension }} - watch_in: - service: php-fpm-service -{%- endfor %} \ No newline at end of file +{%- endfor %} diff --git a/states/php/defaults.yaml b/states/php/defaults.yaml index d8db79e..567d8bc 100644 --- a/states/php/defaults.yaml +++ b/states/php/defaults.yaml @@ -32,8 +32,8 @@ php: expose_php: 'Off' max_execution_time: 30 max_input_time: 60 - memory_limit: 256M - error_reporting: E_ALL & ~E_DEPRECATED & ~E_STRICT + memory_limit: '256M' + error_reporting: 'E_ALL & ~E_DEPRECATED & ~E_STRICT' display_errors: 'Off' display_startup_errors: 'Off' log_errors: 'On' @@ -42,112 +42,90 @@ php: ignore_repeated_source: 'Off' report_memleaks: 'On' html_errors: 'On' - variables_order: "GPCS" - request_order: "GP" + variables_order: 'GPCS' + request_order: '"GP"' register_argc_argv: 'Off' auto_globals_jit: 'On' - post_max_size: 8M - default_mimetype: "text/html" - default_charset: "UTF-8" + post_max_size: '8M' + default_mimetype: '"text/html"' + default_charset: '"UTF-8"' enable_dl: 'Off' file_uploads: 'On' - upload_max_filesize: 2M + upload_max_filesize: '2M' max_file_uploads: 20 allow_url_fopen: 'On' allow_url_include: 'Off' default_socket_timeout: 60 - CLI Server: - cli_server.color: 'On' - Date: - filter: - iconv: - imap: - intl: - sqlite3: - Pcre: - Pdo: - Pdo_mysql: - Phar: - mail function: - SMTP: localhost - smtp_port: 25 - mail.add_x_header: 'Off' - ODBC: - odbc.allow_persistent: 'On' - odbc.check_persistent: 'On' - odbc.max_persistent: -1 - odbc.max_links: -1 - odbc.defaultlrl: 4096 - odbc.defaultbinmode: 1 - Interbase: - ibase.allow_persistent: 1 - ibase.max_persistent: -1 - ibase.max_links: -1 - ibase.timestampformat: "%Y-%m-%d %H:%M:%S" - ibase.dateformat: "%Y-%m-%d" - ibase.timeformat: "%H:%M:%S" - MySQLi: - mysqli.max_persistent: -1 - mysqli.allow_persistent: 'On' - mysqli.max_links: -1 - mysqli.default_port: 3306 - mysqli.reconnect: 'Off' - mysqlnd: - mysqlnd.collect_statistics: 'On' - mysqlnd.collect_memory_statistics: 'Off' - OCI8: - PostgreSQL: - pgsql.allow_persistent: 'On' - pgsql.auto_reset_persistent: 'Off' - pgsql.max_persistent: -1 - pgsql.max_links: -1 - pgsql.ignore_notice: 0 - pgsql.log_notice: 0 - bcmath: - bcmath.scale: 0 - browscap: - Session: - session.save_handler: files - session.use_strict_mode: 0 - session.use_cookies: 1 - session.use_only_cookies: 1 - session.name: PHPSESSID - session.auto_start: 0 - session.cookie_lifetime: 0 - session.cookie_path: / - session.serialize_handler: php - session.gc_probability: 0 - session.gc_divisor: 1000 - session.gc_maxlifetime: 1440 - session.cache_limiter: nocache - session.cache_expire: 180 - session.use_trans_sid: 0 - session.sid_length: 26 - session.trans_sid_tags: "'a=href,area=href,frame=src,form='" - session.sid_bits_per_character: 5 - Assertion: - zend.assertions: -1 - COM: - mbstring: - gd: - exif: - Tidy: - tidy.clean_output: 'Off' - - soap: - soap.wsdl_cache_enabled: 1 - soap.wsdl_cache_dir: "/tmp" - soap.wsdl_cache_ttl: 86400 - soap.wsdl_cache_limit: 5 - sysvshm: - ldap: - ldap.max_links: -1 - dba: - opcache: - curl: - openssl: + CLI Server: + cli_server.color: 'On' + mail function: + SMTP: 'localhost' + smtp_port: 25 + mail.add_x_header: 'Off' + ODBC: + odbc.allow_persistent: 'On' + odbc.check_persistent: 'On' + odbc.max_persistent: '-1' + odbc.max_links: '-1' + odbc.defaultlrl: 4096 + odbc.defaultbinmode: 1 + Interbase: + ibase.allow_persistent: 1 + ibase.max_persistent: '-1' + ibase.max_links: '-1' + ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"' + ibase.dateformat: '"%Y-%m-%d"' + ibase.timeformat: '"%H:%M:%S"' + MySQLi: + mysqli.max_persistent: '-1' + mysqli.allow_persistent: 'On' + mysqli.max_links: '-1' + mysqli.default_port: 3306 + mysqli.reconnect: 'Off' + mysqlnd: + mysqlnd.collect_statistics: 'On' + mysqlnd.collect_memory_statistics: 'Off' + PostgreSQL: + pgsql.allow_persistent: 'On' + pgsql.auto_reset_persistent: 'Off' + pgsql.max_persistent: '-1' + pgsql.max_links: '-1' + pgsql.ignore_notice: 0 + pgsql.log_notice: 0 + bcmath: + bcmath.scale: 0 + Session: + session.save_handler: 'files' + session.use_strict_mode: 0 + session.use_cookies: 1 + session.use_only_cookies: 1 + session.name: 'PHPSESSID' + session.auto_start: 0 + session.cookie_lifetime: 0 + session.cookie_path: '/' + session.serialize_handler: 'php' + session.gc_probability: 0 + session.gc_divisor: 1000 + session.gc_maxlifetime: 1440 + session.cache_limiter: 'nocache' + session.cache_expire: 180 + session.use_trans_sid: 0 + session.sid_length: 26 + session.trans_sid_tags: '"a=href,area=href,frame=src,form="' + session.sid_bits_per_character: 5 + Assertion: + zend.assertions: '-1' + Tidy: + tidy.clean_output: 'Off' + soap: + soap.wsdl_cache_enabled: 1 + soap.wsdl_cache_dir: '/tmp' + soap.wsdl_cache_ttl: 86400 + soap.wsdl_cache_limit: 5 + ldap: + ldap.max_links: '-1' fpm: - config_file: /etc/php/7.3/fpm/php-fpm.conf - config: - socket: /var/run/php/php7.3-fpm.sock + config_file: '/etc/php/7.3/fpm/php-fpm.conf' + config: {} + socket: '/var/run/php/php7.3-fpm.sock'