Refactor postgres server recipes/resource

site-cookbooks/kosmos_postgresql/attributes/default.rb

@@ -1,3 +1,8 @@
+node.default['kosmos_postgresql']['postgresql_version'] = "14"
+
 # This is set to false by default, and set to true in the server resource
 # for replicas.
 node.default['kosmos_postgresql']['ready_to_set_up_replica'] = false
+
+# Address space from which clients are allowed to connect
+node.default['kosmos_postgresql']['access_addr'] = "10.1.1.0/24"

site-cookbooks/kosmos_postgresql/libraries/helpers.rb

@@ -36,10 +36,16 @@ class Chef
       end
     end
 
-    def postgresql_service_name
+    def postgresql_version
-      postgresql_version = "12"
+      node['kosmos_postgresql']['postgresql_version']
+    end
 
+    def postgresql_service
       "postgresql@#{postgresql_version}-main"
     end
+
+    def postgresql_data_dir
+      "/var/lib/postgresql/#{postgresql_version}/main"
+    end
   end
 end

site-cookbooks/kosmos_postgresql/recipes/primary.rb

@@ -3,31 +3,7 @@
 # Recipe:: primary
 #
 
-postgresql_version = "12"
-postgresql_service = "postgresql@#{postgresql_version}-main"
-
-service postgresql_service do
-  supports restart: true, status: true, reload: true
-end
-
 postgresql_custom_server postgresql_version do
   role "primary"
 end
 
-postgresql_access "zerotier members" do
-  access_type "host"
-  access_db "all"
-  access_user "all"
-  access_addr "10.1.1.0/24"
-  access_method "md5"
-  notifies :reload, "service[#{postgresql_service}]", :immediately
-end
-
-postgresql_access "zerotier members replication" do
-  access_type "host"
-  access_db "replication"
-  access_user "replication"
-  access_addr "10.1.1.0/24"
-  access_method "md5"
-  notifies :reload, "service[#{postgresql_service}]", :immediately
-end

site-cookbooks/kosmos_postgresql/recipes/replica.rb

@@ -3,26 +3,23 @@
 # Recipe:: replica
 #
 
-postgresql_version = "12"
+service postgresql_service do
-postgresql_service = "postgresql@#{postgresql_version}-main"
+  supports restart: true, status: true, reload: true
+end
 
 postgresql_custom_server postgresql_version do
   role "replica"
 end
 
-service postgresql_service do
-  supports restart: true, status: true, reload: true
-end
-
 postgresql_data_bag_item = data_bag_item('credentials', 'postgresql')
 
 primary = postgresql_primary
 
-unless primary.nil?
+if primary.nil?
-  # TODO
+  Chef::Log.warn("No PostgreSQL primary node found. Skipping replication setup.")
-  postgresql_data_dir = "/var/lib/postgresql/#{postgresql_version}/main"
+  return
+end
 
-  # FIXME get zerotier IP
 execute "set up replication" do
   command <<-EOF
 systemctl stop #{postgresql_service}
@@ -35,22 +32,3 @@ systemctl start #{postgresql_service}
   sensitive true
   not_if { ::File.exist? "#{postgresql_data_dir}/standby.signal" }
 end
-
-  postgresql_access "zerotier members" do
-    access_type "host"
-    access_db "all"
-    access_user "all"
-    access_addr "10.1.1.0/24"
-    access_method "md5"
-    notifies :reload, "service[#{postgresql_service}]", :immediately
-  end
-
-  postgresql_access "zerotier members replication" do
-    access_type "host"
-    access_db "replication"
-    access_user "replication"
-    access_addr "10.1.1.0/24"
-    access_method "md5"
-    notifies :reload, "service[#{postgresql_service}]", :immediately
-  end
-end

site-cookbooks/kosmos_postgresql/resources/server.rb

@@ -70,6 +70,24 @@ action :create do
     replication true
     password postgresql_credentials['replication_password']
   end
+
+  postgresql_access "all members" do
+    access_type "host"
+    access_db "all"
+    access_user "all"
+    access_addr node['kosmos_postgresql']['access_addr']
+    access_method "md5"
+    notifies :reload, "service[#{postgresql_service}]", :immediately
+  end
+
+  postgresql_access "replication members" do
+    access_type "host"
+    access_db "replication"
+    access_user "replication"
+    access_addr node['kosmos_postgresql']['access_addr']
+    access_method "md5"
+    notifies :reload, "service[#{postgresql_service}]", :immediately
+  end
 end
 
 action_class do