diff --git a/defaults/main.yml b/defaults/main.yml index f6a7e5b..855e828 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -61,7 +61,8 @@ wordpress_local_nginx_virtualhost: '{{ wordpress_local_nginx }}' wordpress_doc_root: /var/www/html/wordpress phpfpm_default_memory_limit: "128M" -wordpress_upload_max_filesize: 32M +wordpress_upload_max_filesize: '32M' +wordpress_post_max_filesize: '{{ wordpress_upload_max_filesize }}' nginx_client_max_body_size: '{{ wordpress_upload_max_filesize }}' phpfpm_allow_url_fopen: '{{ wordpress_phpfpm_allow_url_fopen }}' phpfpm_max_execution_time: '{{ wordpress_phpfpm_max_execution_time }}' diff --git a/meta/main.yml b/meta/main.yml index 51a49bd..8ea9972 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -16,6 +16,6 @@ galaxy_info: - wordpress #dependencies: +# - role: 'php-fpm' # - { role: '../../library/roles/mysql', when: wordpress_local_mysql } -# - role: '../../library/roles/php-fpm' # - { role: '../../library/roles/nginx', when: wordpress_local_nginx } diff --git a/vars/main.yml b/vars/main.yml index b5fcc48..f6aed1c 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -34,4 +34,4 @@ phpfpm_default_user: '{{ wordpress_system_user }}' wordpress_phpfpm_allow_url_fopen: 'on' wordpress_phpfpm_max_execution_time: '240' wordpress_phpfpm_pool: - - { pool_name: '{{ phpfpm_default_pool_name }}', app_context: '{{ phpfpm_default_context }}', user: '{{ phpfpm_default_user }}', group: '{{ phpfpm_default_group }}', listen: '{{ wordpress_php_listen }}', allowed_clients: '{{ phpfpm_default_allowed_clients }}', pm: '{{ phpfpm_default_pm }}', pm_max_children: '{{ phpfpm_default_pm_max_children }}', pm_start_servers: '{{ phpfpm_default_pm_start_servers }}', pm_min_spare: '{{ phpfpm_default_pm_min_spare_servers }}', pm_max_spare: '{{ phpfpm_default_pm_max_spare_servers }}', pm_max_requests: '{{ phpfpm_default_pm_max_requests }}', pm_status_enabled: '{{ phpfpm_default_pm_status_enabled }}', pm_status_path: '{{ phpfpm_default_pm_status_path }}', ping_enabled: '{{ phpfpm_default_ping_enabled }}', ping_path: '{{ phpfpm_default_ping_path }}', ping_response: '{{ phpfpm_default_ping_response }}', display_errors: '{{ phpfpm_default_display_errors }}', log_errors: '{{ phpfpm_default_log_errors }}', memory_limit: '{{ phpfpm_default_memory_limit }}', slowlog_timeout: '{{ phpfpm_default_slowlog_timeout }}', rlimit_files: '{{ phpfpm_default_rlimit_files }}', php_extensions: '{{ phpfpm_default_extensions }}', define_custom_variables: '{{ phpfpm_default_define_custom_variables }}', admin_write: True, doc_root: '{{ wordpress_doc_root }}', virthost: '{{ wordpress_servername }}', virthost_aliases: "{{ wordpress_aliases | default('') }}" } + - { pool_name: '{{ phpfpm_default_pool_name }}', app_context: '{{ phpfpm_default_context }}', user: '{{ phpfpm_default_user }}', group: '{{ phpfpm_default_group }}', listen: '{{ wordpress_php_listen }}', allowed_clients: '{{ phpfpm_default_allowed_clients }}', pm: '{{ phpfpm_default_pm }}', pm_max_children: '{{ phpfpm_default_pm_max_children }}', pm_start_servers: '{{ phpfpm_default_pm_start_servers }}', pm_min_spare: '{{ phpfpm_default_pm_min_spare_servers }}', pm_max_spare: '{{ phpfpm_default_pm_max_spare_servers }}', pm_max_requests: '{{ phpfpm_default_pm_max_requests }}', pm_status_enabled: '{{ phpfpm_default_pm_status_enabled }}', pm_status_path: '{{ phpfpm_default_pm_status_path }}', ping_enabled: '{{ phpfpm_default_ping_enabled }}', ping_path: '{{ phpfpm_default_ping_path }}', ping_response: '{{ phpfpm_default_ping_response }}', display_errors: '{{ phpfpm_default_display_errors }}', log_errors: '{{ phpfpm_default_log_errors }}', memory_limit: '{{ phpfpm_default_memory_limit }}', upload_max_filesize: '{{ wordpress_upload_max_filesize }}', post_max_filesize: '{{ wordpress_post_max_filesize }}', slowlog_timeout: '{{ phpfpm_default_slowlog_timeout }}', rlimit_files: '{{ phpfpm_default_rlimit_files }}', php_extensions: '{{ phpfpm_default_extensions }}', define_custom_variables: '{{ phpfpm_default_define_custom_variables }}', admin_write: True, doc_root: '{{ wordpress_doc_root }}', virthost: '{{ wordpress_servername }}', virthost_aliases: "{{ wordpress_aliases | default('') }}" }