From e647654c1548ae4f92d0ed8c6f6c1f73d0721ba7 Mon Sep 17 00:00:00 2001
From: Xijun Dai <daixijun1990@gmail.com>
Date: Thu, 29 Aug 2019 01:59:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 defaults/main.yml | 6 +++---
 tasks/main.yml    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index b266537..b2e9395 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -95,9 +95,9 @@ php_build_parameters: |
     --enable-ftp \
     --enable-soap \
     --with-openssl \
-    --with-fpm-user=nginx \
-    --with-fpm-group=nginx \
+    --with-fpm-user={{ php_web_user }} \
+    --with-fpm-group={{ php_web_user }} \
     --with-config-file-scan-dir=/usr/local/php-{{ php_version }}/etc/php.d \
-    --with-config-file-path=/usr/local/php-{{ php_version }}/etc/php.ini && \
+    --with-config-file-path=/usr/local/php-{{ php_version }}/etc && \
   make && \
   make install
diff --git a/tasks/main.yml b/tasks/main.yml
index 4bf3ec4..5368a04 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -91,10 +91,11 @@
     state: directory
     owner: "{{ php_web_user }}"
     group: "{{ php_web_user }}"
+    mode: '755'
   loop:
     - "{{ php_log_path }}"
     - "{{ php_fpm_pid | dirname }}"
-    - "/usr/local/php/etc/php.d"
+    - "/usr/local/php-{{ php_version }}/etc/php.d"
 
 - name: Copy php-fpm configuration files
   template: