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

Fix letsencrypt bootstrap for ejabberd

Browse Source
This commit is contained in:
Basti 2022-05-11 16:25:32 +02:00
parent b3f1a74cc2
commit e89e0b3122
Signed by untrusted user: basti
GPG Key ID: 9F88009D31D99C72
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ejabberd.rb
View File

@ -7,8 +7,8 @@ default_run_list = %w(
production_run_list = %w( production_run_list = %w(
role[postgresql_client] role[postgresql_client]
kosmos-ejabberd::default
kosmos-ejabberd::letsencrypt kosmos-ejabberd::letsencrypt
kosmos-ejabberd::default
) )
env_run_lists( env_run_lists(
'development' => default_run_list, 'development' => default_run_list,

1
site-cookbooks/kosmos-base/recipes/letsencrypt.rb
View File

@ -52,6 +52,7 @@ end
end end
end end
# TODO check if nginx is installed/running on the node
file "/etc/letsencrypt/renewal-hooks/deploy/nginx" do file "/etc/letsencrypt/renewal-hooks/deploy/nginx" do
content <<-EOF content <<-EOF
#!/usr/bin/env bash #!/usr/bin/env bash

4
site-cookbooks/kosmos-ejabberd/templates/vhost.yml.erb
View File

@ -1,11 +1,7 @@
# Generated by Chef for <%= @host[:name] %> # Generated by Chef for <%= @host[:name] %>
# FIXME: The files only exist after the certbot hook created them, meaning
# we need to run Chef a second time
<% if File.exist?("/opt/ejabberd/conf/#{@host[:name]}.crt") && File.exist?("/opt/ejabberd/conf/#{@host[:name]}.key") -%>
certfiles: certfiles:
- "/opt/ejabberd/conf/<%= @host[:name] %>.crt" - "/opt/ejabberd/conf/<%= @host[:name] %>.crt"
- "/opt/ejabberd/conf/<%= @host[:name] %>.key" - "/opt/ejabberd/conf/<%= @host[:name] %>.key"
<% end -%>
host_config: host_config:
"<%= @host[:name] %>": "<%= @host[:name] %>":
sql_type: pgsql sql_type: pgsql