From 0bae7460403638526ff83397b60cc69535c7e081 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 7 Mar 2026 10:13:29 +0000 Subject: [PATCH] Update letsencrypt to use cinc to upload certificates --- cookbooks/letsencrypt/recipes/default.rb | 6 +++--- cookbooks/letsencrypt/templates/default/upload.erb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cookbooks/letsencrypt/recipes/default.rb b/cookbooks/letsencrypt/recipes/default.rb index e2d387026..d2edce8fc 100644 --- a/cookbooks/letsencrypt/recipes/default.rb +++ b/cookbooks/letsencrypt/recipes/default.rb @@ -97,20 +97,20 @@ directory "/srv/acme.openstreetmap.org/logs" do mode "700" end -directory "/srv/acme.openstreetmap.org/.chef" do +directory "/srv/acme.openstreetmap.org/.cinc" do owner "letsencrypt" group "letsencrypt" mode "2775" end -file "/srv/acme.openstreetmap.org/.chef/client.pem" do +file "/srv/acme.openstreetmap.org/.cinc/client.pem" do content keys["letsencrypt"].join("\n") owner "letsencrypt" group "letsencrypt" mode "660" end -cookbook_file "/srv/acme.openstreetmap.org/.chef/knife.rb" do +cookbook_file "/srv/acme.openstreetmap.org/.cinc/knife.rb" do source "knife.rb" owner "letsencrypt" group "letsencrypt" diff --git a/cookbooks/letsencrypt/templates/default/upload.erb b/cookbooks/letsencrypt/templates/default/upload.erb index e89912c4f..04b91b9c8 100644 --- a/cookbooks/letsencrypt/templates/default/upload.erb +++ b/cookbooks/letsencrypt/templates/default/upload.erb @@ -17,4 +17,4 @@ file = Tempfile.new(["letsencrypt", ".json"]) file.puts JSON.generate(bag) file.close -system("/opt/chef/embedded/bin/knife", "data", "bag", "from", "file", "letsencrypt", file.path, "--config", "/srv/acme.openstreetmap.org/.chef/knife.rb", "--key", "/srv/acme.openstreetmap.org/.chef/client.pem") +system("/opt/cinc/embedded/bin/knife", "data", "bag", "from", "file", "letsencrypt", file.path, "--config", "/srv/acme.openstreetmap.org/.cinc/knife.rb", "--key", "/srv/acme.openstreetmap.org/.cinc/client.pem") -- 2.39.5