Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow project.local.yml for different local environments. #158

Merged
merged 1 commit into from
Jun 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion template/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Ignore configuration files that may contain sensitive information.
local.*
*.local
*.local.*
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@grasmash, per your recommendation!


# Ignore drupal core.
docroot/core
Expand Down
8 changes: 8 additions & 0 deletions template/build/core/phing/tasks/properties.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
<!-- Load the root project.yml file for this project. -->
<property file="${repo.root}/project.yml" override="true"/>

<!-- Load the local project.local.yml file for this project. -->
<if>
<available file="${repo.root}/project.local.yml" type="file" property="local.properties"/>
<then>
<property file="${repo.root}/project.local.yml" override="true"/>
</then>
</if>

<!-- Load file directory and binary locations. -->
<property file="${core.phing.dir}/build.yml" override="true"/>

Expand Down
11 changes: 11 additions & 0 deletions template/example.project.local.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Override any settings as necessary by copying to project.local.yml
project:
local:
protocol: http
hostname: mysite.dev

drush:
# You can set custom project aliases in drush/site-aliases/aliases.drushrc.php.
aliases:
# The local environment against which all local drush commands are run.
local: local.mysite.dev
2 changes: 1 addition & 1 deletion template/readme/onboarding.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Ensure that your local email address correctly matches the email address for you

## Updating you local environment

The project is configured to update the local environment with a local drush alias and a remote alias as defined in `project.yml`. Given that these aliases match, those in `drush/site-aliases/`, you can update the site with BLT.
The project is configured to update the local environment with a local drush alias and a remote alias as defined in `project.yml` or `project.local.yml`. Given that these aliases match, those in `drush/site-aliases/`, you can update the site with BLT.

[Local Development Tasks](project-tasks.md#local-tasks)

Expand Down
6 changes: 3 additions & 3 deletions template/readme/project-tasks.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

Pre-requisites to installation:

1. Ensure that `docroot/sites/default/settings/local.settings.php` exists by executing `./blt.sh setup:drupal:settings`.
1. Ensure that `docroot/sites/default/settings/local.settings.php` exists by executing `./blt.sh setup:drupal:settings`.
1. Verify that correct local database credentials are set in `local.settings.php`.
1. Ensure that project dependencies have already been built via `./blt.sh setup:build:all`

To re-install Drupal, execute: `./blt.sh setup:drupal:install`. Note that this will drop the existing database tables and install Drupal from scratch!

## <a name="update-dependency"></a>Update dependencies (core, profile, module, theme, libraries)
Expand Down Expand Up @@ -81,7 +81,7 @@ To build Thunder's assets, execute:

## <a name="local-tasks"></a>Updating you local environment

The project is configured to update the local environment with a local drush alias and a remote alias as defined in `project.yml`. Given that these aliases match, those in `drush/site-aliases/`, you can update the site with BLT. Please see [drush/README.md](../drush/README.md) for details on how to create these aliases.
The project is configured to update the local environment with a local drush alias and a remote alias as defined in `project.yml` or `project.local.yml`. Given that these aliases match, those in `drush/site-aliases/`, you can update the site with BLT. Please see [drush/README.md](../drush/README.md) for details on how to create these aliases.

### Refresh: Rebuild the codebase, copy the database, and run updates

Expand Down