From 2b44725360e600aafa55b3243fc6163f8dad15bb Mon Sep 17 00:00:00 2001 From: Mauro Torrez Date: Wed, 28 Aug 2019 09:43:44 -0300 Subject: [PATCH] usar apache en vez de fpm --- defaults/main.yml | 2 +- tasks/main.yml | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c171541..631bf49 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -17,7 +17,7 @@ wordpress_debug: "" wordpress_config_extra: "" # container -wordpress_image: wordpress:php7.3-fpm +wordpress_image: wordpress wordpress_container: wordpress wordpress_volume: wordpress diff --git a/tasks/main.yml b/tasks/main.yml index 42b9367..57425db 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -54,9 +54,9 @@ networks: - name: "{{ docker_network_name }}" ports: - # - "{% if wordpress_bind_port is not none %}\ - # {{ wordpress_bind_host+':' if not wordpress_bind_host is none else '' }}\ - # {{ wordpress_bind_port }}:9000{% endif %}" + - "{% if wordpress_bind_port is not none %}\ + {{ wordpress_bind_host+':' if not wordpress_bind_host is none else '' }}\ + {{ wordpress_bind_port }}:80{% endif %}" - name: template nginx config copy: @@ -67,19 +67,13 @@ server_name {{ wordpress_domain }}; # root /var/www/html; - index index.php index.html; + # index index.php index.html; # access_log /dev/stdout; # error_log /dev/stdout info; location {{ wordpress_web_root }} { - try_files $uri $uri/ /index.php?$args; - } - - location ~ .php$ { - include fastcgi_params; - fastcgi_pass wordpress:9000; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + proxy_set_header Host $host; + proxy_pass http://{{ wordpress_container }}; } } dest: "{{ nginx_config_mountpoint }}/wordpress.conf"