diff --git a/roles/webserver/tasks/php.yml b/roles/webserver/tasks/php.yml index bd1314a..30d439e 100644 --- a/roles/webserver/tasks/php.yml +++ b/roles/webserver/tasks/php.yml @@ -7,6 +7,7 @@ option: "{{ item.option }}" value: "{{ item.value }}" state: "{{ item.state | default('present') }}" + mode: "0644" loop: "{{ php_fpm_ini_options }}" when: '"fpm" in php_modules' notify: Restart php-fpm @@ -14,7 +15,7 @@ - name: Configure FPM pool lineinfile: path: /etc/php/{{ php_version }}/fpm/pool.d/www.conf - regexp: '^{{ item.option }}\s' + regexp: '^;?{{ item.option }} = .*' line: '{{ item.option }} = {{ item.value }}' loop: "{{ php_fpm_pool_options }}" when: '"fpm" in php_modules' diff --git a/roles/webserver/vars/main.yml b/roles/webserver/vars/main.yml index b422ef2..0022e71 100644 --- a/roles/webserver/vars/main.yml +++ b/roles/webserver/vars/main.yml @@ -38,24 +38,27 @@ webserver_nginx_worker_rlimit_nofile: "100000" # PHP php_fpm_ini_options: - - {option: post_max_size, value: 512M} + - {option: upload_tmp_dir, value: "\"/tmp\""} - {option: upload_max_filesize, value: 512M} + - {option: post_max_size, value: 512M} - {option: memory_limit, value: 512M} - {section: opcache, option: opcache.enable, value: 1} - - {section: opcache, option: opcache.interned_strings_buffer, value: 32} + - {section: opcache, option: opcache.interned_strings_buffer, value: 64} - {section: opcache, option: opcache.max_accelerated_files, value: 10000} - {section: opcache, option: opcache.memory_consumption, value: 256} - {section: opcache, option: opcache.save_comments, value: 1} - - {section: opcache, option: opcache.revalidate_freq, value: 1} + - {section: opcache, option: opcache.revalidate_freq, value: 60} - {section: opcache, option: opcache.validate_timestamps, value: 0} + - {section: opcache, option: opcache.jit, value: 1255} + - {section: opcache, option: opcache.jit_buffer_size, value: 128M} - {section: redis, option: redis.session.locking_enabled, value: 1} - {section: redis, option: redis.session.lock_retries, value: -1} - {section: redis, option: redis.session.lock_wait_time, value: 10000} php_fpm_pool_options: - {option: pm, value: dynamic} - - {option: pm.max_children, value: 60} - - {option: pm.start_servers, value: 20} - - {option: pm.min_spare_servers, value: 10} - - {option: pm.max_spare_servers, value: 30} - - {option: pm.max_requests, value: 1000} + - {option: pm.max_children, value: 20} + - {option: pm.start_servers, value: 5} + - {option: pm.min_spare_servers, value: 5} + - {option: pm.max_spare_servers, value: 15} + - {option: pm.max_requests, value: 200}