From cbc503ff2382450c32af652e559eb3b43e537258 Mon Sep 17 00:00:00 2001
From: wagnert <wagner_tim78@hotmail.com>
Date: Sun, 30 Nov 2014 23:16:45 +0100
Subject: [PATCH] Bugfix for missing ANT variables for php-fpm.user/group

---
 build.xml                               | 5 ++++-
 buildfiles/mac/build.default.properties | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 0461f08..f19ee47 100644
--- a/build.xml
+++ b/build.xml
@@ -68,8 +68,11 @@
             <fileset dir="${src.dir}/${os.family}/generic">
                 <include name="**/*" />
             </fileset>
+            <filterchain>
+                <expandproperties/>
+            </filterchain>
         </copy>
-        <copy todir="${target.dir}" preservelastmodified="true" overwrite="true">
+        <copy todir="${target.dir}" failonerror="false" preservelastmodified="true" overwrite="true">
             <fileset dir="${src.dir}/${os.family}/${os.distribution}">
                 <include name="**/*" />
             </fileset>
diff --git a/buildfiles/mac/build.default.properties b/buildfiles/mac/build.default.properties
index 9a7077f..bd53101 100644
--- a/buildfiles/mac/build.default.properties
+++ b/buildfiles/mac/build.default.properties
@@ -31,6 +31,8 @@ deploy.dir = appserver
 # ---- PHP-FPM Settings ---------------------------------------------------------
 php-fpm.host = 127.0.0.1
 php-fpm.port = 9010
+php-fpm.user = _www
+php-fpm.group = staff
 
 # ---- Runtime Compile Settings -------------------------------------------------
 runtime.cc = gcc -arch ${os.architecture}