Skip to content

Commit

Permalink
Also allow specifying the services.yml destination.
Browse files Browse the repository at this point in the history
  • Loading branch information
becw committed Apr 6, 2017
1 parent 1b084f6 commit 7a14c46
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions docs/properties.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Cool! This phing-ism is what powers our environment-specific property layering a
| `build.drupal.settings` | `conf/drupal/settings.php` | Source template for Drupal's `settings.php` file. |
| `build.drupal.settings_dest` | `web/sites/default/settings.php` | Destination for the templated settings.php file. |
| `build.drupal.services` | `conf/drupal/services.yml` | Source template for Drupal's `services.yml` file. |
| `build.drupal.services_dest` | `web/sites/default/services.yml` | Destination for the templated `services.yml` file. |


### Drupal
Expand Down
6 changes: 3 additions & 3 deletions tasks/drupal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<property name="build.drupal.settings" value="conf/drupal/settings.php" />
<property name="build.drupal.settings_dest" value="${drupal.root}/sites/${drupal.sites_subdir}/settings.php" />
<property name="build.drupal.services" value="conf/drupal/services.yml" />
<property name="build.drupal.services_dest" value="${drupal.root}/sites/${drupal.sites_subdir}/services.yml" />

<!-- These properties will generally not change. -->
<property name="drupal.sites_subdir" value="default" /> <!-- Directory within 'sites' dir in the drupal root -->
Expand Down Expand Up @@ -157,11 +158,10 @@

<!-- Target: drupal-prepare-services -->
<target name="drupal-prepare-services">
<fail unless="drupal.root" />
<fail unless="drupal.sites_subdir" />
<fail unless="build.drupal.services" />
<fail unless="build.drupal.services_dest" />

<copy file="${build.dir}/${build.drupal.services}" tofile="${build.dir}/${drupal.root}/sites/${drupal.sites_subdir}/services.yml" overwrite="true" mode="644">
<copy file="${build.dir}/${build.drupal.services}" tofile="${build.dir}/${build.drupal.services_dest}" overwrite="true" mode="644">
<filterchain>
<expandproperties />
</filterchain>
Expand Down

0 comments on commit 7a14c46

Please sign in to comment.