From ba2760ce4197d5cf1378e92d6535bd85c629b3ad Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 24 Feb 2026 19:26:28 +0000
Subject: [PATCH] Make cinc the default

---
 cookbooks/chef/attributes/default.rb | 4 ++--
 roles/albi.rb                        | 5 -----
 roles/meraxes.rb                     | 5 -----
 roles/muirdris.rb                    | 5 -----
 roles/rhaegal.rb                     | 5 -----
 roles/web-frontend.rb                | 5 -----
 6 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index e20cf9db9..9fbd07043 100644
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -4,5 +4,5 @@ default[:chef][:server][:version] = "15.9.38"
 # Set the default client version
 default[:chef][:client][:version] = "18.8.54"
 
-# Default to using the chef client
-default[:chef][:client][:cinc] = false
+# Default to using the cinc client
+default[:chef][:client][:cinc] = true
diff --git a/roles/albi.rb b/roles/albi.rb
index 5b8086059..8608554e5 100644
--- a/roles/albi.rb
+++ b/roles/albi.rb
@@ -2,11 +2,6 @@ name "albi"
 description "Master role applied to albi"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :cinc => true
-    }
-  },
   :networking => {
     :interfaces => {
       :external => {
diff --git a/roles/meraxes.rb b/roles/meraxes.rb
index 68bf35ad6..3c75dba62 100644
--- a/roles/meraxes.rb
+++ b/roles/meraxes.rb
@@ -2,11 +2,6 @@ name "meraxes"
 description "Master role applied to meraxes"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :cinc => true
-    }
-  },
   :networking => {
     :interfaces => {
       :external => {
diff --git a/roles/muirdris.rb b/roles/muirdris.rb
index 84d25a8ff..a17a99c37 100644
--- a/roles/muirdris.rb
+++ b/roles/muirdris.rb
@@ -7,11 +7,6 @@ default_attributes(
       :yuri => { :status => :user }
     }
   },
-  :chef => {
-    :client => {
-      :cinc => true
-    }
-  },
   :networking => {
     :interfaces => {
       :internal => {
diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index 3b3670bd2..bad91beeb 100644
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -7,11 +7,6 @@ default_attributes(
       :mmiler => { :status => :administrator }
     }
   },
-  :chef => {
-    :client => {
-      :cinc => true
-    }
-  },
   :location => "Zagreb, Croatia",
   :networking => {
     :interfaces => {
diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index c1e15b936..e7c0e5850 100644
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -19,11 +19,6 @@ default_attributes(
       :async_request_worker_factor => 4
     }
   },
-  :chef => {
-    :client => {
-      :cinc => true
-    }
-  },
   :memcached => {
     :memory_limit => 8192
   },
-- 
2.39.5