Disable SSL for postgres 9.1 on errol

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 7d72ca6e572db9c0441094f8eb40977f386966a2..672c5e022a61d65b951e3a693b7fdb46e546b217 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -68,6 +68,7 @@ default_attributes(
       :enelson => { :status => :user },
       :gregrs => { :status => :user },
       :stereo => { :status => :user },
+      :dmlu => { :status => :user },
       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]
@@ -117,6 +118,10 @@ default_attributes(
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",
         :revision => "locale"
       },
+      :microcosms => {
+        :repository => "https://github.com/openbrian/osm-microcosms.git",
+        :revision => "microcosms"
+      },
       :upload => {
         :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",
@@ -126,7 +131,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.1", "9.5"],
+    :versions => ["9.1", "12"],
     :settings => {
       :defaults => {
         :shared_buffers => "1GB",
@@ -136,10 +141,13 @@ default_attributes(
         :effective_cache_size => "4GB"
       },
       "9.1" => {
-        :port => "5433"
+        :port => "5433",
+        :ssl => "false"
       },
-      "9.5" => {
-        :port => "5432"
+      "12" => {
+        :port => "5432",
+        :wal_level => "logical",
+        :max_replication_slots => "1"
       }
     }
   },