Skip to content
This repository was archived by the owner on Jan 23, 2019. It is now read-only.

Commit df0423d

Browse files
committed
Merge pull request #146 from phlipper/redundant_postgis_attribute
Remove redundant PostGIS attribute
2 parents c5b50c5 + 9ccda4d commit df0423d

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,6 @@ default["postgresql"]["conf"] = {}
261261
default["postgresql"]["conf_custom"] = false # if true, only use node["postgresql"]["conf"]
262262
default["postgresql"]["initdb_options"] = "--locale=en_US.UTF-8"
263263

264-
#------------------------------------------------------------------------------
265-
# POSTGIS
266-
#------------------------------------------------------------------------------
267-
default["postgis"]["version"] = "2.1"
268-
269264
#------------------------------------------------------------------------------
270265
# FILE LOCATIONS
271266
#------------------------------------------------------------------------------
@@ -618,7 +613,7 @@ default["postgresql"]["custom_variable_classes"] = ""
618613
# POSTGIS OPTIONS
619614
#------------------------------------------------------------------------------
620615

621-
default["postgis"]["version"] = "2.0"
616+
default["postgis"]["version"] = "2.1"
622617
```
623618

624619

@@ -721,6 +716,8 @@ Many thanks go to the following who have contributed to making this cookbook eve
721716
* add missing `ssl_ca_file` and `ssl_crl_file` attributes to the configuration template
722717
* **[@vivid-inc](https://github.com/vivid-inc)**
723718
* add `service_actions` attribute
719+
* **[@rmoriz](https://github.com/rmoriz)**
720+
* remove redundant postgis attribute
724721

725722

726723
## License

attributes/default.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@
3737
default["postgresql"]["conf_custom"] = false # if true, only use node["postgresql"]["conf"]
3838
default["postgresql"]["initdb_options"] = "--locale=en_US.UTF-8"
3939

40-
#------------------------------------------------------------------------------
41-
# POSTGIS
42-
#------------------------------------------------------------------------------
43-
44-
default["postgis"]["version"] = "1.5"
45-
4640
#------------------------------------------------------------------------------
4741
# FILE LOCATIONS
4842
#------------------------------------------------------------------------------

0 commit comments

Comments
 (0)