From 13a51641dea5fb56f192dff9ce3e3d8bda7e85c5 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 24 Feb 2026 22:07:41 +0000
Subject: [PATCH] Update chef repository hooks for cinc

---
 cookbooks/chef/files/default/knife.rb             |  6 +++---
 cookbooks/chef/recipes/repository.rb              | 10 +++++-----
 cookbooks/chef/templates/default/post-receive.erb |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cookbooks/chef/files/default/knife.rb b/cookbooks/chef/files/default/knife.rb
index 538689cd4..cb819bd32 100644
--- a/cookbooks/chef/files/default/knife.rb
+++ b/cookbooks/chef/files/default/knife.rb
@@ -1,10 +1,10 @@
 node_name "git"
 client_key "client.pem"
-validation_client_name "chef-validator"
-validation_key "/etc/chef/validation.pem"
+validation_client_name "cinc-validator"
+validation_key "/etc/cinc/validation.pem"
 chef_server_url "https://chef.openstreetmap.org/organizations/openstreetmap"
 cache_type "BasicFile"
-cache_options :path => ".chef/checksums"
+cache_options :path => ".cinc/checksums"
 cookbook_path ["cookbooks"]
 cookbook_copyright "OpenStreetMap Administrators"
 cookbook_email "admins@openstreetmap.org"
diff --git a/cookbooks/chef/recipes/repository.rb b/cookbooks/chef/recipes/repository.rb
index 752938bf3..c65ec7bde 100644
--- a/cookbooks/chef/recipes/repository.rb
+++ b/cookbooks/chef/recipes/repository.rb
@@ -26,7 +26,7 @@ chef_gem "bundler" do
   version ">= 2.1.4"
 end
 
-directory "/var/lib/chef" do
+directory "/var/lib/cinc" do
   owner "chefrepo"
   group "chefrepo"
   mode "2775"
@@ -35,7 +35,7 @@ end
 %w[public private].each do |repository|
   repository_directory = node[:chef][:"#{repository}_repository"]
 
-  git "/var/lib/chef/#{repository}" do
+  git "/var/lib/cinc/#{repository}" do
     action :checkout
     repository repository_directory
     revision "master"
@@ -43,20 +43,20 @@ end
     group "chefrepo"
   end
 
-  directory "/var/lib/chef/#{repository}/.chef" do
+  directory "/var/lib/cinc/#{repository}/.cinc" do
     owner "chefrepo"
     group "chefrepo"
     mode "2775"
   end
 
-  file "/var/lib/chef/#{repository}/.chef/client.pem" do
+  file "/var/lib/cinc/#{repository}/.cinc/client.pem" do
     content keys["git"].join("\n")
     owner "chefrepo"
     group "chefrepo"
     mode "660"
   end
 
-  cookbook_file "/var/lib/chef/#{repository}/.chef/knife.rb" do
+  cookbook_file "/var/lib/cinc/#{repository}/.cinc/knife.rb" do
     source "knife.rb"
     owner "chefrepo"
     group "chefrepo"
diff --git a/cookbooks/chef/templates/default/post-receive.erb b/cookbooks/chef/templates/default/post-receive.erb
index 28ef5b434..a75a71142 100644
--- a/cookbooks/chef/templates/default/post-receive.erb
+++ b/cookbooks/chef/templates/default/post-receive.erb
@@ -5,13 +5,13 @@
 umask 0002
 unset GIT_DIR
 
-knife="/opt/chef/embedded/bin/knife"
+knife="/opt/cinc/embedded/bin/knife"
 
 while read oldrev newrev refname
 do
   if [[ "$refname" = "refs/heads/master" ]]
   then
-    cd /var/lib/chef/<%= @repository %>
+    cd /var/lib/cinc/<%= @repository %>
 
     rm -f cookbooks/*/metadata.json(N)
 
-- 
2.39.5