Merge pull request #146 from phlipper/redundant_postgis_attribute

Remove redundant PostGIS attribute
phlipper · Mar 6, 2015 · df0423d · df0423d
2 parents c5b50c5 + 9ccda4d
commit df0423d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -261,11 +261,6 @@ default["postgresql"]["conf"]                            = {}
 default["postgresql"]["conf_custom"]                     = false  # if true, only use node["postgresql"]["conf"]
 default["postgresql"]["initdb_options"]                  = "--locale=en_US.UTF-8"
 
-#------------------------------------------------------------------------------
-# POSTGIS
-#------------------------------------------------------------------------------
-default["postgis"]["version"]                            = "2.1"
-
 #------------------------------------------------------------------------------
 # FILE LOCATIONS
 #------------------------------------------------------------------------------
@@ -618,7 +613,7 @@ default["postgresql"]["custom_variable_classes"]         = ""
 # POSTGIS OPTIONS
 #------------------------------------------------------------------------------
 
-default["postgis"]["version"] = "2.0"
+default["postgis"]["version"] = "2.1"
 ```
 
 
@@ -721,6 +716,8 @@ Many thanks go to the following who have contributed to making this cookbook eve
     * add missing `ssl_ca_file` and `ssl_crl_file` attributes to the configuration template
 * **[@vivid-inc](https://github.com/vivid-inc)**
     * add `service_actions` attribute
+* **[@rmoriz](https://github.com/rmoriz)**
+    * remove redundant postgis attribute
 
 
 ## License

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -37,12 +37,6 @@
 default["postgresql"]["conf_custom"]                     = false  # if true, only use node["postgresql"]["conf"]
 default["postgresql"]["initdb_options"]                  = "--locale=en_US.UTF-8"
 
-#------------------------------------------------------------------------------
-# POSTGIS
-#------------------------------------------------------------------------------
-
-default["postgis"]["version"]                            = "1.5"
-
 #------------------------------------------------------------------------------
 # FILE LOCATIONS
 #------------------------------------------------------------------------------