combine setup apache / nginx tasks and set up the server based on a p…

…roperty

phing/build.xml

@@ -35,11 +35,8 @@ This build file does some initialization and contains the targets which are actu
     <property name="magento.archive.file" value="${magento.archive.dir}/${project.magento.edition}-${project.magento.version}.${magento.archive.extension}"/>
 
     <!-- Development targets -->
-    <target name="setup_apache">
-        <phing buildfile="${development}" target="setup-apache" haltonfailure="true"/>
-    </target>
-    <target name="setup_nginx">
-        <phing buildfile="${development}" target="setup-nginx" haltonfailure="true"/>
+    <target name="setup_project">
+        <phing buildfile="${development}" target="setup-project" haltonfailure="true"/>
     </target>
     <target name="rebuild">
         <phing buildfile="${development}" target="reset" haltonfailure="true"/>

phing/default.properties

@@ -2,6 +2,7 @@
 magento.archive.dir=${workspace}/../magento_archives
 magento.archive.extension=tar.gz
 backup.dir=${workspace}/../backups
+setup.webserver=apache
 project.libs.remote[email protected]:magento_tools.2.git
 deploy.environments=develop,alpha,beta,live
 deploy.environments.default=develop

phing/development.xml

@@ -54,7 +54,22 @@
         <exec dir="${project.magedir}" command="n98-magerun.phar cache:flush" checkreturn="true" logoutput="true"/>
     </target>
 
-    <!-- Sets up hosts file and apache config can only be run as root -->
+    <!-- Sets up hosts file and apache/nginx config can only be run as root -->
+    <target name="setup-project">
+        <if>
+            <and>
+                <isset property="setup.webserver"/>
+                <equals arg1="${setup.webserver}" arg2="nginx"/>
+            </and>
+            <then>
+                <phingcall target="setup-nginx"/>
+            </then>
+            <else>
+                <phingcall target="setup-apache"/>
+            </else>
+        </if>
+    </target>
+
     <target name="setup-apache">
         <taskdef name="domains" classname="DomainsTask"/>
         <taskdef name="apache-config" classname="ApacheConfigTask"/>