diff --git a/conf/build.test.properties b/conf/build.test.properties index a7281d69..6bcfe34e 100644 --- a/conf/build.test.properties +++ b/conf/build.test.properties @@ -3,7 +3,6 @@ build.artifact_mode=symlink build.test_output=/dev/null drupal.site_name=drupal-skeleton drupal.profile=standard -drupal.modules_enable= drupal.database.database=circle_test drupal.database.username=ubuntu drupal.database.password= diff --git a/docs/properties.md b/docs/properties.md index 095eb5b9..8754e8e7 100644 --- a/docs/properties.md +++ b/docs/properties.md @@ -21,7 +21,7 @@ Yields: Cool! This phing-ism is what powers our environment-specific property layering and loading: -1. Properties are loaded from the phing call itself; for example, adding the flag `-Ddrupal.modules_enable=devel,kint` will set the `drupal.modules_enable` property to `devel,kint` +1. Properties are loaded from the phing call itself; for example, adding the flag `-Dbuild.test_output=artifacts/tests` will set the `build.test_output` property to `artifacts/tests` 1. Set the `build.env` property (if it's not already set with `-D`) from the `PALANTIR_ENVIRONMENT` environment variable; if you're using [the-vagrant](https://github.com/palantirnet/the-vagrant), this will be set to `vagrant` 1. Load properties from your `conf/build.[environment].properties` 1. Load properties from `conf/build.default.properties` @@ -46,7 +46,6 @@ Cool! This phing-ism is what powers our environment-specific property layering a |---|---|---| | `drupal.site_name` | `Drupal` | Human-readable name for your site. | | `drupal.profile` | `config_installer` | Install profile. | -| `drupal.modules_enable` | | Comma-separated list of modules to enable after installing Drupal. | | `drupal.database.database` | `drupal` | | | `drupal.database.username` | `root` | | | `drupal.database.password` | `root` | | diff --git a/tasks/drupal.xml b/tasks/drupal.xml index 74ccc80e..6b0eaee0 100644 --- a/tasks/drupal.xml +++ b/tasks/drupal.xml @@ -37,7 +37,6 @@ - @@ -76,9 +75,6 @@ - - - @@ -101,7 +97,7 @@ - + @@ -194,7 +190,6 @@ - @@ -234,19 +229,26 @@ ${drupal.profile} - + + + + + + + - + - - - ${module} - +