Merge branch 'master' into feature/btcpay_server

nodes/andromeda.kosmos.org.json

@@ -24,9 +24,9 @@
     "ipaddress": "46.4.18.160",
     "roles": [
       "base",
-      "postgresql_primary",
       "mastodon",
-      "ejabberd"
+      "ejabberd",
+      "postgresql_client"
     ],
     "recipes": [
       "kosmos-base",
@@ -130,7 +130,6 @@
     "recipe[kosmos-base::andromeda_firewall]",
     "recipe[kosmos-ipfs]",
     "recipe[kosmos-ipfs::public_gateway]",
-    "role[postgresql_primary]",
     "recipe[kosmos-btcpayserver::proxy]",
     "role[mastodon]",
     "role[ejabberd]",

roles/mastodon.rb

@@ -3,4 +3,5 @@ name "mastodon"
 run_list %w(
   kosmos-mastodon
   kosmos-mastodon::nginx
+  role[postgresql_client]
 )

site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb

@@ -121,7 +121,7 @@ application app_path do
         "KREDITS_GITHUB_KEY"            => data_bag['kredits_github_key'],
         "KREDITS_GITHUB_SECRET"         => data_bag['kredits_github_secret'],
         "KREDITS_ZOOM_JWT"               => data_bag['kredits_zoom_jwt'],
-        "KREDITS_ZOOM_MEETING_WHITELIST" => "414901303"
+        "KREDITS_ZOOM_MEETING_WHITELIST" => "414901303,82557072771"
       }
     )
     notifies :run, "execute[systemctl daemon-reload]", :delayed

site-cookbooks/kosmos-postgresql/recipes/default.rb

@@ -64,6 +64,13 @@ postgresql_clients.each do |client|
     access_method "md5"
     notifies :reload, "service[#{postgresql_service}]", :immediately
   end
+
+  firewall_rule "postgresql #{hostname}" do
+    port        5432
+    protocol    :tcp
+    command     :allow
+    source ip
+  end
 end
 
 postgresql_replicas.each do |replica|

site-cookbooks/kosmos-postgresql/resources/server.rb

@@ -67,9 +67,7 @@ action :create do
     listen_addresses: "0.0.0.0"
   }
 
-  if new_resource.role == "replica"
-    additional_config[:promote_trigger_file] = "#{postgresql_data_dir}/failover.trigger"
-  end
+  additional_config[:promote_trigger_file] = "#{postgresql_data_dir}/failover.trigger"
 
   ssl_cert = postgresql_data_bag_item['ssl_cert']
   ssl_cert_path = "#{postgresql_data_dir}/server.crt"