Add multisite support during deploy and local setup tasks (#736)

* Run Drupal and Drush setup per multisite

* Make multisite.name into an array

* apply drupal settings setup to all multisites

* fix typos

* Apply settings copy for each multisite

Author: bobbygryzynger

phing/build.yml

@@ -74,7 +74,9 @@ git:
 
 multisite:
   # The docroot/sites/default directory is used by default.
-  name: default
+  name: 
+  - default
+  # - another_site
 
 reports:
   localDir: ${repo.root}/reports

phing/tasks/deploy.xml

@@ -114,19 +114,21 @@
 
   </target>
 
-  <target name="deploy:copy" description="Copy required files from /docroot/sites to /deploy/docroot/sites." hidden="true">
-    <!-- Make sites/default writable so that we can copy files. -->
-    <!-- @todo Support multisite. -->
-    <chmod file="${docroot}/sites/default" mode="0777" />
+  <target name="deploy:copy:site" description="Copy required files from /docroot/sites to /deploy/docroot/sites." hidden="true">
+    <!-- Make sites/${multisite.name} writable so that we can copy files. -->
+    <chmod file="${docroot}/sites/${multisite.name}" mode="0777" />
 
     <exec dir="${repo.root}" command="rsync -a --no-g --delete --delete-excluded --exclude-from=${deploy.exclude_file} ${repo.root}/ ${deploy.dir}/ --filter 'protect /.git/'" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/>
 
+    <!-- Set sites/${multisite.name} back to 755 permissions. -->
+    <chmod file="${docroot}/sites/${multisite.name}" mode="0755" />
+  </target>
+
+  <target name="deploy:copy" description="Copy required files from each /docroot/sites to /deploy/docroot/sites." hidden="true">
     <!-- Use our own .gitignore -->
     <copy file="${deploy.gitignore_file}" tofile="${deploy.dir}/.gitignore" overwrite="true"/>
-
-    <!-- Set sites/default back to 755 permissions. -->
-    <!-- @todo Support multisite. -->
-    <chmod file="${docroot}/sites/default" mode="0755" />
+    <!-- Perform settings copy for each multisite. -->
+    <foreach list="${multisite.name}" param="multisite.name" target="deploy:copy:site"/>
   </target>
 
   <target name="deploy:prepare-dir" description="Delete the existing deploy directory and re-initialize as an empty git repository." hidden="true">

phing/tasks/setup.xml

@@ -60,31 +60,31 @@
   <target name="setup:settings" depends="setup:drupal:settings, setup:drush:settings" description="Creates settings files for Drupal and drush.">
   </target>
 
-  <target name="setup:drupal:settings" description="Create local settings files using default settings files.">
-    <echo>Making ${docroot}/sites/default writable.</echo>
-    <chmod mode="0755" file="${docroot}/sites/default" failonerror="false" verbose="true" />
+  <target name="setup:drupal:settings:site" description="Create local settings files using default settings files for an individual site." hidden="true">
+    <echo>Making ${docroot}/sites/${multisite.name} writable.</echo>
+    <chmod mode="0755" file="${docroot}/sites/${multisite.name}" failonerror="false" verbose="true" />
 
     <!-- Ensure that settings.php exists and that it requires BLT settings files. -->
     <if>
-      <not><available file="${docroot}/sites/default/settings.php"/></not>
+      <not><available file="${docroot}/sites/${multisite.name}/settings.php"/></not>
       <then>
         <if>
-          <not><available file="${docroot}/sites/default/default.settings.php"/></not>
+          <not><available file="${docroot}/sites/${multisite.name}/default.settings.php"/></not>
           <then>
             <echo level="verbose">Downloading scaffold files so that default.settings.php is available...</echo>
             <exec dir="${repo.root}" command="composer drupal-scaffold" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true" />
           </then>
         </if>
 
         <echo>Generating settings.php from default.settings.php...</echo>
-        <copy file="${docroot}/sites/default/default.settings.php" tofile="${docroot}/sites/default/settings.php" verbose="true"/>
+        <copy file="${docroot}/sites/${multisite.name}/default.settings.php" tofile="${docroot}/sites/${multisite.name}/settings.php" verbose="true"/>
       </then>
     </if>
-    <echo>Making ${docroot}/sites/default/settings.php writable...</echo>
-    <chmod mode="0644" failonerror="false" file="${docroot}/sites/default/settings.php"/>
+    <echo>Making ${docroot}/sites/${multisite.name}/settings.php writable...</echo>
+    <chmod mode="0644" failonerror="false" file="${docroot}/sites/${multisite.name}/settings.php"/>
     <echo>Ensuring that blt.settings.php is required by settings.php...</echo>
-    <exec dir="${docroot}/sites/default" command="grep vendor/acquia/blt/settings/blt.settings.php settings.php || echo 'require DRUPAL_ROOT . &quot;/../vendor/acquia/blt/settings/blt.settings.php&quot;;' >> settings.php" logoutput="true" checkreturn="true" level="${blt.exec_level}"/>
-    <exec dir="${docroot}/sites/default" command="grep trusted_host.settings.php settings.php || echo '// require DRUPAL_ROOT . &quot;/sites/default/settings/trusted_host.settings.php&quot;;' >> settings.php" logoutput="true" checkreturn="true" level="${blt.exec_level}"/>
+    <exec dir="${docroot}/sites/${multisite.name}" command="grep vendor/acquia/blt/settings/blt.settings.php settings.php || echo 'require DRUPAL_ROOT . &quot;/../vendor/acquia/blt/settings/blt.settings.php&quot;;' >> settings.php" logoutput="true" checkreturn="true" level="${blt.exec_level}"/>
+    <exec dir="${docroot}/sites/${multisite.name}" command="grep trusted_host.settings.php settings.php || echo '// require DRUPAL_ROOT . &quot;/sites/${multisite.name}/settings/trusted_host.settings.php&quot;;' >> settings.php" logoutput="true" checkreturn="true" level="${blt.exec_level}"/>
 
     <echo>Generating local settings files.</echo>
 
@@ -111,8 +111,13 @@
       </then>
     </if>
   </target>
+  
+  <!-- Run Drupal settings setup for each multisite. -->
+  <target name="setup:drupal:settings">
+    <foreach list="${multisite.name}" param="multisite.name" target="setup:drupal:settings:site"/>
+  </target>
 
-  <target name="setup:drush:settings" description="Create local drush settings files.">
+  <target name="setup:drush:settings:site" description="Create local drush settings files for an individual site." hidden="true">
     <if>
       <not><available file="${docroot}/sites/${multisite.name}/local.drushrc.php" type="file" /></not>
       <then>
@@ -140,6 +145,11 @@
     <!-- @todo Add multisite support. -->
     <phpVariable file="${repo.root}/drush/drushrc.php" variable="options[uri]" outputProperty="local_url" />
   </target>
+  
+  <!-- Run Drush settings setup for each multisite. -->
+  <target name="setup:drush:settings">
+    <foreach list="${multisite.name}" param="multisite.name" target="setup:drush:settings:site"/>
+  </target>
 
   <target name="setup:drupal:install"
           description="Installs a specific Drupal site."