Merge branch 'master' of git.uumas.fi:uumas/ansible-docker

galaxy.yml

@@ -3,7 +3,7 @@
 namespace: uumas
 name: docker
 description: Roles for installing services in docker containers
-version: 0.8.5
+version: 0.8.6
 readme: README.md
 repository: https://git.uumas.fi/uumas/ansible-docker
 license_file: LICENSE

roles/wordpress/defaults/main.yml

@@ -10,3 +10,5 @@ wordpress_symlinks: false
 wordpress_php_memory_limit: 256M
 wordpress_php_post_max_size: 128M
 wordpress_php_upload_max_filesize: 32M
+wordpress_php_max_execution_time: 30
+wordpress_php_max_input_time: 60

roles/wordpress/tasks/main.yml

@@ -12,7 +12,7 @@
 - name: Add memcached php extension to container
   set_fact:
     dockerfile: "{{ dockerfile | combine({'run': \
-      ['apt-get update && apt-get install -y libmemcached-dev zlib1g-dev && \
+      ['apt-get update && apt-get install -y libmemcached-dev libssl-dev zlib1g-dev && \
       pecl install memcached-3.2.0 && docker-php-ext-enable memcached']}, list_merge='append') }}"
   when: "'memcached' in docker_additional_services"
 

roles/wordpress/templates/php.ini.j2

@@ -3,3 +3,5 @@
 memory_limit = {{ wordpress_php_memory_limit }}
 post_max_size = {{ wordpress_php_post_max_size }}
 upload_max_filesize = {{ wordpress_php_upload_max_filesize }}
+max_execution_time = {{ wordpress_php_max_execution_time }}
+max_input_time = {{ wordpress_php_max_input_time }}