dpl 1.7.15.travis.858.4 → 1.7.15.travis.859.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MzJhMTdkZmM2YWI3NDg1YzViMWU4YjcxMmZmNDA2M2NkMjBhODE0Yg==
4
+ YmU4MDBjYmE5ZDc4ZWEwZmQyYTczYWQ5M2E4MWZjYTFiNTljYWY3MQ==
5
5
  data.tar.gz: !binary |-
6
- YjAwZjBjYTM0ZTM2ZTE3ZTY0YzZhOTk0NjI0ZmQyOWUzZGQwYjY5MQ==
6
+ NWQ3YzZlN2EwNmRhZmM3ZjNjMDVlODk1YzIzNjRkMjA4NDdiYTlkOA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- Y2ZjZTBkZjdiNTlmZWU3ZjA2NWM2NzA2ODE5ZWQ4NjQzY2M3NTE4Mjk4ZmFi
10
- ZjI2NThkNTFkMDIzMGFiZGQxZmQ3MzExODU2NGViM2I0OGZmMTRlZGIzMTFj
11
- ZTBiMDQ5MjVlZGZiOTUxZTc1NDMwNDUxZmVlOGE3YmFmNWExNzM=
9
+ NjNhODA1NTJjNmE2OGVhZDcwODRkZjQ2ODNkM2I0NzIwMDc1YWQ0ZGUyNTEx
10
+ NmI5MjgwMWVjMTQwYmFhY2M1MjAwMWI0Y2UwNmU3NWNiMGJkZDMwNzUwNDhi
11
+ NDk3ZTNhZWQ2MDE5YmU2M2QzYjkzNzZiYjYyYTNmMzcwZmQ1YmQ=
12
12
  data.tar.gz: !binary |-
13
- MjY2ZTIzNjJiNWE1M2U2MWViM2NjMDIxMWFiMTg2ZmQ4MTEzOTQ1MGFiYWZh
14
- M2JlNjFlNGYzYmIyM2YwMjc4MThiZjNmZjYyYTFmNGQxMTNmZGYzY2I5MGQx
15
- N2ZmYWEwNzg2N2E4OTg5NzJkYTM2ZDY1MTMxYjM3NjRjYTE3NjE=
13
+ NDg1MGU1ZmRmNTdlMWMxNGYwODY3MTI2YjkxYzIxNDU1MTRlMGExMTkzMzM5
14
+ YWJlY2JjYWZhZDlkMDgyMmNlNjE2NTY1YjY3Y2VlNzRlYjgwNDRkOGRlZGY5
15
+ YjM3NTVkMjBhOGYwMDc3ZWE3MWJjOWI0ZjY0YmJhNmUwMWU5NzM=
data/README.md CHANGED
@@ -330,6 +330,7 @@ It is possible to set file-specific `Cache-Control` and `Expires` headers using
330
330
  * **app-id**: The app ID.
331
331
  * **migrate**: Migrate the database. (Default: false)
332
332
  * **wait-until-deployed**: Wait until the app is deployed and return the deployment status. (Default: false)
333
+ * **custom_json**: Override custom_json options. If using this, default configuration will be overriden. See the code [here](https://github.com/travis-ci/dpl/blob/master/lib/dpl/provider/ops_works.rb#L34). More about `custom_json` [here](http://docs.aws.amazon.com/opsworks/latest/userguide/workingcookbook-json.html).
333
334
 
334
335
  #### Environment variables:
335
336
 
@@ -40,7 +40,7 @@ module DPL
40
40
  end
41
41
 
42
42
  def custom_json
43
- {
43
+ options[:custom_json] || {
44
44
  deploy: {
45
45
  ops_works_app[:shortname] => {
46
46
  migrate: !!options[:migrate],
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dpl
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.15.travis.858.4
4
+ version: 1.7.15.travis.859.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Konstantin Haase