kosmos/chef
8
3
Fork 0
Code Issues 34 Pull Requests 3 Projects 2 Activity

Merge branch 'master' into feature/btcpay_server

Browse Source
This commit is contained in:
Greg
2020-12-31 10:20:28 +00:00
parent 61accc05c2 c71d243c40
commit 8a6b81485a
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb
View File

@@ -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

7
site-cookbooks/kosmos-postgresql/recipes/default.rb
View File

@@ -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|

4
site-cookbooks/kosmos-postgresql/resources/server.rb
View File

@@ -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"