Merge branch 'master' into jammy_jellyfish

Remove default password config again
2023-12-05 14:21:55 +01:00 · 2023-11-04 15:10:50 +01:00 · 2023-11-03 18:19:49 +01:00 · 2023-11-03 18:11:31 +01:00
322 changed files with 16753 additions and 9318 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,3 @@
 [submodule "site-cookbooks/openresty"]
 	path = site-cookbooks/openresty
 	url = https://github.com/67P/chef-openresty.git
-[submodule "site-cookbooks/strfry"]
-	path = site-cookbooks/strfry
-	url = git@gitea.kosmos.org:kosmos/strfry-cookbook.git
-[submodule "site-cookbooks/deno"]
-	path = site-cookbooks/deno
-	url = git@gitea.kosmos.org:kosmos/deno-cookbook.git
--- a/5
+++ b/5
@@ -13,9 +13,6 @@ cookbook 'ipfs',
 cookbook 'mediawiki',
  git: 'https://github.com/67P/mediawiki-cookbook.git',
  ref: 'nginx'
-cookbook 'postfix',
-  git: 'https://gitea.kosmos.org/kosmos/postfix-cookbook.git',
-  ref: 'bugfix/sasl_attributes'

 cookbook 'apache2',                '= 3.3.0'
 cookbook 'apt',                    '~> 7.3.0'
@@ -35,11 +32,11 @@ cookbook 'ntp',                    '= 3.4.0'
 cookbook 'ohai',                   '~> 5.2.5'
 cookbook 'openssl',                '~> 8.5.5'
 cookbook 'php',                    '~> 8.0.0'
+cookbook 'postfix',                '= 5.0.2'
 cookbook 'timezone_iii',           '= 1.0.4'
 cookbook 'ulimit',                 '~> 1.0.0'
 cookbook 'users',                  '~> 5.3.1'
 cookbook 'zerotier',               '~> 1.0.7'
-cookbook 'unbound',                '~> 3.0.2'

 # openresty dependency
 cookbook 'jemalloc',               '~> 0.1.7'
--- a/Berksfile.lock
+++ b/Berksfile.lock
@@ -28,15 +28,11 @@ DEPENDENCIES
  ohai (~> 5.2.5)
  openssl (~> 8.5.5)
  php (~> 8.0.0)
-  postfix
-    git: https://gitea.kosmos.org/kosmos/postfix-cookbook.git
-    revision: dd6598572a775ae73f17527260ec8097b52d385b
-    ref: bugfix/
+  postfix (= 5.0.2)
  redisio (~> 6.4.1)
  ruby_build (~> 2.5.0)
  timezone_iii (= 1.0.4)
  ulimit (~> 1.0.0)
-  unbound (~> 3.0.2)
  users (~> 5.3.1)
  yum
  zerotier (~> 1.0.7)
@@ -93,7 +89,7 @@ GRAPH
  openssl (8.5.5)
  php (8.0.1)
    yum-epel (>= 0.0.0)
-  postfix (6.4.1)
+  postfix (5.0.2)
  redisio (6.4.1)
    selinux (>= 0.0.0)
  ruby_build (2.5.0)
@@ -103,7 +99,6 @@ GRAPH
  seven_zip (4.2.2)
  timezone_iii (1.0.4)
  ulimit (1.0.0)
-  unbound (3.0.2)
  users (5.3.1)
  windows (7.0.2)
  yum (7.4.13)
--- a/README.md
+++ b/README.md
@@ -38,10 +38,6 @@ Clone this repository, `cd` into it, and run:

    knife zero bootstrap ubuntu@zerotier-ip-address -x ubuntu --sudo --run-list "role[base],role[kvm_guest]" --secret-file .chef/encrypted_data_bag_secret

-### Bootstrap a new VM with environment and role/app (postgres replica as example)
-
-    knife zero bootstrap ubuntu@10.1.1.134 -x ubuntu --sudo --environment production --run-list "role[base],role[kvm_guest],role[postgresql_replica]" --secret-file .chef/encrypted_data_bag_secret
-
 ### Run Chef Zero on a host server

    knife zero converge -p2222 name:server-name.kosmos.org
--- a/clients/email-1.json
+++ b/clients/email-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "email-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxDRdvMYKRjejoFsOxS6s\n4gj0Gsaxk/j25A5VPHBcEhr+NOh8W/6NnTTHuFMaorEIl/2kscgrcwriDN7xIFmO\nz/C1+spDLPMGSWd+422KSS3fjVfByLlMwxh171RDZBlZVze7H7CIV/rxCG7Ri85y\nPvyp2rT4ioyVGyYK3e8CiXwQckpFC1ex9VRk/GR8zbCYUIw+qbTFRcl/mQuxKqWK\n22vrgAR+6OL8lcyhssmKiQ1r3GtxwJusgffw4/5S8sRR1z8OB4wiwgOWR1E36EbF\nhTBjFzPiKVjVjP/TQpUoYdnBhuD223M8nPWJl1HMVQPMjL6R2BBOF+iK0Wx9SiFD\nJwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-10.json
+++ b/clients/garage-10.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-10",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw2+3Wo+KkXVJCOX1SxT9\nSdwKXgPbCDM3EI9uwoxhMxQfRyN53dxIsBDsQUVOIe1Z8yqm4FenMQlNmeDR+QLE\nvNFf1fisinW+D9VVRm+CjcJy96i/Dyt786Z6YRrDlB860HxCbfTL2Zv5BRtbyIKg\nhz5gO+9PMEpPVR2ij9iue4K6jbM1AAL2ia/P6zDWLJqeIzUocCeHV5N0Z3jXH6qr\nf444v78x35MMJ+3tg5h95SU1/PDCpdSTct4uHEuKIosiN7p4DlYMoM5iSyvVoujr\nflRQPEpGzS9qEt3rDo/F4ltzYMx6bf1tB/0QaBKD+zwPZWTTwf61tSBo5/NkGvJc\nFQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-11.json
+++ b/clients/garage-11.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-11",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzfZcNEQojtmaogd9vGP/\nMsVPhAOlQ4kxKgrUas+p+XT7lXRan6b3M8UZEleIaL1HWsjSVwtFWRnNl8kg8rF8\nNEkLeOX8kHf7IoXDFOQa2TXanY8tSqrfh9/heFunt4Q3DluVt7S3bBdwukbDXm/n\nXJS2EQP33eJT4reL6FpVR0oVlFCzI3Vmf7ieSHIBXrbXy7AIvGC2+NVXvQle6pqp\nx0rqU6Wc6ef/VtIv+vK3YFnt9ue3tC63mexyeNKgRYf1YjDx61wo2bOY2t8rqN8y\nHeZ3dmAN8/Vwjk5VGnZqK7kRQ92G4IcE+mEp7MuwXcLqQ9WB960o+evay+o1R5JS\nhwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-12.json
+++ b/clients/garage-12.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-12",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9GtHHi298BjiIqpZ3WkT\nkYAPfWD60hFe/8icYcq/F/6cHLYKZQ4chek9X/hDCMq4tHEN6Oh58T5x/nuNdPrK\nIAMGyVAGk6ekWlmD4jwdEf6TGb/J3ffJTRDvwX/I8xD/DW3wtXsN+X24T59ByGTm\nrnwRmmmwHF3otRx9wnCsIgDQ0AjiUujsfNNv1FcLXD/WJLys9lEeU5aJ4XtHTwDv\ntJM8YyVEFhEnuvgdKmzn5+F5k9VGdUwForlFOBfvzbCnTZMDMmDVeiUtAUv/7xWQ\nQl2mLUGCtgWuYJYXsQacAJ6pa3h+7cQyshC6w3dwUG+1fS9lNO0Yp1GGX1AGYKpp\nPQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-13.json
+++ b/clients/garage-13.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-13",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvbqWc6OwRxgHfsQuTNL4\naxeVvNen5d9srYpZSHjuBB/k9NHB+9P6vU5qF37XHkw1lVUGeYbPHzhYsx3O0/kZ\nH5f4+4SMy/P9jc6SE7AJF4qtYKgJ88koZdqCww07c6K9g+BnEGFFZui/h3hUBxWj\nTfhBHEWPyQ2bl/lr9sIJwsEz+EN0isGn/eIXkmw9J6LdLJ5Q0LLks33K28FNOU7q\nfeAN4MiBVMUtgCGyT2Voe6WrOXwQLSDXQONOp3sfSfFExsIJ1s24xdd7AMD7/9a7\n4sFDZ4swhqAWgWmW2giR7Kb8wTvGQLO/O/uUbmKz3DZXgkOKXHdHCEB/PZx1mRNM\nEwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-14.json
+++ b/clients/garage-14.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-14",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqNY8AuaM4byhaTZacfRJ\nv/qyHxcDJOMX/ElF1H908spdbB2ZiLXHOH1Ucw1d+NV6/QUtWk+ikKFPpasnatD7\nmjE57noH+H47Rll0nD7oT+in+fOBDHF9R0P6/qyRSdJbJkHOh0iC0MG4LcUfv0AY\nnVBW5iLZSe/PC3+PvhCv7yrx3ikSs0mg1ZWppw0ka5Ek3ZCZp5FB4L6++GYWpM+1\n6YI0CjMoRcXsaEQsJWhxHXT8/KDhW0BR8woZUGm0/Yn4teLYJzioxRfBep3lbygx\nOIsDN9IJzo2zVTGPDZQLXhVemIhzaepqTC77ibH7F0gN/1vsQBc/qf7UhbwaF4rR\ndQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-3.json
+++ b/clients/garage-3.json
@@ -0,0 +1,4 @@
+{
+  "name": "garage-3",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtRSB8/ObjvQq6WuOVS/f\nypdX/2fLsUlt5tQ8GNuSY9rSM8gdvcXUvnPlxthZO4yvcPX85wmtBZX8fRJFdkJg\nYRCJbuVKO9sLTq8OUWXYpfU1q10FUhl034zxOMslpxVB6toirnk025vyq9jbuKP+\nYO+c40KZr67mgm0hveJfylayfiKP1HGm4HrV0maFivCgC8D+MPDDv75CsqRe5WSc\nh2CoauDJwVlhKZ92yq87ugGBhJJRUGOQZcfEvkUGj/HNAS6tuHl8YmVmhO8hBdee\nNto6RF54E1zB80R9oT/qitw23miEyUcHHVxhTR4tTWflZgd8l4wDOhX3Nf20xknu\nFQIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/garage-4.json
+++ b/clients/garage-4.json
@@ -0,0 +1,4 @@
+{
+  "name": "garage-4",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8it7QtT6zDiJJqlyHKfQ\nLqwu6bLblD15WWxlUSiOdhz3njWDv1BIDCAdkCR3HAXgxvk8sMj9QkvWS7u1+bc4\nxvHrY4Tgfg+Tk1h3gGa7ukll8s1WLIbGjj89vrK8PFr4iuDqRytYRMmcdMsNzPkS\nKcsOjFYWGV7KM/OwoQGVIOUPB+WtkrFAvNkXtIU6Wd5orzFMjt/9DPF2aO7QegL8\nG1mQmXcPGl9NSDUXptn/kzFKm/p4n7pjy6OypFT192ak7OA/s+CvQlaVE2tb/M3c\ne4J6A+PInV5AGKY6BxI3QRQLZIlqE0FXawFKr1iRU4JP4tVnICXZqy+SDXQU1zar\nTQIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/garage-5.json
+++ b/clients/garage-5.json
@@ -0,0 +1,4 @@
+{
+  "name": "garage-5",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJxLFOBbml94W/GAe7nm\ntZs1Ziy8IbqXySsm8bSwWhRMQ8UuseqQLG30R3Q5X5AoJbtNfd26l63qLtP2fFtL\n5km9dV+2FoIJWFetl8Wzr7CaLYAiNzTQSFHlV7+6DKmPMDcJ63GKrFR77vkSGOG6\nOWL1bJy5BOaClp/sKL/0WQ0+mRbTP6RCQ2eI+46clAg702SenBU6Nz9HDm+teKN7\nYlP1CvzXgfgfpDOsat7wGn5+oKcmKavZxcdn8bt5jRpg8v3JezaZIjMXt7XcNS4n\n0F4XO/efnZE5B5SN68j4BpD8N79zJw4HlRIGP+RaYv2qLtBeWgLHCCs9wXQXfj6b\nLwIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/garage-7.json
+++ b/clients/garage-7.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-7",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwoAigZUSwsfbBHx2PQ6W\n38Ght6eCvbpW1lsS58hTieRmRn+pgZVjvixhsBh57rUasCjaBywXk9BpNj2Foxck\nReHeoDI0RHsgniClyMrYj80y2NhoB6J8NB+cHkhdzIKplm6AH6M5xaAedtZU639a\n1nHMtpDlJhzgIYsiq1q06Aqd1w0Z9tf1RXQ1WvMDhTY4wlE5RZ2epBb6Usnlbjo2\nSqCIGIjRLmZxdsSWoiUUTlVPdUCzTNsN5G/ZVdRswhgseDmVJCIkK2Aji/XzhIrR\nh4RvUv9dhFemOVsFctJ/dQILXz5MZLUgakKf970M5R/Zggv//pqRSsYcB2UfaBpV\nLQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-8.json
+++ b/clients/garage-8.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-8",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt4hXODzgHsIeWxXJm/F6\nSTFJ8JC89mWru7pOFzPWenOVMHgp4UpUB4rDTwQqojsWTDiq0x3ckUyOPw3Nj0jv\nxP4MMGS4SI0oRSJKzrYYss0hgUDTOBBd+Wxn0UiNEpN/PfQo9VZj9v/jak57cz7z\n5+rpl5v27fhgUIChjsHxdy+EamvCrYc+1JhyrLOlwlt8JxkZ8UPhoeZLWAbDgGLS\nEzHWSSVtBUPK+KYmVb2OK4lB56zPfek0U3gKN+04a1650jzOit8LzE6NaT180QDv\nX+gG6tk53vSXDmkBXsQ1mtB8aF+HaEG2Pra5HyihlweCPYdJT+e28wpq6+P5l3YR\ndQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/garage-9.json
+++ b/clients/garage-9.json
@@ -1,4 +0,0 @@
-{
-  "name": "garage-9",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnMHzKE8JBrsQkmRDeMjX\n71mBzvRzNM90cwA8xtvIkXesdTyGqohX9k/PJbCY5ySGK9PpMaYDPVAnwnUP8LFQ\n3G98aSbLxUjqU/PBzRsnWpihehr05uz9zYcNFzr4LTNvGQZsq47nN9Tk+LG3zHP7\nAZViv2mJ4ZRnukXf6KHlyoVvhuTu+tiBM8QzjTF97iP/aguNPzYHmrecy9Uf5bSA\nZrbNZT+ayxtgswC2OclhRucx7XLSuHXtpwFqsQzSAhiX1aQ3wwCyH9WJtVwpfUsE\nlxTjcQiSM9aPZ8iSC0shpBaKD1j3iF/2K2Jk+88++zMhJJPLermvaJxzsdePgvyk\nKQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/postgres-4.json
+++ b/clients/postgres-4.json
@@ -0,0 +1,4 @@
+{
+  "name": "postgres-4",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu6fPxOZeKloF/EgYvU0k\nOwv8bJjsCQcWaMTPle5//mRTszA6PM2z9RI+Mfr45qxTlsL9pQY8WJOWF6QOK31x\nszuqcr7oOjtAhrLI8f/oNDEDjcx325FqG9gNKQEAD7d4zodh+PhDe6x7GIyIS7lG\nIcD5Zre9iDwv8FGLR+5GLqS8SJOPL/wJkQ8w+N0f8YDFw81kiTta5NLhAx3fMDs0\n2kmoNlbmKlNZTtLjCfCV+/pa9oY6wycjck3GvobiFE/4cWaNkeGlPc+uAwlfmrOv\nHy0tq1XBX/BCvE5kMXmhnMT23JXjm2s2PgCLgEVGAXilXk/T597KDm+z4oBpAQma\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/postgres-5.json
+++ b/clients/postgres-5.json
@@ -0,0 +1,4 @@
+{
+  "name": "postgres-5",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvXZv6Gk+dhIVkTXH9hJ1\nt2oqsMSLmTUj71uPN+4j0rxCQriXa095Nle9ifJAxfwzQyKEpWKyZd1Hpyye6bL1\nwgWATZ/u5ZS4B63NhRFyDxgPlHWBBohaZBN42zeq0Y0PNGHPVGDH/zFDrpP22Q9Q\nYScsyXTauE/Yf8a/rKR5jdnoVsVVMxk0LHxka8FcM2cqVsDAcK7GqIG6epqNFY8P\nUb1P+mVxRwnkzvf1VtG212ezV/yw9uiQcUkHS+JwZMAgbC34k9iDyRmk6l4sj/Zk\nNem20ImMqdDzsrX8zEe21K+KNvpejPH9fxaNCwR8W+woBMMzqD3I7P9PbLjc70Rx\nRwIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/postgres-6.json
+++ b/clients/postgres-6.json
@@ -1,4 +0,0 @@
-{
-  "name": "postgres-6",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVzM0fwlimmq11jTGTko\nK87LRYSar61tNF3qVWp9axNSMa6BSxVark9eYOqY4eLh/5vJVDqXDFq30/IUWg40\nH8hHWaOEvQrP2dm/XFw1RmunfbfN9gN07TuhaT3xFD5t+jFBuOSoJ4cPnFIABuVt\nFLrjgtYYjtZe5hGE9ZPmS7o2ATM5EU9mxeQ+TkgDbr8StvSPGdZ1ykhagf1pegGU\nRIfZ+4ZKzyDUAq+fYNhIbmlm5h2gP+XdtakPy43j7n0iN1vwDgBqJ2pdaVs/GcFf\nvaztoltguoknI2NPSez1N217asTTLuth0nHxVXiKCVXnqwDjxgWmuP6X2B7VYjyc\nxQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/postgres-8.json
+++ b/clients/postgres-8.json
@@ -1,4 +0,0 @@
-{
-  "name": "postgres-8",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx88DgM/x1UbKRzgPexXE\nSyfrAsqaDVjqZz7yF3tqAc9A52Ol0KOM6NESoPWBVMbS86WtAjBcMHcOoQBJ+ovp\nXcjNlRtO1Il6/d4uCRr4CEDX+yeS0Qrt0SOORnoTbVlkq9VlVljyCmxk8VBCILzk\ndHvFr62mahMy6vOEcpCQgCwYE3ISH2jlTDz2agoK/CjIyyqFTlB1N7mJVGLrJdcA\nA2JOxDRE8HqOdpY7bHcHj4uyMWaKuM3zxXK04lhrvuPRfJUhXgsK9r5jeTEa8407\nqV9K+mB17R1dBeHmWEPDRt02HELe2SUjYmlmyVX73H2mWKDLBFpAFjOfz86CJ6jf\nDQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/postgres-9.json
+++ b/clients/postgres-9.json
@@ -1,4 +0,0 @@
-{
-  "name": "postgres-9",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2dcE9HH0r5TBb/FGj2+e\nOw8ssoxeB61JmR4/psdZ6oPR08gxyqOY0ODziCmyIdXwFhjIcC44HjxCbcB8TU8G\nWGqlmfqWWIJW0x/2xOycHobAWDn5fC5ttTXkR3HC1TutX/2mH26mtfz9UjNdPaTo\nVZFMcxeaBCFSNlYC7hPUQ5f/qBdhhpLxP9uyzU+YFPqtwLP7g8EAUQObM4L+m6Q8\nqE7xgYpnhgaNrPsmvaVuoNylMGwyK0j1whOkcik8UgLprD70ISNSNxxcLehbvA3G\nPQPQRRuFF36fu2gECWGopbrFKwQGNfgJguQoXM1RQZQMQqWHPS933k5i6bi5pnhp\nzwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/rsk-testnet-5.json
+++ b/clients/rsk-testnet-5.json
@@ -1,4 +0,0 @@
-{
-  "name": "rsk-testnet-5",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx/UHlgcSeh9Do7CTCKXC\n/4/aO2OvT+ijDVmrMYCNtE4sMeuFqKPnV1zxJZmRm4VNhkSQDkdWYD+6XvuFYW60\nyjB/N6D5lLlyjG4HD6fTkfh0K6f7t5mOYV7o4T59OoA3cBZuSROjtWmJ8jEFJ+k9\nII2kcyhPQcFN01ckzvZKRSPbVRccMoc+AKTjB3ZUfs/ERtlVoDrK4jEHluXOxUJO\nBKCcLonjJuLlpRLh7QfKrKFcR4idn5Ir43R6aSUesI/ipKwKsXnR3Bu7vXp74VF3\nMJ3EkdSBG+qJzy51fbRfQiUPAr/vSoVQZwW7FkIhIqqLkMaYCymn7qKfTGujoNU7\nlwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/strfry-1.json
+++ b/clients/strfry-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "strfry-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzDV/RMGMXVDbvoA6PNh8\nQzhtHwYDCFcUSkbrwP6tzh6GpVunGEOdOdhj2V63T2tF1H+lujxQXh5pK7C0D6VZ\niO04ftJlo7/svyxUcwWr+znyN5sFdQRh3cBZiGSBYolizwoqgtPFlbNhmWAzV0Du\n9t8mhz70IK3B+UdwWyHtoK0NNsJGnQ9YzAvcjyDmEO/3sCjAhNnxVpmXftpcSmd9\nMonzFtIDBbRRll4AHZYRbmXCzx63+VmelvdnufnbY82liol0zzBwJaBD1wyNlG0y\ni96p3Kx03bLNlIaYVGbjZeJi+6oo2VDWJ4OloLLAYoHDSipeHT9qWfUdnE6ge4Lm\nywIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/cookbooks/postfix/.markdownlint-cli2.yaml
+++ b/cookbooks/postfix/.markdownlint-cli2.yaml
@@ -1,7 +0,0 @@
-config:
-  ul-indent: false # MD007
-  line-length: false # MD013
-  no-duplicate-heading: false # MD024
-  reference-links-images: false # MD052
-ignores:
-  - .github/copilot-instructions.md
--- a/cookbooks/postfix/.vscode/extensions.json
+++ b/cookbooks/postfix/.vscode/extensions.json
@@ -1,8 +0,0 @@
-{
-  "recommendations": [
-    "chef-software.chef",
-    "Shopify.ruby-lsp",
-    "editorconfig.editorconfig",
-    "DavidAnson.vscode-markdownlint"
-  ]
-}
--- a/cookbooks/postfix/CHANGELOG.md
+++ b/cookbooks/postfix/CHANGELOG.md
@@ -2,215 +2,6 @@

 This file is used to list changes made in each version of the postfix cookbook.

-## Unreleased
-
-## 6.4.1 - *2025-09-04*
-
-## 6.4.0 - *2025-07-30* ## 6.4.0 - *2025-07-30*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.4.0 - *2025-07-30*
-
-## 6.3.0 - *2025-07-30*
-
- Use LMDB instead of hash on el10
-
-## 6.3.0 - *2025-07-30*
-
-## 6.2.2 - *2025-01-30*
-
-## 6.2.1 - *2025-01-30*
-
-## 6.2.0 - *2025-01-30*
-
-## 6.2.0
-
- Correctly fix aliases quoting logic
- Convert all serverspec tests to inspec
- Add Github actions
- Update platforms to test
-
-## 6.0.29 - *2024-11-18*
-
- Standardise files with files in sous-chefs/repo-management
-
-## 6.0.28 - *2024-07-15*
-
- Standardise files with files in sous-chefs/repo-management
-
-## 6.0.27 - *2024-05-06*
-
-## 6.0.26 - *2023-10-03*
-
- Add installation of postfix addon packages for RHEL 8
-
-## 6.0.25 - *2023-10-03*
-
-Fix markdown
-
-## 6.0.24 - *2023-09-28*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.23 - *2023-09-04*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.22 - *2023-08-29*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.21 - *2023-05-17*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.20 - *2023-04-17*
-
-Fix CI permissions
-
-## 6.0.19 - *2023-04-17*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.18 - *2023-04-07*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.17 - *2023-04-01*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.16 - *2023-04-01*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.15 - *2023-04-01*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.14 - *2023-03-20*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.13 - *2023-03-15*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.12 - *2023-02-23*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.11 - *2023-02-16*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.10 - *2023-02-14*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.9 - *2023-02-14*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.8 - *2022-12-08*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.7 - *2022-02-03*
-
-Standardise files with files in sous-chefs/repo-management
-
-## 6.0.6 - *2022-02-02*
-
- Update tested platforms
- Remove delivery and move to calling RSpec directly via a reusable workflow
-
-## 6.0.5 - *2022-01-08*
-
- resolved cookstyle error: test/integration/helpers/serverspec/spec_helper.rb:9:21 convention: `Style/FileRead`
-
-## 6.0.4 - *2021-08-19*
-
-## 6.0.3 - *2021-08-19*
-
- Fixed TLS configuration
-
-## 6.0.2 - *2021-06-30*
-
- Make sure we write the main.conf and master.conf before we try to use any commands (like postmap)
-
-## 6.0.1 - *2021-06-01*
-
-## 6.0.0 - *2020-11-23*
-
- Disabled SSLv3 by default
-
-## 5.4.1 - 2020-10-20
-
- Ensure all postmap files are rebuilt immediately if needed
-
-## 5.4.0 - 2020-10-11
-
-### Changed
-
- Sous Chefs Adoption
- Update to use Sous Chefs GH workflow
- Update README to sous-chefs
- Update metadata.rb to Sous Chefs
- Update test-kitchen to Sous Chefs
-
-### Added
-
- Standardise files with files in sous-chefs/repo-management
- Add Ubuntu 20.04 testing
-
-### Fixed
-
- Cookstyle fixes
- ChefSpec fixes
- Yamllint fixes
- MDL fixes
- Fix OpenSUSE installation issues
-
-### Removed
-
- Remove EL 6 testing
- Remove Amazon Linux 1 testing
-
-## 5.3.1 (2018-07-24)
-
- Fixed sbin issue with Chef13
-
-## 5.3.0 (2018-05-23)
-
- support multiple sasl_passwd entries
- Add `packages` attribute so different postfix packages can be installed
- add ability to set network connection port for a remote relayhost
-
-## 5.2.1 (2017-11-22)
-
- Properly support FreeBSD
- Do not run service restart for solaris which fails
-
-## 5.2.0 (2017-08-07)
-
- Lazily evaluate the config template variables to allow overrides to properly apply
- Avoid Chefspec deprecation warnings
-
-## 5.1.1 (2017-07-28)
-
- Fix support for Amazon Linux on Chef 13
- Expand testing to cover Debian 9 in Travis
-
-## 5.1.0 (2017-07-28)
-
- Add an option to allow recipient canonical maps
-
-## 5.0.3 (2017-06-26)
-
- Correct attribute line for use_relay_restrictions_maps to prevent converge failures
-
 ## 5.0.2 (2017-05-17)

 - Fix use_relay_restrictions_maps attribute misspelling in attributes file
@@ -326,51 +117,51 @@ Reverting #37 - [COOK-3418] Virtual Domain Support PR - duplicate of #55

 ### Bug

- postfix::sasl_auth recipe fails to converge
+- **[COOK-4357](https://tickets.chef.io/browse/COOK-4357)** - postfix::sasl_auth recipe fails to converge

 ## v3.1.0 (2014-02-19)

 ### Bug

- Postfix cookbook has incorrect default path for sasl_passwd
+- **[COOK-4322](https://tickets.chef.io/browse/COOK-4322)** - Postfix cookbook has incorrect default path for sasl_passwd

 ### New Feature

- use conf_dir attribute for sasl recipe, and add omnios support
- Support creating the sender_canonical map file
+- **[COOK-4086](https://tickets.chef.io/browse/COOK-4086)** - use conf_dir attribute for sasl recipe, and add omnios support
+- **[COOK-2551](https://tickets.chef.io/browse/COOK-2551)** - Support creating the sender_canonical map file

 ## v3.0.4

 ### Bug

- main.cf.erb mishandles lists
+- **[COOK-3824](https://tickets.chef.io/browse/COOK-3824)** - main.cf.erb mishandles lists

 ### Improvement

- postfix cookbook readme has an incorrect example
+- **[COOK-3822](https://tickets.chef.io/browse/COOK-3822)** - postfix cookbook readme has an incorrect example
 - Got rubocop errors down to 32

 ### New Feature

- Support creating the sender_canonical map file
+- **[COOK-2551](https://tickets.chef.io/browse/COOK-2551)** - Support creating the sender_canonical map file

 ## v3.0.2

 ### Bug

- Fix error when no there is no FQDN
- Update `client.rb` after 3.0.0 refactor
- Do not use resource cloning
+- **[COOK-3617](https://tickets.chef.io/browse/COOK-3617)** - Fix error when no there is no FQDN
+- **[COOK-3530](https://tickets.chef.io/browse/COOK-3530)** - Update `client.rb` after 3.0.0 refactor
+- **[COOK-2499](https://tickets.chef.io/browse/COOK-2499)** - Do not use resource cloning

 ### Improvement

- Add SmartOS support
+- **[COOK-3116](https://tickets.chef.io/browse/COOK-3116)** - Add SmartOS support

 ## v3.0.0

 ### Improvement

- Postfix main/master and attributes refactor
+- **[COOK-3328](https://tickets.chef.io/browse/COOK-3328)** - Postfix main/master and attributes refactor

 **Breaking changes**:

--- a/cookbooks/postfix/CONTRIBUTING.md
+++ b/cookbooks/postfix/CONTRIBUTING.md
@@ -0,0 +1 @@
+Please refer to <https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD>
--- a/cookbooks/postfix/LICENSE
+++ b/cookbooks/postfix/LICENSE
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--- a/cookbooks/postfix/MAINTAINERS.md
+++ b/cookbooks/postfix/MAINTAINERS.md
@@ -0,0 +1,15 @@
+<!-- This is a generated file. Please do not edit directly -->
+
+# Maintainers
+
+This file lists how this cookbook project is maintained. When making changes to the system, this file tells you who needs to review your patch - you need a review from an existing maintainer for the cookbook to provide a :+1: on your pull request. Additionally, you need to not receive a veto from a Lieutenant or the Project Lead.
+
+Check out [How Cookbooks are Maintained](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD) for details on the process and how to become a maintainer or the project lead.
+
+# Project Maintainer
+* [Tim Smith](https://github.com/tas50)
+
+# Maintainers
+* [Jennifer Davis](https://github.com/sigje)
+* [Tim Smith](https://github.com/tas50)
+* [Thom May](https://github.com/thommay)
--- a/cookbooks/postfix/README.md
+++ b/cookbooks/postfix/README.md
@@ -1,28 +1,19 @@
 # postfix Cookbook

-[![Cookbook Version](https://img.shields.io/cookbook/v/postfix.svg)](https://supermarket.chef.io/cookbooks/postfix)
-[![CI State](https://github.com/sous-chefs/postfix/workflows/ci/badge.svg)](https://github.com/sous-chefs/postfix/actions?query=workflow%3Aci)
-[![OpenCollective](https://opencollective.com/sous-chefs/backers/badge.svg)](#backers)
-[![OpenCollective](https://opencollective.com/sous-chefs/sponsors/badge.svg)](#sponsors)
-[![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Build Status](https://travis-ci.org/chef-cookbooks/postfix.svg?branch=master)](https://travis-ci.org/chef-cookbooks/postfix) [![Cookbook Version](https://img.shields.io/cookbook/v/postfix.svg)](https://supermarket.chef.io/cookbooks/postfix)

 Installs and configures postfix for client or outbound relayhost, or to do SASL authentication.

 On RHEL-family systems, sendmail will be replaced with postfix.

-## Maintainers
-
-This cookbook is maintained by the Sous Chefs. The Sous Chefs are a community of Chef cookbook maintainers working together to maintain important cookbooks. If you’d like to know more please visit [sous-chefs.org](https://sous-chefs.org/) or come chat with us on the Chef Community Slack in [#sous-chefs](https://chefcommunity.slack.com/messages/C2V7B88SF).
-
 ## Requirements

 ### Platforms

- Ubuntu
- Debian
- RHEL/CentOS/Scientific
+- Ubuntu 12.04+
+- Debian 7.0+
+- RHEL/CentOS/Scientific 5.7+, 6.2+
 - Amazon Linux (as of AMIs created after 4/9/2012)
- FreeBSD

 May work on other platforms with or without modification.

@@ -42,7 +33,6 @@ See `attributes/default.rb` for default values.

 - `node['postfix']['mail_type']` - Sets the kind of mail configuration. `master` will set up a server (relayhost).
 - `node['postfix']['relayhost_role']` - name of a role used for search in the client recipe.
- `node['postfix']['relayhost_port']` - listening network port of the relayhost.
 - `node['postfix']['multi_environment_relay']` - set to true if nodes should not constrain search for the relayhost in their own environment.
 - `node['postfix']['use_procmail']` - set to true if nodes should use procmail as the delivery agent.
 - `node['postfix']['use_alias_maps']` - set to true if you want the cookbook to use/configure alias maps
@@ -53,7 +43,7 @@ See `attributes/default.rb` for default values.
 - `node['postfix']['aliases']` - hash of aliases to create with `recipe[postfix::aliases]`, see below under **Recipes** for more information.
 - `node['postfix']['transports']` - hash of transports to create with `recipe[postfix::transports]`, see below under **Recipes** for more information.
 - `node['postfix']['access']` - hash of access to create with `recipe[postfix::access]`, see below under **Recipes** for more information.
- `node['postfix']['virtual_aliases']` - hash of virtual_aliases to create with `recipe[postfix::virtual_aliases]`, see below under **Recipes** for more information.
+- `node['postfix']['virtual_aliases']` - hash of virtual_aliases to create with `recipe[postfix::virtual_aliases]`, see below under __Recipes__ for more information.
 - `node['postfix']['main_template_source']` - Cookbook source for main.cf template. Default 'postfix'
 - `node['postfix']['master_template_source']` - Cookbook source for master.cf template. Default 'postfix'

@@ -85,20 +75,10 @@ This change in namespace to `node['postfix']['main']` should allow for greater f
 - `node['postfix']['main']['smtp_sasl_password_maps']` - Set to `hash:/etc/postfix/sasl_passwd` template file
 - `node['postfix']['main']['smtp_sasl_security_options']` - Set to noanonymous
 - `node['postfix']['main']['relayhost']` - Set to empty string
+- `node['postfix']['sasl']['smtp_sasl_user_name']` - SASL user to authenticate as. Default empty
+- `node['postfix']['sasl']['smtp_sasl_passwd']` - SASL password to use. Default empty.
 - `node['postfix']['sender_canonical_map_entries']` - (hash with key value pairs); default not configured. Setup generic canonical maps. See `man 5 canonical`. If has at least one value, then will be enabled in config.
 - `node['postfix']['smtp_generic_map_entries']` - (hash with key value pairs); default not configured. Setup generic postfix maps. See `man 5 generic`. If has at least one value, then will be enabled in config.
- `node['postfix']['recipient_canonical_map_entries']` - (hash with key value pairs); default not configured. Setup generic canonical maps. See `man 5 canonical`. If has at least one value, then will be enabled in config.
- `node['postfix']['sasl']['smtp_sasl_user_name']` - SASL user to authenticate as. Default empty. You can only use this until the current version. The new syntax is below.
- `node['postfix']['sasl']['smtp_sasl_passwd']` - SASL password to use. Default empty. You can only use this until the current version. The new syntax is below.
- `node['postfix']['sasl']` = ```json {
-    "relayhost1" => {
-      'username' => 'foo',
-      'password' => 'bar'
-    },
-    "relayhost2" => {
-      ...
-    }
-  }``` - You must set the following attribute, otherwise the attribute will default to empty

 Example of json role config, for setup *_map_entries:

@@ -351,14 +331,8 @@ override_attributes(
      "smtp_sasl_auth_enable" => "yes"
    },
    "sasl" => {
-      "relayhost1" => {
-        "username" => "your_password",
-        "password" => "your_username"
-      },
-      "relayhost2" => {
-        ...
-      },
-      ...
+      "smtp_sasl_passwd" => "your_password",
+      "smtp_sasl_user_name" => "your_username"
    }
  }
 )
@@ -451,27 +425,22 @@ override_attributes(
 )
 ```

-## Contributors
+## License & Authors

-This project exists thanks to all the people who [contribute.](https://opencollective.com/sous-chefs/contributors.svg?width=890&button=false)
+**Author:** Cookbook Engineering Team ([cookbooks@chef.io](mailto:cookbooks@chef.io))

-### Backers
+**Copyright:** 2009-2016, Chef Software, Inc.

-Thank you to all our backers!
+```
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at

-![https://opencollective.com/sous-chefs#backers](https://opencollective.com/sous-chefs/backers.svg?width=600&avatarHeight=40)
+    http://www.apache.org/licenses/LICENSE-2.0

-### Sponsors
-
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website.
-
-![https://opencollective.com/sous-chefs/sponsor/0/website](https://opencollective.com/sous-chefs/sponsor/0/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/1/website](https://opencollective.com/sous-chefs/sponsor/1/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/2/website](https://opencollective.com/sous-chefs/sponsor/2/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/3/website](https://opencollective.com/sous-chefs/sponsor/3/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/4/website](https://opencollective.com/sous-chefs/sponsor/4/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/5/website](https://opencollective.com/sous-chefs/sponsor/5/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/6/website](https://opencollective.com/sous-chefs/sponsor/6/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/7/website](https://opencollective.com/sous-chefs/sponsor/7/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/8/website](https://opencollective.com/sous-chefs/sponsor/8/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/9/website](https://opencollective.com/sous-chefs/sponsor/9/avatar.svg?avatarHeight=100)
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```
--- a/cookbooks/postfix/attributes/default.rb
+++ b/cookbooks/postfix/attributes/default.rb
@@ -1,5 +1,5 @@
 # Author:: Joshua Timberman <joshua@chef.io>
-# Copyright:: 2009-2019, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,17 +13,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-default['postfix']['packages'] = value_for_platform(
-  amazon: { '>= 2023' => %w(postfix postfix-lmdb) },
-  default: %w(postfix)
-)
+
 # Generic cookbook attributes
 default['postfix']['mail_type'] = 'client'
 default['postfix']['relayhost_role'] = 'relayhost'
-default['postfix']['relayhost_port'] = '25'
 default['postfix']['multi_environment_relay'] = false
 default['postfix']['use_procmail'] = false
-default['postfix']['use_alias_maps'] = platform?('freebsd')
+default['postfix']['use_alias_maps'] = (node['platform'] == 'freebsd')
 default['postfix']['use_transport_maps'] = false
 default['postfix']['use_access_maps'] = false
 default['postfix']['use_virtual_aliases'] = false
@@ -37,20 +33,11 @@ default['postfix']['main_template_source'] = 'postfix'
 default['postfix']['master_template_source'] = 'postfix'
 default['postfix']['sender_canonical_map_entries'] = {}
 default['postfix']['smtp_generic_map_entries'] = {}
-default['postfix']['recipient_canonical_map_entries'] = {}
-
-default['postfix']['db_type'] = value_for_platform(
-  %w(centos redhat almalinux rocky oracle) => { '>= 10' => 'lmdb' },
-  amazon: { '>= 2023' => 'lmdb' },
-  %w(opensuseleap suse) => { '>= 15' => 'lmdb' },
-  default: 'hash'
-)
-
-default['postfix']['access_db_type'] = lazy { node['postfix']['db_type'] }
-default['postfix']['aliases_db_type'] = lazy { node['postfix']['db_type'] }
-default['postfix']['transport_db_type'] = lazy { node['postfix']['db_type'] }
-default['postfix']['virtual_alias_db_type'] = lazy { node['postfix']['db_type'] }
-default['postfix']['virtual_alias_domains_db_type'] = lazy { node['postfix']['db_type'] }
+default['postfix']['access_db_type'] = 'hash'
+default['postfix']['aliases_db_type'] = 'hash'
+default['postfix']['transport_db_type'] = 'hash'
+default['postfix']['virtual_alias_db_type'] = 'hash'
+default['postfix']['virtual_alias_domains_db_type'] = 'hash'

 case node['platform']
 when 'smartos'
@@ -97,17 +84,10 @@ default['postfix']['main']['myorigin'] = '$myhostname'
 default['postfix']['main']['mydestination'] = [node['postfix']['main']['myhostname'], node['hostname'], 'localhost.localdomain', 'localhost'].compact
 default['postfix']['main']['smtpd_use_tls'] = 'yes'
 default['postfix']['main']['smtp_use_tls'] = 'yes'
-default['postfix']['main']['smtpd_tls_mandatory_protocols'] = '!SSLv2,!SSLv3'
-default['postfix']['main']['smtp_tls_mandatory_protocols'] = '!SSLv2,!SSLv3'
-default['postfix']['main']['smtpd_tls_protocols'] = '!SSLv2,!SSLv3'
-default['postfix']['main']['smtp_tls_protocols'] = '!SSLv2,!SSLv3'
 default['postfix']['main']['smtp_sasl_auth_enable'] = 'no'
 default['postfix']['main']['mailbox_size_limit'] = 0
 default['postfix']['main']['mynetworks'] = nil
 default['postfix']['main']['inet_interfaces'] = 'loopback-only'
-default['postfix']['main']['default_database_type'] = lazy { node['postfix']['db_type'] }
-default['postfix']['main']['alias_database'] = lazy { "#{node['postfix']['db_type']}:#{node['postfix']['aliases_db']}" }
-default['postfix']['main']['alias_maps'] = lazy { "#{node['postfix']['db_type']}:#{node['postfix']['aliases_db']}" }

 # Conditional attributes, also reference _attributes recipe
 case node['platform_family']
@@ -119,11 +99,6 @@ when 'smartos'
  default['postfix']['cafile'] = '/opt/local/etc/postfix/cacert.pem'
 when 'rhel'
  default['postfix']['cafile'] = '/etc/pki/tls/cert.pem'
-when 'amazon'
-  default['postfix']['cafile'] = '/etc/pki/tls/cert.pem'
-when 'suse'
-  default['postfix']['main']['setgid_group'] = 'maildrop'
-  default['postfix']['main']['daemon_directory'] = '/usr/lib/postfix/bin'
 else
  default['postfix']['cafile'] = "#{node['postfix']['conf_dir']}/cacert.pem"
 end
@@ -399,24 +374,27 @@ default['postfix']['master']['bsmtp']['command'] = 'pipe'
 default['postfix']['master']['bsmtp']['args'] = ['flags=Fq. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient']

 # OS Aliases
-default['postfix']['aliases'] = if platform?('freebsd')
+default['postfix']['aliases'] = case node['platform']
+                                when 'freebsd'
                                  {
-                                    'MAILER-DAEMON' => 'postmaster',
-                                    'bin' => 'root',
-                                    'daemon' => 'root',
-                                    'named' => 'root',
-                                    'nobody' => 'root',
-                                    'uucp' => 'root',
-                                    'www' => 'root',
-                                    'ftp-bugs' => 'root',
-                                    'postfix' => 'root',
-                                    'manager' => 'root',
-                                    'dumper' => 'root',
-                                    'operator' => 'root',
-                                    'abuse' => 'postmaster',
+                                    'MAILER-DAEMON' =>  'postmaster',
+                                    'bin' =>            'root',
+                                    'daemon' =>         'root',
+                                    'named' =>          'root',
+                                    'nobody' =>         'root',
+                                    'uucp' =>           'root',
+                                    'www' =>            'root',
+                                    'ftp-bugs' =>       'root',
+                                    'postfix' =>        'root',
+                                    'manager' =>        'root',
+                                    'dumper' =>         'root',
+                                    'operator' =>       'root',
+                                    'abuse' =>          'postmaster',
                                  }
                                else
                                  {}
                                end

-default['postfix']['main']['smtpd_relay_restrictions'] = lazy { "#{node['postfix']['db_type']}:#{node['postfix']['relay_restrictions_db']}, reject" if node['postfix']['use_relay_restrictions_maps'] }
+if node['postfix']['use_relay_restrictions_maps']
+  default['postfix']['main']['smtpd_relay_restrictions'] = "hash:#{node['postfix']['relay_restrictions_db']}, reject"
+end
--- a/cookbooks/postfix/chefignore
+++ b/cookbooks/postfix/chefignore
@@ -1,115 +0,0 @@
-# Put files/directories that should be ignored in this file when uploading
-# to a Chef Infra Server or Supermarket.
-# Lines that start with '# ' are comments.
-
-# OS generated files #
-######################
-.DS_Store
-ehthumbs.db
-Icon?
-nohup.out
-Thumbs.db
-.envrc
-
-# EDITORS #
-###########
-.#*
-.project
-.settings
-*_flymake
-*_flymake.*
-*.bak
-*.sw[a-z]
-*.tmproj
-*~
-\#*
-REVISION
-TAGS*
-tmtags
-.vscode
-.editorconfig
-
-## COMPILED ##
-##############
-*.class
-*.com
-*.dll
-*.exe
-*.o
-*.pyc
-*.so
-*/rdoc/
-a.out
-mkmf.log
-
-# Testing #
-###########
-.circleci/*
-.codeclimate.yml
-.delivery/*
-.foodcritic
-.kitchen*
-.mdlrc
-.overcommit.yml
-.rspec
-.rubocop.yml
-.travis.yml
-.watchr
-.yamllint
-azure-pipelines.yml
-Dangerfile
-examples/*
-features/*
-Guardfile
-kitchen*.yml
-mlc_config.json
-Procfile
-Rakefile
-spec/*
-test/*
-
-# SCM #
-#######
-.git
-.gitattributes
-.gitconfig
-.github/*
-.gitignore
-.gitkeep
-.gitmodules
-.svn
-*/.bzr/*
-*/.git
-*/.hg/*
-*/.svn/*
-
-# Berkshelf #
-#############
-Berksfile
-Berksfile.lock
-cookbooks/*
-tmp
-
-# Bundler #
-###########
-vendor/*
-Gemfile
-Gemfile.lock
-
-# Policyfile #
-##############
-Policyfile.rb
-Policyfile.lock.json
-
-# Documentation #
-#############
-CODE_OF_CONDUCT*
-CONTRIBUTING*
-documentation/*
-TESTING*
-UPGRADING*
-
-# Vagrant #
-###########
-.vagrant
-Vagrantfile
--- a/cookbooks/postfix/metadata.json
+++ b/cookbooks/postfix/metadata.json
--- a/cookbooks/postfix/metadata.rb
+++ b/cookbooks/postfix/metadata.rb
@@ -1,20 +0,0 @@
-name              'postfix'
-maintainer        'Sous Chefs'
-maintainer_email  'help@sous-chefs.org'
-license           'Apache-2.0'
-description       'Installs and configures postfix for client or outbound relayhost, or to do SASL auth'
-version           '6.4.1'
-source_url        'https://github.com/sous-chefs/postfix'
-issues_url        'https://github.com/sous-chefs/postfix/issues'
-chef_version      '>= 12.15'
-
-supports 'amazon'
-supports 'centos'
-supports 'debian'
-supports 'fedora'
-supports 'freebsd'
-supports 'oracle'
-supports 'redhat'
-supports 'scientific'
-supports 'smartos'
-supports 'ubuntu'
--- a/cookbooks/postfix/recipes/_attributes.rb
+++ b/cookbooks/postfix/recipes/_attributes.rb
@@ -1,4 +1,4 @@
-# Copyright:: 2012-2019, Chef Software, Inc.
+# Copyright:: 2012-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,9 @@
 # limitations under the License.
 #

-node.default_unless['postfix']['main']['mailbox_command'] = '/usr/bin/procmail -a "$EXTENSION"' if node['postfix']['use_procmail']
+if node['postfix']['use_procmail']
+  node.default_unless['postfix']['main']['mailbox_command'] = '/usr/bin/procmail -a "$EXTENSION"'
+end

 if node['postfix']['main']['smtpd_use_tls'] == 'yes'
  node.default_unless['postfix']['main']['smtpd_tls_cert_file'] = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
@@ -29,23 +31,41 @@ end

 if node['postfix']['main']['smtp_sasl_auth_enable'] == 'yes'
  node.default_unless['postfix']['sasl_password_file'] = "#{node['postfix']['conf_dir']}/sasl_passwd"
-  node.default_unless['postfix']['main']['smtp_sasl_password_maps'] = "#{node['postfix']['db_type']}:#{node['postfix']['sasl_password_file']}"
+  node.default_unless['postfix']['main']['smtp_sasl_password_maps'] = "hash:#{node['postfix']['sasl_password_file']}"
  node.default_unless['postfix']['main']['smtp_sasl_security_options'] = 'noanonymous'
+  node.default_unless['postfix']['sasl']['smtp_sasl_user_name'] = ''
+  node.default_unless['postfix']['sasl']['smtp_sasl_passwd']    = ''
  node.default_unless['postfix']['main']['relayhost'] = ''
 end

-node.default_unless['postfix']['main']['alias_maps'] = ["#{node['postfix']['db_type']}:#{node['postfix']['aliases_db']}"] if node['postfix']['use_alias_maps']
+if node['postfix']['use_alias_maps']
+  node.default_unless['postfix']['main']['alias_maps'] = ["hash:#{node['postfix']['aliases_db']}"]
+end

-node.default_unless['postfix']['main']['transport_maps'] = ["#{node['postfix']['db_type']}:#{node['postfix']['transport_db']}"] if node['postfix']['use_transport_maps']
+if node['postfix']['use_transport_maps']
+  node.default_unless['postfix']['main']['transport_maps'] = ["hash:#{node['postfix']['transport_db']}"]
+end

-node.default_unless['postfix']['main']['access_maps'] = ["#{node['postfix']['db_type']}:#{node['postfix']['access_db']}"] if node['postfix']['use_access_maps']
+if node['postfix']['use_access_maps']
+  node.default_unless['postfix']['main']['access_maps'] = ["hash:#{node['postfix']['access_db']}"]
+end

-node.default_unless['postfix']['main']['virtual_alias_maps'] = ["#{node['postfix']['virtual_alias_db_type']}:#{node['postfix']['virtual_alias_db']}"] if node['postfix']['use_virtual_aliases']
+if node['postfix']['use_virtual_aliases']
+  node.default_unless['postfix']['main']['virtual_alias_maps'] = ["#{node['postfix']['virtual_alias_db_type']}:#{node['postfix']['virtual_alias_db']}"]
+end

-node.default_unless['postfix']['main']['virtual_alias_domains'] = ["#{node['postfix']['virtual_alias_domains_db_type']}:#{node['postfix']['virtual_alias_domains_db']}"] if node['postfix']['use_virtual_aliases_domains']
+if node['postfix']['use_virtual_aliases_domains']
+  node.default_unless['postfix']['main']['virtual_alias_domains'] = ["#{node['postfix']['virtual_alias_domains_db_type']}:#{node['postfix']['virtual_alias_domains_db']}"]
+end

-node.default_unless['postfix']['main']['smtpd_relay_restrictions'] = "#{node['postfix']['db_type']}:#{node['postfix']['relay_restrictions_db']}, reject" if node['postfix']['use_relay_restrictions_maps']
+if node['postfix']['use_relay_restrictions_maps']
+  default['postfix']['main']['smtpd_relay_restrictions'] = "hash:#{node['postfix']['relay_restrictions_db']}, reject"
+end

-node.default_unless['postfix']['main']['maildrop_destination_recipient_limit'] = 1 if node['postfix']['master']['maildrop']['active']
+if node['postfix']['master']['maildrop']['active']
+  node.default_unless['postfix']['main']['maildrop_destination_recipient_limit'] = 1
+end

-node.default_unless['postfix']['main']['cyrus_destination_recipient_limit'] = 1 if node['postfix']['master']['cyrus']['active']
+if node['postfix']['master']['cyrus']['active']
+  node.default_unless['postfix']['main']['cyrus_destination_recipient_limit'] = 1
+end
--- a/cookbooks/postfix/recipes/_common.rb
+++ b/cookbooks/postfix/recipes/_common.rb
@@ -2,7 +2,7 @@
 # Cookbook:: common
 # Recipe:: default
 #
-# Copyright:: 2009-2020, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,19 +19,12 @@

 include_recipe 'postfix::_attributes'

-# use multi-package when we can
-if node['os'] == 'linux'
-  package node['postfix']['packages']
-else
-  node['postfix']['packages'].each do |pkg|
-    package pkg
-  end
-end
+package 'postfix'

 package 'procmail' if node['postfix']['use_procmail']

 case node['platform_family']
-when 'rhel', 'fedora', 'amazon'
+when 'rhel', 'fedora'
  service 'sendmail' do
    action :nothing
  end
@@ -42,8 +35,6 @@ when 'rhel', 'fedora', 'amazon'
    notifies :start, 'service[postfix]'
    not_if '/usr/bin/test /etc/alternatives/mta -ef /usr/sbin/sendmail.postfix'
  end
-when 'suse'
-  file '/var/adm/postfix.configured'
 when 'omnios'
  manifest_path = ::File.join(Chef::Config[:file_cache_path], 'manifest-postfix.xml')

@@ -76,68 +67,7 @@ when 'omnios'
  execute 'load postfix manifest' do
    action :nothing
    command "svccfg import #{manifest_path}"
-    notifies :restart, 'service[postfix]' unless platform_family?('solaris2')
-  end
-when 'freebsd'
-  # Actions are based on docs provided by FreeBSD:
-  # https://www.freebsd.org/doc/handbook/mail-changingmta.html
-  service 'sendmail' do
-    action :nothing
-  end
-
-  template '/etc/mail/mailer.conf' do
-    source 'mailer.erb'
-    owner 'root'
-    group 0
-    notifies :restart, 'service[postfix]' unless platform_family?('solaris2')
-  end
-
-  execute 'switch_mailer_to_postfix' do
-    command [
-      'sysrc',
-      'sendmail_enable=NO',
-      'sendmail_submit_enable=NO',
-      'sendmail_outbound_enable=NO',
-      'sendmail_msp_queue_enable=NO',
-      'postfix_enable=YES',
-    ]
-    notifies :stop, 'service[sendmail]', :immediately
-    notifies :disable, 'service[sendmail]', :immediately
-    notifies :start, 'service[postfix]', :delayed
-    only_if "sysrc sendmail_enable sendmail_submit_enable sendmail_outbound_enable sendmail_msp_queue_enable | egrep -q '(YES|unknown variable)' || sysrc postfix_enable | egrep -q '(NO|unknown variable)'"
-  end
-
-  execute 'disable_periodic' do
-    # rubocop:disable Lint/ParenthesesAsGroupedExpression
-    environment ({ 'RC_CONFS' => '/etc/periodic.conf' })
-    command [
-      'sysrc',
-      'daily_clean_hoststat_enable=NO',
-      'daily_status_mail_rejects_enable=NO',
-      'daily_status_include_submit_mailq=NO',
-      'daily_submit_queuerun=NO',
-    ]
-    only_if "RC_CONFS=/etc/periodic.conf sysrc daily_clean_hoststat_enable daily_status_mail_rejects_enable daily_status_include_submit_mailq daily_submit_queuerun | egrep -q '(YES|unknown variable)'"
-  end
-end
-
-# We need to write the config first as the below postmap immediately commands assume config is correct
-# Which is not the case as ipv6 is assumed to be available by the postfix package
-# And if someone wants to disable this first we need to update the config first aswell
-%w( main master ).each do |cfg|
-  template "#{node['postfix']['conf_dir']}/#{cfg}.cf" do
-    source "#{cfg}.cf.erb"
-    owner 'root'
-    group node['root_group']
-    mode '0644'
-    # restart service for solaris on chef-client has a bug
-    # unless condition can be removed after
-    # https://github.com/chef/chef/pull/6596 merge/release
-    notifies :restart, 'service[postfix]' unless platform_family?('solaris2')
-    variables(
-      lazy { { settings: node['postfix'][cfg] } }
-    )
-    cookbook node['postfix']["#{cfg}_template_source"]
+    notifies :restart, 'service[postfix]'
  end
 end

@@ -151,11 +81,13 @@ unless node['postfix']['sender_canonical_map_entries'].empty?
    owner 'root'
    group node['root_group']
    mode '0644'
-    notifies :run, 'execute[update-postfix-sender_canonical]', :immediately
+    notifies :run, 'execute[update-postfix-sender_canonical]'
    notifies :reload, 'service[postfix]'
  end

-  node.default['postfix']['main']['sender_canonical_maps'] = "#{node['postfix']['db_type']}:#{node['postfix']['conf_dir']}/sender_canonical" unless node['postfix']['main'].key?('sender_canonical_maps')
+  unless node['postfix']['main'].key?('sender_canonical_maps')
+    node.normal['postfix']['main']['sender_canonical_maps'] = "hash:#{node['postfix']['conf_dir']}/sender_canonical"
+  end
 end

 execute 'update-postfix-smtp_generic' do
@@ -168,31 +100,28 @@ unless node['postfix']['smtp_generic_map_entries'].empty?
    owner 'root'
    group node['root_group']
    mode '0644'
-    notifies :run, 'execute[update-postfix-smtp_generic]', :immediately
+    notifies :run, 'execute[update-postfix-smtp_generic]'
    notifies :reload, 'service[postfix]'
  end

-  node.default['postfix']['main']['smtp_generic_maps'] = "#{node['postfix']['db_type']}:#{node['postfix']['conf_dir']}/smtp_generic" unless node['postfix']['main'].key?('smtp_generic_maps')
+  unless node['postfix']['main'].key?('smtp_generic_maps')
+    node.normal['postfix']['main']['smtp_generic_maps'] = "hash:#{node['postfix']['conf_dir']}/smtp_generic"
+  end
 end

-execute 'update-postfix-recipient_canonical' do
-  command "postmap #{node['postfix']['conf_dir']}/recipient_canonical"
-  action :nothing
-end
-
-unless node['postfix']['recipient_canonical_map_entries'].empty?
-  template "#{node['postfix']['conf_dir']}/recipient_canonical" do
+%w( main master ).each do |cfg|
+  template "#{node['postfix']['conf_dir']}/#{cfg}.cf" do
+    source "#{cfg}.cf.erb"
    owner 'root'
    group node['root_group']
    mode '0644'
-    notifies :run, 'execute[update-postfix-recipient_canonical]', :immediately
-    notifies :reload, 'service[postfix]'
+    notifies :restart, 'service[postfix]'
+    variables(settings: node['postfix'][cfg])
+    cookbook node['postfix']["#{cfg}_template_source"]
  end
-
-  node.default['postfix']['main']['recipient_canonical_maps'] = "#{node['postfix']['db_type']}:#{node['postfix']['conf_dir']}/recipient_canonical" unless node['postfix']['main'].key?('recipient_canonical_maps')
 end

 service 'postfix' do
  supports status: true, restart: true, reload: true
-  action [:enable, :start]
+  action :enable
 end
--- a/cookbooks/postfix/recipes/access.rb
+++ b/cookbooks/postfix/recipes/access.rb
@@ -1,4 +1,4 @@
-# Copyright:: 2012-2019, Chef Software, Inc.
+# Copyright:: 2012-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,5 +23,5 @@ end

 template node['postfix']['access_db'] do
  source 'access.erb'
-  notifies :run, 'execute[update-postfix-access]', :immediately
+  notifies :run, 'execute[update-postfix-access]'
 end
--- a/cookbooks/postfix/recipes/aliases.rb
+++ b/cookbooks/postfix/recipes/aliases.rb
@@ -1,4 +1,4 @@
-# Copyright:: 2012-2019, Chef Software, Inc.
+# Copyright:: 2012-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,5 +25,5 @@ end

 template node['postfix']['aliases_db'] do
  source 'aliases.erb'
-  notifies :run, 'execute[update-postfix-aliases]', :immediately
+  notifies :run, 'execute[update-postfix-aliases]'
 end
--- a/cookbooks/postfix/recipes/client.rb
+++ b/cookbooks/postfix/recipes/client.rb
@@ -2,7 +2,7 @@
 # Cookbook:: postfix
 # Recipe:: client
 #
-# Copyright:: 2009-2019, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,9 +24,6 @@ end

 query = "role:#{node['postfix']['relayhost_role']}"
 relayhost = ''
-# if the relayhost_port attribute is not port 25, append to the relayhost
-relayhost_port = node['postfix']['relayhost_port'].to_s != '25' ? ":#{node['postfix']['relayhost_port']}" : ''
-
 # results = []

 if node.run_list.roles.include?(node['postfix']['relayhost_role'])
@@ -39,6 +36,6 @@ else
  relayhost = results.map { |n| n['ipaddress'] }.first
 end

-node.default['postfix']['main']['relayhost'] = "[#{relayhost}]#{relayhost_port}"
+node.normal['postfix']['main']['relayhost'] = "[#{relayhost}]"

 include_recipe 'postfix'
--- a/cookbooks/postfix/recipes/default.rb
+++ b/cookbooks/postfix/recipes/default.rb
@@ -2,7 +2,7 @@
 # Cookbook:: postfix
 # Recipe:: default
 #
-# Copyright:: 2009-2019, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/postfix/recipes/maps.rb
+++ b/cookbooks/postfix/recipes/maps.rb
@@ -1,4 +1,5 @@
-# Copyright:: 2012-2019, Chef Software, Inc.
+# encoding: utf-8
+# Copyright:: 2012-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +15,10 @@
 #

 node['postfix']['maps'].each do |type, maps|
-  if platform_family?('debian')
+  if node['platform_family'] == 'debian'
    package "postfix-#{type}" if %w(pgsql mysql ldap cdb).include?(type)
  end

-  if platform_family?('rhel') && node['platform_version'].to_i >= 8
-    package "postfix-#{type}" if %w(pgsql mysql ldap cdb lmdb).include?(type)
-  end
-
  separator = if %w(pgsql mysql ldap memcache sqlite).include?(type)
                ' = '
              else
@@ -32,7 +29,7 @@ node['postfix']['maps'].each do |type, maps|
      command "postmap #{file}"
      environment PATH: "#{ENV['PATH']}:/opt/omni/bin:/opt/omni/sbin" if platform_family?('omnios')
      action :nothing
-    end if %w(btree cdb dbm hash lmdb sdbm).include?(type)
+    end if %w(btree cdb dbm hash sdbm).include?(type)
    template "#{file}-#{type}" do
      path file
      source 'maps.erb'
@@ -41,7 +38,9 @@ node['postfix']['maps'].each do |type, maps|
        map: content,
        separator: separator
      )
-      notifies :run, "execute[update-postmap-#{file}]" if %w(btree cdb dbm hash lmdb sdbm).include?(type)
+      if %w(btree cdb dbm hash sdbm).include?(type)
+        notifies :run, "execute[update-postmap-#{file}]"
+      end
      notifies :restart, 'service[postfix]'
    end
  end
--- a/cookbooks/postfix/recipes/relay_restrictions.rb
+++ b/cookbooks/postfix/recipes/relay_restrictions.rb
@@ -1,4 +1,4 @@
-# Copyright:: 2012-2019, Chef Software, Inc.
+# Copyright:: 2012-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,15 +15,13 @@

 include_recipe 'postfix::_common'

-postmap_command = platform_family?('rhel') ? '/usr/sbin/postmap' : 'postmap'
-
 execute 'update-postfix-relay-restrictions' do
-  command "#{postmap_command} #{node['postfix']['relay_restrictions_db']}"
+  command "postmap #{node['postfix']['relay_restrictions_db']}"
  environment PATH: "#{ENV['PATH']}:/opt/omni/bin:/opt/omni/sbin" if platform_family?('omnios')
  action :nothing
 end

 template node['postfix']['relay_restrictions_db'] do
  source 'relay_restrictions.erb'
-  notifies :run, 'execute[update-postfix-relay-restrictions]', :immediately
+  notifies :run, 'execute[update-postfix-relay-restrictions]'
 end
--- a/cookbooks/postfix/recipes/sasl_auth.rb
+++ b/cookbooks/postfix/recipes/sasl_auth.rb
@@ -3,7 +3,7 @@
 # Cookbook:: postfix
 # Recipe:: sasl_auth
 #
-# Copyright:: 2009-2019, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,9 +28,11 @@ case node['platform_family']
 when 'debian'
  sasl_pkgs = %w(libsasl2-2 libsasl2-modules ca-certificates)
 when 'rhel'
-  sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain ca-certificates)
-when 'amazon'
-  sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain ca-certificates)
+  sasl_pkgs = if node['platform_version'].to_i < 6
+                %w(cyrus-sasl cyrus-sasl-plain openssl)
+              else
+                %w(cyrus-sasl cyrus-sasl-plain ca-certificates)
+              end
 when 'fedora'
  sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain ca-certificates)
 end
--- a/cookbooks/postfix/recipes/server.rb
+++ b/cookbooks/postfix/recipes/server.rb
@@ -3,7 +3,7 @@
 # Cookbook:: postfix
 # Recipe:: server
 #
-# Copyright:: 2009-2019, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/postfix/recipes/transports.rb
+++ b/cookbooks/postfix/recipes/transports.rb
@@ -1,4 +1,4 @@
-# Copyright:: 2012-2019, Chef Software, Inc.
+# Copyright:: 2012-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,15 +15,13 @@

 include_recipe 'postfix::_common'

-postmap_command = platform_family?('rhel') ? '/usr/sbin/postmap' : 'postmap'
-
 execute 'update-postfix-transport' do
-  command "#{postmap_command} #{node['postfix']['transport_db']}"
+  command "postmap #{node['postfix']['transport_db']}"
  environment PATH: "#{ENV['PATH']}:/opt/omni/bin:/opt/omni/sbin" if platform_family?('omnios')
  action :nothing
 end

 template node['postfix']['transport_db'] do
  source 'transport.erb'
-  notifies :run, 'execute[update-postfix-transport]', :immediately
+  notifies :run, 'execute[update-postfix-transport]'
 end
--- a/cookbooks/postfix/recipes/virtual_aliases.rb
+++ b/cookbooks/postfix/recipes/virtual_aliases.rb
@@ -1,4 +1,4 @@
-# Copyright:: 2012-2019, Chef Software, Inc.
+# Copyright:: 2012-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,6 +23,6 @@ end

 template node['postfix']['virtual_alias_db'] do
  source 'virtual_aliases.erb'
-  notifies :run, 'execute[update-postfix-virtual-alias]', :immediately
+  notifies :run, 'execute[update-postfix-virtual-alias]'
  notifies :restart, 'service[postfix]'
 end
--- a/cookbooks/postfix/recipes/virtual_aliases_domains.rb
+++ b/cookbooks/postfix/recipes/virtual_aliases_domains.rb
@@ -1,4 +1,4 @@
-# Copyright:: 2012-2019, Chef Software, Inc.
+# Copyright:: 2012-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,6 +23,6 @@ end

 template node['postfix']['virtual_alias_domains_db'] do
  source 'virtual_aliases_domains.erb'
-  notifies :run, 'execute[update-postfix-virtual-alias-domains]', :immediately
+  notifies :run, 'execute[update-postfix-virtual-alias-domains]'
  notifies :restart, 'service[postfix]'
 end
--- a/cookbooks/postfix/renovate.json
+++ b/cookbooks/postfix/renovate.json
@@ -1,18 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:base"],
-  "packageRules": [
-    {
-      "groupName": "Actions",
-      "matchUpdateTypes": ["minor", "patch", "pin"],
-      "automerge": true,
-      "addLabels": ["Release: Patch", "Skip: Announcements"]
-    },
-    {
-      "groupName": "Actions",
-      "matchUpdateTypes": ["major"],
-      "automerge": false,
-      "addLabels": ["Release: Patch", "Skip: Announcements"]
-    }
-  ]
-}
--- a/cookbooks/postfix/templates/default/access.erb
+++ b/cookbooks/postfix/templates/default/access.erb
--- a/cookbooks/postfix/templates/default/aliases.erb
+++ b/cookbooks/postfix/templates/default/aliases.erb
@@ -6,5 +6,5 @@
 postmaster:    root

 <% node['postfix']['aliases'].each do |name, value| %>
-<%= name.match?(/[\s#:@]/) ? "\"#{name}\"" : name %>: <%= [value].flatten.map{|x| x.include?("|") ? "\"#{x}\"" : x}.join(',') %>
+<%= name %>: <%= [value].flatten.map{|x| if (x.include?("@")) then x else %Q("#{x}") end}.join(', ') %>
 <% end unless node['postfix']['aliases'].nil? %>
--- a/cookbooks/postfix/templates/default/main.cf.erb
+++ b/cookbooks/postfix/templates/default/main.cf.erb
--- a/cookbooks/postfix/templates/default/manifest-postfix.xml.erb
+++ b/cookbooks/postfix/templates/default/manifest-postfix.xml.erb
--- a/cookbooks/postfix/templates/default/maps.erb
+++ b/cookbooks/postfix/templates/default/maps.erb
--- a/cookbooks/postfix/templates/default/master.cf.erb
+++ b/cookbooks/postfix/templates/default/master.cf.erb
--- a/cookbooks/postfix/templates/default/port_smtp.erb
+++ b/cookbooks/postfix/templates/default/port_smtp.erb
--- a/cookbooks/postfix/templates/default/relay_restrictions.erb
+++ b/cookbooks/postfix/templates/default/relay_restrictions.erb
--- a/cookbooks/postfix/templates/default/sasl_passwd.erb
+++ b/cookbooks/postfix/templates/default/sasl_passwd.erb
@@ -0,0 +1,4 @@
+# Auto-generated by Chef.
+# Local modifications will be overwritten.
+#
+<%= node['postfix']['main']['relayhost'] %> <%= @settings['smtp_sasl_user_name'] %>:<%= @settings['smtp_sasl_passwd'] %>
--- a/cookbooks/postfix/templates/default/sender_canonical.erb
+++ b/cookbooks/postfix/templates/default/sender_canonical.erb
--- a/cookbooks/postfix/templates/default/smtp_generic.erb
+++ b/cookbooks/postfix/templates/default/smtp_generic.erb
--- a/cookbooks/postfix/templates/default/transport.erb
+++ b/cookbooks/postfix/templates/default/transport.erb
--- a/cookbooks/postfix/templates/default/virtual_aliases.erb
+++ b/cookbooks/postfix/templates/default/virtual_aliases.erb
--- a/cookbooks/postfix/templates/default/virtual_aliases_domains.erb
+++ b/cookbooks/postfix/templates/default/virtual_aliases_domains.erb
--- a/cookbooks/postfix/templates/mailer.erb
+++ b/cookbooks/postfix/templates/mailer.erb
@@ -1,10 +0,0 @@
-#
-# Auto-generated by Chef.
-# Local modifications will be overwritten.
-#
-# Execute the Postfix sendmail program, named /usr/local/sbin/sendmail
-#
-sendmail        /usr/local/sbin/sendmail
-send-mail       /usr/local/sbin/sendmail
-mailq           /usr/local/sbin/sendmail
-newaliases      /usr/local/sbin/sendmail
--- a/cookbooks/postfix/templates/recipient_canonical.erb
+++ b/cookbooks/postfix/templates/recipient_canonical.erb
@@ -1,9 +0,0 @@
-#
-# Auto-generated by Chef.
-# Local modifications will be overwritten.
-#
-# See man 5 canonical for format
-
-<% node['postfix']['recipient_canonical_map_entries'].each do |name, value| %>
-<%= name %> <%= value %>
-<% end unless node['postfix']['recipient_canonical_map_entries'].nil? %>
--- a/cookbooks/postfix/templates/sasl_passwd.erb
+++ b/cookbooks/postfix/templates/sasl_passwd.erb
@@ -1,8 +0,0 @@
-# Auto-generated by Chef.
-# Local modifications will be overwritten.
-
-<% if !@settings.nil? && !@settings.empty? -%>
-<%   @settings.sort.map do |relayhost,value| -%>
-<%= relayhost %> <%= value['username'] %>:<%= value['password'] %>
-<%   end -%>
-<% end -%>
--- a/cookbooks/unbound/CHANGELOG.md
+++ b/cookbooks/unbound/CHANGELOG.md
@@ -1,64 +0,0 @@
-# CHANGELOG
-
-This file is used to list changes made in each version of the unbound cookbook.
-
-## 3.0.2 - *2023-10-02*
-
- Update Ci files and remove CircleCI config
-
-## 3.0.1 - *2022-09-30*
-
- Add missing `fallback-enable` setting to `config_authority_zone`
-
-## 3.0.0 - *2022-04-04*
-
- Add separate configuration resources
- Default recipe now only runs installation
- Refactor configuration template to be Hash driven
-
-## 2.0.3 - *2022-03-04*
-
- resolved cookstyle error: .delivery/project.toml:2:8 convention: `Style/StringLiterals`
- resolved cookstyle error: .delivery/project.toml:4:10 convention: `Style/StringLiterals`
- resolved cookstyle error: .delivery/project.toml:5:13 convention: `Style/StringLiterals`
- resolved cookstyle error: .delivery/project.toml:6:10 convention: `Style/StringLiterals`
- resolved cookstyle error: .delivery/project.toml:7:9 convention: `Style/StringLiterals`
- resolved cookstyle error: .delivery/project.toml:8:14 convention: `Style/StringLiterals`
- resolved cookstyle error: .delivery/project.toml:9:11 convention: `Style/StringLiterals`
-
-## 2.0.2 - *2021-08-31*
-
- Standardise files with files in sous-chefs/repo-management
-
-## 2.0.1 - *2021-06-01*
-
- Updated tests folder to match other cookbooks
- Updated spec platform to supported version
-
-## 2.0.0 - 2020-05-05
-
- Upgraded to circleci for testing
- Minimum Chef Infra Client version is now **13.0**
- Removed unused long_description metadata.rb field
- Simplify overly complex platform logic
- Migrate to actions for testing
-
-## [1.0.1]
-
- Simplify logic with root_group
- Fix `root_group` not using new_resource
- Use strings for file modes
- Resolve foodcritic warnings in the `rr` resource
- Fix platform_family logic on the service Update platforms.
- Use dokken images for travis testing.
- Don't test on debian-8/9 and centos-6 as these services don't currently start.
- Account for a list of forward-addrs / effectively disable remote control (#27)
-
-## [1.0.0]
-
- Add new custom resources `unbound_install` & `unbound_configure`
-
-## [0.1.1]
-
- Adding support and kitchen testing for forward_zone generation
- Updating to use Sous Chefs guidelines
--- a/cookbooks/unbound/LICENSE
+++ b/cookbooks/unbound/LICENSE
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--- a/cookbooks/unbound/README.md
+++ b/cookbooks/unbound/README.md
@@ -1,78 +0,0 @@
-# Unbound Cookbook
-
-[![Cookbook Version](https://img.shields.io/cookbook/v/unbound.svg)](https://supermarket.chef.io/cookbooks/unbound)
-[![Build Status](https://img.shields.io/circleci/project/github/sous-chefs/unbound/master.svg)](https://circleci.com/gh/sous-chefs/unbound)
-[![OpenCollective](https://opencollective.com/sous-chefs/backers/badge.svg)](#backers)
-[![OpenCollective](https://opencollective.com/sous-chefs/sponsors/badge.svg)](#sponsors)
-[![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0)
-
-Installs and manages the unbound DNS server.
-
- [http://unbound.net](http://unbound.net)
-
-## Maintainers
-
-This cookbook is maintained by the Sous Chefs. The Sous Chefs are a community of Chef cookbook maintainers working together to maintain important cookbooks. If you’d like to know more please visit [sous-chefs.org](https://sous-chefs.org/) or come chat with us on the Chef Community Slack in [#sous-chefs](https://chefcommunity.slack.com/messages/C2V7B88SF).
-
-## Requirements
-
-### Platform
-
-A platform with unbound available as a native package. The following platforms have unbound packaged, but note that the filesystem locations are not consistent and at this time only Linux + FHS is supported.
-
- Ubuntu/Debian
- Red Hat/CentOS/Fedora (requires EPEL)
- FreeBSD
-
-### Chef
-
- Chef 16
-
-## Resources
-
- [unbound_config_authority_zone](documentation/unbound_config_authority_zone.md)
- [unbound_config_cachedb](documentation/unbound_config_cachedb.md)
- [unbound_config_dns64](documentation/unbound_config_dns64.md)
- [unbound_config_dnscrypt](documentation/unbound_config_dnscrypt.md)
- [unbound_config_dnstap](documentation/unbound_config_dnstap.md)
- [unbound_config_dynamic_library](documentation/unbound_config_dynamic_library.md)
- [unbound_config_forward_zone](documentation/unbound_config_forward_zone.md)
- [unbound_config_python_script](documentation/unbound_config_python_script.md)
- [unbound_config_remote_control](documentation/unbound_config_remote_control.md)
- [unbound_config_rpz_zone](documentation/unbound_config_rpz_zone.md)
- [unbound_config_server](documentation/unbound_config_server.md)
- [unbound_config_stub_zone](documentation/unbound_config_stub_zone.md)
- [unbound_config_view](documentation/unbound_config_view.md)
- [unbound_package](documentation/unbound_package.md)
- [unbound_service](documentation/unbound_service.md)
-
-## Recipes
-
-### default
-
-Installs unbound using defaults.
-
-## Contributors
-
-This project exists thanks to all the people who [contribute.](https://opencollective.com/sous-chefs/contributors.svg?width=890&button=false)
-
-### Backers
-
-Thank you to all our backers!
-
-![https://opencollective.com/sous-chefs#backers](https://opencollective.com/sous-chefs/backers.svg?width=600&avatarHeight=40)
-
-### Sponsors
-
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website.
-
-![https://opencollective.com/sous-chefs/sponsor/0/website](https://opencollective.com/sous-chefs/sponsor/0/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/1/website](https://opencollective.com/sous-chefs/sponsor/1/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/2/website](https://opencollective.com/sous-chefs/sponsor/2/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/3/website](https://opencollective.com/sous-chefs/sponsor/3/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/4/website](https://opencollective.com/sous-chefs/sponsor/4/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/5/website](https://opencollective.com/sous-chefs/sponsor/5/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/6/website](https://opencollective.com/sous-chefs/sponsor/6/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/7/website](https://opencollective.com/sous-chefs/sponsor/7/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/8/website](https://opencollective.com/sous-chefs/sponsor/8/avatar.svg?avatarHeight=100)
-![https://opencollective.com/sous-chefs/sponsor/9/website](https://opencollective.com/sous-chefs/sponsor/9/avatar.svg?avatarHeight=100)
--- a/cookbooks/unbound/chefignore
+++ b/cookbooks/unbound/chefignore
@@ -1,115 +0,0 @@
-# Put files/directories that should be ignored in this file when uploading
-# to a Chef Infra Server or Supermarket.
-# Lines that start with '# ' are comments.
-
-# OS generated files #
-######################
-.DS_Store
-ehthumbs.db
-Icon?
-nohup.out
-Thumbs.db
-.envrc
-
-# EDITORS #
-###########
-.#*
-.project
-.settings
-*_flymake
-*_flymake.*
-*.bak
-*.sw[a-z]
-*.tmproj
-*~
-\#*
-REVISION
-TAGS*
-tmtags
-.vscode
-.editorconfig
-
-## COMPILED ##
-##############
-*.class
-*.com
-*.dll
-*.exe
-*.o
-*.pyc
-*.so
-*/rdoc/
-a.out
-mkmf.log
-
-# Testing #
-###########
-.circleci/*
-.codeclimate.yml
-.delivery/*
-.foodcritic
-.kitchen*
-.mdlrc
-.overcommit.yml
-.rspec
-.rubocop.yml
-.travis.yml
-.watchr
-.yamllint
-azure-pipelines.yml
-Dangerfile
-examples/*
-features/*
-Guardfile
-kitchen.yml*
-mlc_config.json
-Procfile
-Rakefile
-spec/*
-test/*
-
-# SCM #
-#######
-.git
-.gitattributes
-.gitconfig
-.github/*
-.gitignore
-.gitkeep
-.gitmodules
-.svn
-*/.bzr/*
-*/.git
-*/.hg/*
-*/.svn/*
-
-# Berkshelf #
-#############
-Berksfile
-Berksfile.lock
-cookbooks/*
-tmp
-
-# Bundler #
-###########
-vendor/*
-Gemfile
-Gemfile.lock
-
-# Policyfile #
-##############
-Policyfile.rb
-Policyfile.lock.json
-
-# Documentation #
-#############
-CODE_OF_CONDUCT*
-CONTRIBUTING*
-documentation/*
-TESTING*
-UPGRADING*
-
-# Vagrant #
-###########
-.vagrant
-Vagrantfile
--- a/cookbooks/unbound/kitchen.dokken.yml
+++ b/cookbooks/unbound/kitchen.dokken.yml
@@ -1,56 +0,0 @@
---
-driver:
-  name: dokken
-  privileged: true
-  chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
-
-transport:
-  name: dokken
-
-provisioner:
-  name: dokken
-
-platforms:
-  - name: centos-7
-    driver:
-      image: dokken/centos-7
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: centos-stream-8
-    driver:
-      image: dokken/centos-stream-8
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: fedora-latest
-    driver:
-      image: dokken/fedora-latest
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: ubuntu-18.04
-    driver:
-      image: dokken/ubuntu-18.04
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
-  - name: ubuntu-20.04
-    driver:
-      image: dokken/ubuntu-20.04
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
-  - name: debian-10
-    driver:
-      image: dokken/debian-10
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
-  - name: debian-11
-    driver:
-      image: dokken/debian-11
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-...
--- a/cookbooks/unbound/libraries/helpers.rb
+++ b/cookbooks/unbound/libraries/helpers.rb
@@ -1,59 +0,0 @@
-#
-# Cookbook:: unbound
-# Library:: helpers
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module Unbound
-  module Cookbook
-    module Helpers
-      def default_config_dir
-        return '/etc/unbound' if %i(unbound_config unbound_configure unbound_config_server).include?(declared_type)
-
-        return '/etc/unbound/unbound.conf.d' if platform?('debian', 'ubuntu')
-
-        case declared_type
-        when :unbound_config_local
-          '/etc/unbound/local.d'
-        when :unbound_config_key
-          '/etc/unbound/keys.d'
-        else
-          '/etc/unbound/conf.d'
-        end
-      end
-
-      def default_includes_dir
-        case node['platform_family']
-        when 'rhel', 'fedora'
-          %w(/etc/unbound/conf.d/*.conf /etc/unbound/local.d/*.conf)
-        when 'debian'
-          %w(/etc/unbound/unbound.conf.d/*.conf)
-        else
-          raise "Unsupported platform family #{node['platform_family']}"
-        end
-      end
-
-      def unbound_yes_no?(value)
-        case value
-        when true
-          'yes'
-        when false
-          'no'
-        when 'yes', 'YES', 'no', 'NO'
-          value.downcase
-        end
-      end
-    end
-  end
-end
--- a/cookbooks/unbound/libraries/template.rb
+++ b/cookbooks/unbound/libraries/template.rb
@@ -1,26 +0,0 @@
-#
-# Cookbook:: unbound
-# Library:: template
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module Unbound
-  module Cookbook
-    module TemplateHelpers
-      def template_partial_indent(output, level, spaces = 2)
-        output.split("\n").each { |l| l.prepend(' ' * (level * spaces)) }.join("\n")
-      end
-    end
-  end
-end
--- a/cookbooks/unbound/metadata.json
+++ b/cookbooks/unbound/metadata.json
@@ -1,42 +0,0 @@
-{
-  "name": "unbound",
-  "description": "Manages unbound DNS resolver",
-  "long_description": "",
-  "maintainer": "Sous Chefs",
-  "maintainer_email": "help@sous-chefs.org",
-  "license": "Apache-2.0",
-  "platforms": {
-    "debian": ">= 0.0.0",
-    "ubuntu": ">= 0.0.0",
-    "centos": ">= 0.0.0",
-    "redhat": ">= 0.0.0",
-    "scientific": ">= 0.0.0",
-    "oracle": ">= 0.0.0",
-    "amazon": ">= 0.0.0"
-  },
-  "dependencies": {
-
-  },
-  "providing": {
-
-  },
-  "recipes": {
-
-  },
-  "version": "3.0.2",
-  "source_url": "https://github.com/sous-chefs/unbound",
-  "issues_url": "https://github.com/sous-chefs/unbound/issues",
-  "privacy": false,
-  "chef_versions": [
-    [
-      ">= 16"
-    ]
-  ],
-  "ohai_versions": [
-
-  ],
-  "gems": [
-
-  ],
-  "eager_load_libraries": true
-}
--- a/cookbooks/unbound/metadata.rb
+++ b/cookbooks/unbound/metadata.rb
@@ -1,13 +0,0 @@
-name             'unbound'
-maintainer       'Sous Chefs'
-maintainer_email 'help@sous-chefs.org'
-license          'Apache-2.0'
-description      'Manages unbound DNS resolver'
-version          '3.0.2'
-issues_url       'https://github.com/sous-chefs/unbound/issues'
-source_url       'https://github.com/sous-chefs/unbound'
-chef_version     '>= 16'
-
-%w(debian ubuntu centos redhat scientific oracle amazon).each do |os|
-  supports os
-end
--- a/cookbooks/unbound/recipes/default.rb
+++ b/cookbooks/unbound/recipes/default.rb
@@ -1,25 +0,0 @@
-#
-# Cookbook:: unbound
-# Recipe:: default
-#
-# Copyright:: 2011, Joshua Timberman
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-log 'v3_warning' do
-  message 'Version 3.0.0 of this cookbook removed all configuration actions from the default recipe'
-  level :warn
-end
-
-unbound_package 'unbound'
--- a/cookbooks/unbound/renovate.json
+++ b/cookbooks/unbound/renovate.json
@@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ]
-}
--- a/cookbooks/unbound/resources/config_authority_zone.rb
+++ b/cookbooks/unbound/resources/config_authority_zone.rb
@@ -1,93 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_authority_zone
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-provides :unbound_config_auth_zone
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/authority-zone-#{name}.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :zone_name, String,
-          default: lazy { name }
-
-property :primary, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :master, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :url, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :allow_notify, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :fallback_enabled, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :for_downstream, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :for_upstream, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :zonemd_check, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :zonemd_reject_absence, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :zonefile, String
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    zone_config = {
-      'name' => new_resource.zone_name,
-      'primary' => new_resource.primary.dup,
-      'master' => new_resource.master.dup,
-      'url' => new_resource.url.dup,
-      'allow-notify' => new_resource.allow_notify.dup,
-      'fallback-enabled' => new_resource.fallback_enabled,
-      'for-downstream' => new_resource.for_downstream,
-      'for-upstream' => new_resource.for_upstream,
-      'zonemd-check' => new_resource.zonemd_check,
-      'zonemd-reject-absence' => new_resource.zonemd_reject_absence,
-      'zonefile' => new_resource.zonefile,
-    }.compact
-
-    config = {
-      'auth-zone' => zone_config,
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_cachedb.rb
+++ b/cookbooks/unbound/resources/config_cachedb.rb
@@ -1,67 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_cachedb
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/cachedb.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :backend, String
-
-property :secret_seed, String
-
-property :redis_server_host, String
-
-property :redis_server_port, Integer
-
-property :redis_timeout, Integer
-
-property :redis_expire_records, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    cachedb_config = {
-      'backend' => new_resource.backend,
-      'secret-seed' => new_resource.secret_seed,
-      'redis-server-host' => new_resource.redis_server_host,
-      'redis-server-port' => new_resource.redis_server_port,
-      'redis-timeout' => new_resource.redis_timeout,
-      'redis-expire-records' => new_resource.redis_expire_records,
-    }.compact
-
-    config = {
-      'cachedb' => cachedb_config,
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_dns64.rb
+++ b/cookbooks/unbound/resources/config_dns64.rb
@@ -1,58 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_dns64
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/dns64.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :dns64_prefix, String
-
-property :dns64_synthall, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dns64_ignore_aaaa, String
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    dns64_config = {
-      'dns64-prefix' => new_resource.dns64_prefix,
-      'dns64-synthall' => new_resource.dns64_synthall,
-      'dns64-ignore-aaaa' => new_resource.dns64_ignore_aaaa,
-    }.compact
-
-    config = {
-      'server' => dns64_config,
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_dnscrypt.rb
+++ b/cookbooks/unbound/resources/config_dnscrypt.rb
@@ -1,80 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_dnscrypt
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/dnscrypt.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :dnscrypt_enable, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dnscrypt_port, Integer
-
-property :dnscrypt_provider, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :dnscrypt_secret_key, String
-
-property :dnscrypt_provider_cert, String
-
-property :dnscrypt_provider_cert_rotated, String
-
-property :dnscrypt_shared_secret_cache_size, String
-
-property :dnscrypt_shared_secret_cache_slabs, Integer
-
-property :dnscrypt_nonce_cache_size, String
-
-property :dnscrypt_nonce_cache_slabs, Integer
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    dnscrypt_config = {
-      'dnscrypt-enable' => new_resource.dnscrypt_enable,
-      'dnscrypt-port' => new_resource.dnscrypt_port,
-      'dnscrypt-provider' => new_resource.dnscrypt_provider.dup,
-      'dnscrypt-secret-key' => new_resource.dnscrypt_secret_key,
-      'dnscrypt-provider-cert' => new_resource.dnscrypt_provider_cert,
-      'dnscrypt-provider-cert-rotated' => new_resource.dnscrypt_provider_cert_rotated,
-      'dnscrypt-shared-secret-cache-size' => new_resource.dnscrypt_shared_secret_cache_size,
-      'dnscrypt-shared-secret-cache-slabs' => new_resource.dnscrypt_shared_secret_cache_slabs,
-      'dnscrypt-nonce-cache-size' => new_resource.dnscrypt_nonce_cache_size,
-      'dnscrypt-nonce-cache-slabs' => new_resource.dnscrypt_nonce_cache_slabs,
-    }.compact
-
-    config = {
-      'dnscrypt' => dnscrypt_config,
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_dnstap.rb
+++ b/cookbooks/unbound/resources/config_dnstap.rb
@@ -1,116 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_dnstap
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/dnstap.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :dnstap_enable, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dnstap_bidirectional, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dnstap_socket_path, String
-
-property :dnstap_ip, String
-
-property :dnstap_tls, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dnstap_tls_server_name, String
-
-property :dnstap_tls_cert_bundle, String
-
-property :dnstap_tls_client_key_file, String
-
-property :dnstap_tls_client_cert_file, String
-
-property :dnstap_send_identity, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dnstap_send_version, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dnstap_identity, String
-
-property :dnstap_version, String
-
-property :dnstap_log_resolver_query_messages, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dnstap_log_resolver_response_messages, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dnstap_log_client_query_messages, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dnstap_log_client_response_messages, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dnstap_log_forwarder_query_messages, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :dnstap_log_forwarder_response_messages, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    zone_config = {
-      'dnstap-enable' => new_resource.dnstap_enable,
-      'dnstap-bidirectional' => new_resource.dnstap_bidirectional,
-      'dnstap-socket-path' => new_resource.dnstap_socket_path,
-      'dnstap-ip' => new_resource.dnstap_ip,
-      'dnstap-tls' => new_resource.dnstap_tls,
-      'dnstap-tls-server-name' => new_resource.dnstap_tls_server_name,
-      'dnstap-tls-cert-bundle' => new_resource.dnstap_tls_cert_bundle,
-      'dnstap-tls-client-key-file' => new_resource.dnstap_tls_client_key_file,
-      'dnstap-tls-client-cert-file' => new_resource.dnstap_tls_client_cert_file,
-      'dnstap-send-identity' => new_resource.dnstap_send_identity,
-      'dnstap-send-version' => new_resource.dnstap_send_version,
-      'dnstap-identity' => new_resource.dnstap_identity,
-      'dnstap-version' => new_resource.dnstap_version,
-      'dnstap-log-resolver-query-messages' => new_resource.dnstap_log_resolver_query_messages,
-      'dnstap-log-resolver-response-messages' => new_resource.dnstap_log_resolver_response_messages,
-      'dnstap-log-client-query-messages' => new_resource.dnstap_log_client_query_messages,
-      'dnstap-log-client-response-messages' => new_resource.dnstap_log_client_response_messages,
-      'dnstap-log-forwarder-query-messages' => new_resource.dnstap_log_forwarder_query_messages,
-      'dnstap-log-forwarder-response-messages' => new_resource.dnstap_log_forwarder_response_messages,
-    }.compact
-
-    config = {
-      'dnstap' => zone_config,
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_dynamic_library.rb
+++ b/cookbooks/unbound/resources/config_dynamic_library.rb
@@ -1,48 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_dynamic_library
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/dyn-lib-#{name}.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :dynlib_file, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    config = {
-      'dynlib-file' => new_resource.dynlib_file.dup,
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_forward_zone.rb
+++ b/cookbooks/unbound/resources/config_forward_zone.rb
@@ -1,80 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_forward_zone
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/forward-zone-#{name}.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :zone_name, String,
-          default: lazy { name }
-
-property :forward_host, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :forward_addr, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :forward_first, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :forward_tls_upstream, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :forward_ssl_upstream, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :forward_tcp_upstream, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :forward_no_cache, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    zone_config = {
-      'name' => new_resource.zone_name,
-      'forward-host' => new_resource.forward_host.dup,
-      'forward-addr' => new_resource.forward_addr.dup,
-      'forward-first' => new_resource.forward_first,
-      'forward-tls-upstream' => new_resource.forward_tls_upstream,
-      'forward-ssl-upstream' => new_resource.forward_ssl_upstream,
-      'forward-tcp-upstream' => new_resource.forward_tcp_upstream,
-      'forward-no-cache' => new_resource.forward_no_cache,
-    }.compact
-
-    config = {
-      'forward-zone' => zone_config,
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_python_script.rb
+++ b/cookbooks/unbound/resources/config_python_script.rb
@@ -1,53 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_python_script
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/python-script-#{name}.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :python_script, [String, Array],
-          coerce: proc { |p| Array(p) },
-          required: true
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    declare_resource(:package, 'python3-unbound')
-
-    config = {
-      'python' => {
-        'python-script' => new_resource.python_script.dup,
-      },
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_remote_control.rb
+++ b/cookbooks/unbound/resources/config_remote_control.rb
@@ -1,77 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_remote_control
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/remote-control.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :control_enable, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :control_interface, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :control_port, Integer
-
-property :control_use_cert, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :control_key_file, String
-
-property :control_cert_file, String
-
-property :server, String
-
-property :server_key_file, String
-
-property :server_cert_file, String
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    remote_control = {
-      'control-enable' => new_resource.control_enable,
-      'control-interface' => new_resource.control_interface.dup,
-      'control-port' => new_resource.control_port,
-      'control-use-cert' => new_resource.control_use_cert,
-      'control-key-file' => new_resource.control_key_file,
-      'control-cert-file' => new_resource.control_cert_file,
-      'server-key-file' => new_resource.server_key_file,
-      'server-cert-file' => new_resource.server_cert_file,
-    }.compact
-
-    config = {
-      'remote-control' => remote_control,
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_rpz_zone.rb
+++ b/cookbooks/unbound/resources/config_rpz_zone.rb
@@ -1,98 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_rpz_zone
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/rpz-zone-#{name}.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :zone_name, String,
-          default: lazy { name }
-
-property :primary, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :master, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :url, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :allow_notify, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :zonefile, String
-
-property :rpz_action_override, [String, Symbol],
-          equal_to: %w(nxdomain nodata passthru drop disabled cname),
-          coerce: proc { |p| p.to_s }
-
-property :rpz_cname_override, String
-
-property :rpz_log, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :rpz_log_name, String
-
-property :rpz_signal_nxdomain_ra, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :for_downstream, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :tags, [String, Array],
-          coerce: proc { |p| "\"#{p.to_a.join(' ')} \"" }
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    zone_config = {
-      'name' => new_resource.zone_name,
-      'primary' => new_resource.primary.dup,
-      'master' => new_resource.master.dup,
-      'url' => new_resource.url.dup,
-      'allow-notify' => new_resource.allow_notify.dup,
-      'zonefile' => new_resource.zonefile,
-      'rpz-action-override' => new_resource.rpz_action_override,
-      'rpz-cname-override' => new_resource.rpz_cname_override,
-      'rpz-log' => new_resource.rpz_log,
-      'rpz-log-name' => new_resource.rpz_log_name,
-      'rpz-signal-nxfomain-ra' => new_resource.rpz_signal_nxdomain_ra,
-      'for-downstream' => new_resource.for_downstream,
-      'tags' => new_resource.tags.dup,
-    }.compact
-
-    config = {
-      'rpz' => zone_config,
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_server.rb
+++ b/cookbooks/unbound/resources/config_server.rb
@@ -1,58 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_server
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-provides :unbound_config_server
-provides :unbound_configure
-provides :unbound_config
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/unbound.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :include, [String, Array],
-          default: lazy { default_includes_dir },
-          coerce: proc { |p| Array(p) }
-
-property :server, Hash,
-          default: {},
-          description: 'Server configuration as a Hash'
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    config = {
-      'include' => new_resource.include.dup,
-      'server' => new_resource.server.dup,
-    }.compact
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_stub_zone.rb
+++ b/cookbooks/unbound/resources/config_stub_zone.rb
@@ -1,84 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_stub_zone
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/stub-zone-#{name}.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :zone_name, String,
-          default: lazy { name }
-
-property :stub_host, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :stub_addr, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :stub_prime, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :stub_first, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :stub_tls_upstream, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :stub_ssl_upstream, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :stub_tcp_upstream, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-property :stub_no_cache, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    zone_config = {
-      'name' => new_resource.zone_name,
-      'stub-host' => new_resource.stub_host.dup,
-      'stub-addr' => new_resource.stub_addr.dup,
-      'stub-prime' => new_resource.stub_prime,
-      'stub-first' => new_resource.stub_first,
-      'stub-tls-upstream' => new_resource.stub_tls_upstream,
-      'stub-ssl-upstream' => new_resource.stub_ssl_upstream,
-      'stub-tcp-upstream' => new_resource.stub_tcp_upstream,
-      'stub-no-cache' => new_resource.stub_no_cache,
-    }.compact
-
-    config = {
-      'stub-zone' => zone_config,
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/config_view.rb
+++ b/cookbooks/unbound/resources/config_view.rb
@@ -1,68 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: config_view
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-use 'partials/_config_file'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/view-#{name}.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :zone_name, String,
-          default: lazy { name }
-
-property :local_zone, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :local_data, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :local_data_ptr, [String, Array],
-          coerce: proc { |p| Array(p) }
-
-property :view_first, [String, true, false],
-          coerce: proc { |p| unbound_yes_no?(p) }
-
-load_current_value do |new_resource|
-  current_value_does_not_exist! unless ::File.exist?(new_resource.config_file)
-
-  if ::File.exist?(new_resource.config_file)
-    owner ::Etc.getpwuid(::File.stat(new_resource.config_file).uid).name
-    group ::Etc.getgrgid(::File.stat(new_resource.config_file).gid).name
-    mode ::File.stat(new_resource.config_file).mode.to_s(8)[-4..-1]
-  end
-end
-
-action_class do
-  def do_template_action
-    zone_config = {
-      'name' => new_resource.zone_name,
-      'local-zone' => new_resource.local_zone.dup,
-      'local-data' => new_resource.local_data.dup,
-      'local-data-ptr' => new_resource.local_data_ptr.dup,
-      'view-first' => new_resource.view_first,
-    }.compact
-
-    config = {
-      'view' => zone_config,
-    }
-
-    perform_config_action(config)
-  end
-end
--- a/cookbooks/unbound/resources/package.rb
+++ b/cookbooks/unbound/resources/package.rb
@@ -1,36 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: package
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-provides :unbound_install
-
-property :packages, [String, Array],
-          coerce: proc { |p| p.is_a?(Array) ? p : [ p ] },
-          default: %w(unbound),
-          description: 'Unbound packages to install.'
-
-action_class do
-  def do_package_action(action)
-    package 'unbound' do
-      package_name new_resource.packages
-      action action
-    end
-  end
-end
-
-%i(install upgrade remove).each { |pkg_action| action(pkg_action) { do_package_action(action) } }
--- a/cookbooks/unbound/resources/partials/_config_file.rb
+++ b/cookbooks/unbound/resources/partials/_config_file.rb
@@ -1,122 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: _config_file
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-include Unbound::Cookbook::Helpers
-
-property :owner, String,
-          default: 'root',
-          description: 'Set to override config file owner. Defaults to root.'
-
-property :group, String,
-          default: 'unbound',
-          description: 'Set to override config file group. Defaults to unbound.'
-
-property :mode, String,
-          default: '0640',
-          description: 'Set to override config file mode. Defaults to 0640.'
-
-property :directory_mode, String,
-          default: '0750',
-          description: 'Set to override config directory mode. Defaults to 0750.'
-
-property :config_dir, String,
-          default: lazy { default_config_dir },
-          desired_state: false,
-          description: 'Set to override unbound configuration directory.'
-
-property :config_file, String,
-          default: lazy { "#{config_dir}/#{name}.conf" },
-          desired_state: false,
-          description: 'Set to override unbound configuration file.'
-
-property :cookbook, String,
-          default: 'unbound',
-          desired_state: false,
-          description: 'Template source cookbook for the unbound configuration file.'
-
-property :template, String,
-          default: 'unbound.conf.erb',
-          desired_state: false,
-          description: 'Template source file for the unbound configuration file.'
-
-property :sensitive, [true, false],
-          desired_state: false,
-          description: 'Ensure that sensitive resource data is not output by Chef Infra Client.'
-
-property :sort, [true, false],
-          default: true
-
-property :template_properties, Hash,
-          default: {}
-
-property :extra_options, Hash,
-          default: {}
-
-action_class do
-  def deepsort?
-    return if defined?(DeepSort)
-
-    begin
-      Gem::Specification.find_by_name('deepsort')
-    rescue Gem::MissingSpecError
-      declare_resource(:chef_gem, 'deepsort')
-    end
-
-    require 'deepsort'
-
-    true
-  end
-
-  def perform_config_action(config)
-    directory new_resource.config_dir do
-      owner new_resource.owner
-      group new_resource.group
-      mode new_resource.directory_mode
-
-      recursive true
-
-      action new_resource.action.eql?(:delete) ? :delete : :create
-    end
-
-    config.merge!(new_resource.extra_options.dup) unless new_resource.extra_options.empty?
-
-    if new_resource.sort
-      deepsort?
-      config.deep_sort!
-    end
-
-    template new_resource.config_file do
-      cookbook new_resource.cookbook
-      source new_resource.template
-
-      owner new_resource.owner
-      group new_resource.group
-      mode new_resource.mode
-      sensitive new_resource.sensitive
-
-      helpers(Unbound::Cookbook::TemplateHelpers)
-
-      variables(content: config)
-
-      action new_resource.action
-    end
-  end
-end
-
-%i(create create_if_missing delete).each { |action_type| action(action_type) { do_template_action } }
--- a/cookbooks/unbound/resources/service.rb
+++ b/cookbooks/unbound/resources/service.rb
@@ -1,69 +0,0 @@
-#
-# Cookbook:: unbound
-# Resource:: service
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-unified_mode true
-
-property :service_name, String,
-          default: 'unbound',
-          description: 'The service name to perform actions upon'
-
-property :config_test, [true, false],
-          default: true,
-          description: 'Perform configuration file test before performing service action'
-
-property :config_test_fail_action, Symbol,
-          equal_to: %i(raise log),
-          default: :raise,
-          description: 'Action to perform upon configuration test failure.'
-
-action_class do
-  def perform_config_test
-    cmd = shell_out('/usr/sbin/unbound-checkconf')
-    cmd.error!
-  rescue Mixlib::ShellOut::ShellCommandFailed
-    if new_resource.config_test_fail_action.eql?(:log)
-      Chef::Log.error("Configuration test failed, #{new_resource.service_name} #{action} action aborted!\n\n"\
-                      "Error\n-----\n#{cmd.stderr}")
-    else
-      raise "Configuration test failed, #{new_resource.service_name} #{action} action aborted!\n\n"\
-            "Error\n-----\nAction: #{action}\n#{cmd.stderr}"
-    end
-  end
-
-  def do_service_action(service_action)
-    with_run_context(:root) do
-      if %i(start restart reload).include?(service_action)
-        if new_resource.config_test
-          perform_config_test
-          Chef::Log.info("Configuration test passed, creating #{new_resource.service_name} #{new_resource.declared_type} resource with action #{service_action}")
-        else
-          Chef::Log.info("Configuration test disabled, creating #{new_resource.service_name} #{new_resource.declared_type} resource with action #{service_action}")
-        end
-
-        declare_resource(:service, new_resource.service_name) { delayed_action(service_action) }
-      else
-        declare_resource(:service, new_resource.service_name) { action(service_action) }
-      end
-    end
-  end
-end
-
-%i(start stop restart reload enable disable).each { |action_type| action(action_type) { do_service_action(action_type) } }
-
-action :test do
-  converge_by('Performing configuration test') { perform_config_test }
-end
--- a/cookbooks/unbound/templates/default/partials/_generic_config.erb
+++ b/cookbooks/unbound/templates/default/partials/_generic_config.erb
@@ -1,22 +0,0 @@
-<% unless @content.nil? -%>
-<% @content.each do |key, value| %>
-<% case value %>
-<% when nil %>
-<%= key %>
-<% when String, Numeric %>
-<%= key %><% if @separator %><%= @separator %><% end %> <%= value %>
-<% when Array %>
-<% value.each do |val| %>
-<% if val.is_a?(Hash) %>
-<%= key %><% if @separator %><%= @separator %><% end %>
-<%= template_partial_indent(render('partials/_generic_config.erb', cookbook: 'unbound', variables: { content: val, separator: ':' }), 1, 2) %>
-<% else %>
-<%= key %><% if @separator %><%= @separator %><% end %> <%= val %>
-<% end %>
-<% end %>
-<% when Hash %>
-<%= key %><% if @separator %><%= @separator %><% end %>
-<%= template_partial_indent(render('partials/_generic_config.erb', cookbook: 'unbound', variables: { content: value, separator: ':' }), 1, 2) %>
-<% end %>
-<% end %>
-<% end %>
--- a/cookbooks/unbound/templates/default/unbound.conf.erb
+++ b/cookbooks/unbound/templates/default/unbound.conf.erb
@@ -1,5 +0,0 @@
-#
-# Generated by Chef Infra for <%= node['fqdn'] %>
-# Do NOT modify this file by hand, any changes will be overwritten.
-
-<%= render('partials/_generic_config.erb', cookbook: 'unbound', variables: { content: @content, separator: ':' }) %>
--- a/data_bags/credentials/akkounts.json
+++ b/data_bags/credentials/akkounts.json
@@ -1,93 +1,37 @@
 {
  "id": "akkounts",
-  "rails_master_key": {
-    "encrypted_data": "q/0BtGuFZJQhw+iG4ZmFG12DPaWQDGTb/nCmRoxOnsACkANqMv/zZ39CoNFe\nLPtZiItY\n",
-    "iv": "JV8R0iu6TrqcZRxL\n",
-    "auth_tag": "YxZIhEUnrd3XrwR6f9wO4A==\n",
+  "postgresql_username": {
+    "encrypted_data": "W+Ia820+uYCAED9LRkQ1ZVe//56GRS5u0HrG\n",
+    "iv": "NpuVENC7C5FCjsEz\n",
+    "auth_tag": "KbqVv27nTc4qm7kzRWcjUQ==\n",
    "version": 3,
    "cipher": "aes-256-gcm"
  },
-  "rails_secret_key_base": {
-    "encrypted_data": "JmDQew3+OR6+yJ1xErwXeTn6jw8N2HwTc9yvAVJ3G+7w1s3N7rKDM6+M50ez\n2zP4Lm/eXzH4WTsTZlQcodlyNpi66pvUCGAkNM36rwTN5yvnhqPUmuSQi7AG\nDTBronBwr9ENvwA/gRuugyyhrRB1iuStpzpYKCMhZ2ae9Mrxdux0+ezfSLn4\nuP22uUrEqdQ/BWsW\n",
-    "iv": "U/+YncCk13U6bYMz\n",
-    "auth_tag": "2wPYJ/uVPv4jLKpAW/x6sw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "rails_encryption_primary_key": {
-    "encrypted_data": "u/7z91Og/2eM7PWi2JWYAQMhYX4S5+bMMeVpkFPu778Gqj6Td9pagsWIak/d\nb7AU1zjF\n",
-    "iv": "wYhrJWcuWbY8yo8S\n",
-    "auth_tag": "WEoEdNy6VBvB2d5gb8DTXw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "rails_encryption_key_derivation_salt": {
-    "encrypted_data": "noOwTZuxfhsH94bjOT9rWCKS9rb3wAoXELGrc4nJZeNrb/B9XnOLTuK/wen8\nfmtoym0P\n",
-    "iv": "jiFWs3VXhJdQBNqk\n",
-    "auth_tag": "XDpJFgadYp7LyRqU7SO+Fg==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "postgresql": {
-    "encrypted_data": "Xorg8R8COxE/Swivu8MqZiwstD6rD+8FmgDx70pFscZ/CTb6WQRpyqGSrGZt\nZ7oL9WrqZs+mQgBb30odU+Sgdr6x\n",
-    "iv": "6QWZc3+MY0hBCc/s\n",
-    "auth_tag": "ZM+7OYyx5E9PciNG2OILhg==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "ldap": {
-    "encrypted_data": "mr2Z7hXF1GOn8RmqeZMMdaUcmiVP4ZeKtTX6RYW1cR+FQiUwoITwTPBE9XUx\n2cqZ9Mcd8uJicmf9vd+PfwPtRtoZFwqHQ4LDRFLW64hBZyiEkZWxWW+HzgPr\n",
-    "iv": "k1AkyEplnJ4IZO1Z\n",
-    "auth_tag": "zAOcrPex3VLDfRFq38n7fA==\n",
+  "postgresql_password": {
+    "encrypted_data": "gPzUikJ3vBhjEzor0ie2341VPLRHNIvGvuD+HBwldw==\n",
+    "iv": "Jsnldm8Bx9IzXMNy\n",
+    "auth_tag": "63YXFGVxHn23X+/11qwTSA==\n",
    "version": 3,
    "cipher": "aes-256-gcm"
  },
  "sentry_dsn": {
-    "encrypted_data": "51cAERaRBCRg/sMb5c13EcnJzsz6VEf7jx6X3ooUSzm9wHoEfC5Hs/qakr/D\nqm9x3s3aGURRzyLUIEoe9jCohGguh6ehrXYVrun0B6pghVU=\n",
-    "iv": "hJsiiW6dFQMEQ+2p\n",
-    "auth_tag": "TOIahNrUhhsdQGlzp6UV5g==\n",
+    "encrypted_data": "3aC1Nc+WiJIn+jc4HY4Rb1WAqCqEurbOLXhbah4zSIbVIaNGEKzaoC+IA+qi\nV1jAVxbE0A1w91MrGE6HNa+oMjiTMurYx7JzVBIpCm01rgo=\n",
+    "iv": "SxEbTBYY2Pa5BzAF\n",
+    "auth_tag": "zGkIpM/aeyuNm2F0I3VAcA==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  },
+  "rails_master_key": {
+    "encrypted_data": "cWOeQYNzOjgDNi7ZpkMC/jN7nSPyODYRhA6EIhhihzPxkEDt+/4HGNAhLHGK\nlJiQeRD/\n",
+    "iv": "Svsvx9gsO9OQs9RV\n",
+    "auth_tag": "mXVNNo13F6FddhWnri1yHQ==\n",
    "version": 3,
    "cipher": "aes-256-gcm"
  },
  "discourse_connect_secret": {
-    "encrypted_data": "pvKcwuZgUJsAvClQ4V0BwhwEg09EUEWVxoSx+mFlfG1KpvZE4Cu3u3PalPSD\nldyKsw==\n",
-    "iv": "ED85d6PKyaKB3Wlv\n",
-    "auth_tag": "XVCU/WigC97tNe0bUK6okQ==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "lndhub_admin_token": {
-    "encrypted_data": "LvCgahQblsKOxK9iNbwDd31atBfemVppHqV7s3K/sR4j\n",
-    "iv": "zObzh2jEsqXk2vD2\n",
-    "auth_tag": "n9m/sBYBfzggwQLWrGpR2Q==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "btcpay_auth_token": {
-    "encrypted_data": "M4kGd6+jresm90nWrJG25mX6rfhaU+VlJlIVd/IjOAUsDABryyulJul3GZFh\nFPSI4uEhgIWtn56I0bA=\n",
-    "iv": "hvqHm7A/YfUOJwRJ\n",
-    "auth_tag": "DhtT6IeixD1MSRX+D7JxZA==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "s3_access_key": {
-    "encrypted_data": "FPRpLZoIbLcVWPJhOlX7ZeXGv6TZIWYAD+BKTsJOyOHxDG3eRULqQc89cGWi\n",
-    "iv": "f9WiiGLmDxtygp60\n",
-    "auth_tag": "lGnq4itmByuF/Yp20/6coQ==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "s3_secret_key": {
-    "encrypted_data": "JnnwISbHJ+d7JZB/C0NH0fb8p+bDSwoq5t5knSi+bSTltSxKcq6PRX9K6bov\nEbo0GTdWePbuc5NCsyYxfrkzCtpLXTIxeCROtinRmFIgMFNwaOA=\n",
-    "iv": "pKPCaANDqGtbFV3V\n",
-    "auth_tag": "S//hn2HOhuZH8+UfCNBWDg==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "nostr_private_key": {
-    "encrypted_data": "AKfFiLow+veDyEWBwmCDuLerT3l+o2aJUCeHg2mZZIyoH4oeo/9crZwIdjBn\n70reouqnHNG9mBHuO/+IPGfj53mHLo+oGHh+6LkL3ImI4MFBofY=\n",
-    "iv": "bPlOKk2qkJAzdKf+\n",
-    "auth_tag": "VIp1IOjBGatn2MN5LHVymg==\n",
+    "encrypted_data": "BQcE5fUkiqJyuOR1dR9vNyxWzgWGX1Wl1WINJDGJ1sJiajrgAspPgDt0dX5L\nhxG8CQ==\n",
+    "iv": "UKpt0F1FODuosQ9u\n",
+    "auth_tag": "MLgv0jR9MhWGmQNUkA8GUQ==\n",
    "version": 3,
    "cipher": "aes-256-gcm"
  }
--- a/data_bags/credentials/backup.json
+++ b/data_bags/credentials/backup.json
@@ -1,38 +1,27 @@
 {
  "id": "backup",
  "s3_access_key_id": {
-    "encrypted_data": "245TrPvuoBRRTimhbt6qqsFb+JnnD377sPt1pguJy7Q2BXOy/jrX0wyMt+cP\nuA==\n",
-    "iv": "ylmRxSRO3AA4MSJN\n",
-    "auth_tag": "45tBcYZowPLrbv4Zu2P0Fw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
+    "encrypted_data": "emGNH4v7TTEh05Go/DsI3k7CFnaK4p/4JxodC4BYpyWw47/Z3dsuRMu4vXM3\n3YLH\n",
+    "iv": "Dau+ekb3UTYdl8w3fQKVcA==\n",
+    "version": 1,
+    "cipher": "aes-256-cbc"
  },
  "s3_secret_access_key": {
-    "encrypted_data": "jDIOjlBzTkBUzpj243T6KnBuH0qwyW7BUFMcqllljFSzxs7K8wYJOUreNbOP\ny8OpDWAuO0H4O4LuFMJXeM8=\n",
-    "iv": "PzvZr37EkJqz6JtM\n",
-    "auth_tag": "e3XW8oHVgmYibv/IBzj0yA==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "s3_endpoint": {
-    "encrypted_data": "ErJIEChxrreW7WKEwRtuP2MyYlsZRtqLdGa/x5QY58qgO036FgR3Hs2Z3yce\n",
-    "iv": "HOSAOgUjO7XGwk50\n",
-    "auth_tag": "XE1bwMIXHHE72V9K2KOLnw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
+    "encrypted_data": "Mxyly86JxrWUbubbSiqPdRosChzfI1Q8eBEG4n+2B9JJG4yExltO5Wc5kgSs\nX01MPXAc+PGLm+J9MngUtypo/g==\n",
+    "iv": "WRhBJGiuScYYsUsoT5j/UA==\n",
+    "version": 1,
+    "cipher": "aes-256-cbc"
  },
  "s3_region": {
-    "encrypted_data": "8cNSaYu7HH95ftG66lFdUIPZD7soz907CPA=\n",
-    "iv": "pU21ulF75y/SIs3x\n",
-    "auth_tag": "7WQQCbSbB2GybjY+C+5IvQ==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
+    "encrypted_data": "2ZGxu0tVzKNfx3K1Wleg0SAwGaPkHCi/XfKpJ+J7q40=\n",
+    "iv": "CNTZW2SEIgfw+IyzGI3TzQ==\n",
+    "version": 1,
+    "cipher": "aes-256-cbc"
  },
  "encryption_password": {
-    "encrypted_data": "l23CiIO2s1fIRn0NdoWZ+wK+Zhx3hCYDHf4ypjqMRekZ7xqafvXHHuogD5aj\npxYUKloH\n",
-    "iv": "Dzx83eP9L7Jqqidh\n",
-    "auth_tag": "UVn5XA5Tgsikc1GdOt1MUQ==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
+    "encrypted_data": "tsBWKBwhQFfEAM0EWMPtljSbqU1c5mOJXPjYJjNT5RUFhPlqa7gsE8aJbs+D\nSPKjAQ62j+iHeqCk9mE9CCkgBA==\n",
+    "iv": "uq5YAXuq2ynRLv9EIWoCFA==\n",
+    "version": 1,
+    "cipher": "aes-256-cbc"
  }
 }
--- a/data_bags/credentials/borg.json
+++ b/data_bags/credentials/borg.json
@@ -1,30 +1,23 @@
 {
  "id": "borg",
  "ssh_key": {
-    "encrypted_data": "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\n",
-    "iv": "bhJZlhYQTG/xAvuY\n",
-    "auth_tag": "oqYQGqNaSFqpxfoJi/oOBQ==\n",
+    "encrypted_data": "znPXuD/hMY4+1eihuSx1sB/QKohd92B8/TkZd5g+J+uH1yedbeKosc+q7fJT\njlFy0ebySS5URB1O5ij4/YbulnhcNhYb5/ozf6GnhBl2VlmQD0fdE+NlSlGf\nB6nM+qbvtR9V2sAtaVaugILHy4jD/y1jBnh3VyoKtiLG9WrPe1Q5gwTxEDLi\nn7qpcamZt1D5QB+6kMpVqAmL4oV0oFervfrRcf1QyR0vriwdAMz2+iuQ6/Cq\nyRSDkuaGChrX3W8hd+WkaQaU3ak6A2Ih9iO8MIa9j75FpzCDnBl0A1WLvzeC\ngILDFT0J1eSnDhAZfpOPZxCkaGB6ueop1BwWGhtmDZns1IdKccKRhK56i7BC\nGaJv8nDYxmSq90RYZdhnmbVPCyNrbcj+Pkun+N/us7WE2mYZZTXXy0CE1WMC\n0xglisNS06ODTToD8dmv3wLqeS4yk0Ws9JypWxjUS0NGc9k/uGa5MGIBxJfm\nsi4X0ZaoxMPHmNnOCMMIC0MQE82tBtA3tM2mxd6rohgtdtpo9cxsKWW2Pu3O\nW6Wq/A3d4X/9+LbjQKe48gqCeuZXanJxniBtdm2Z08Yi30/lQRwhauGXP1FT\nyot2FVZLLdTHaDHdcaUjU8A/NJsS+DRPWT8xAk1w1jVPytQMZUrPUYbjPXTu\nhqj24Qyyxb836y23hVCNrrRJg35Mb/mHy8LEbxJ1cxoekAR8d5r+yR5UF72j\nDLg+7fEqzIoSqjFB5Ho2hemTzajxwD2d+FATxQN7C+T1LBenDE/cw0HTKV/H\nnjPvb+bLfhCVb0xdkTlFlnF4WUn32tEQhTGrXefQcSV94Go75MoegIflwNo4\nnOsEOeD9VSwRKqsJ82pjRFaGr7HovakeqE/itruvEKGKn+53Sc9xVRgnyve7\nsQ0vdbVSsH6dBQJYDgSUdNNU9PXbqRqbk3CqFpQAEaxoy6mE9oPK89Mdx9mF\no9B8G291d1GvaOSvJjvlzlWmqUCYhQLR+HTeHf+5gp1dSJRlL3b55m1x7PCC\nB4Ma6XLo9gdF/XXGfZE98vg/MJ5w0JjLYouU/v8BaHNWdrxo5MEoky246LmL\ntLY57TbfGu8HTmvScir43hevIC4JqDHJhUQrz3vmd1yFcUBgWIqEYv6guU8K\nW9cYS+LBwbKDg7uXOx93P5pgPzMZbS0aBPt0QCwIwGmhQTPba+WWh6rPwNkl\nV4HRG0TgFJ8skgKWLhEMOYC02KRT/ve+OJ1LawqIK5BsMK81KoX2Drf7Oyba\nOkekMHsA9T6woSjIBTouKIz8r09vkJe9W/0pN7Y/NtE+y+FuZlKC1peafc3x\nE4ZhNotHtyAydsB6NgxpjkBNxUsVe+DlTyGCzEis/pG2XREUniiqd5DhbPKM\nH9EkXiRrtvrmD792ca8lGfMYTNOcoLD1vRlzFmHCjE7NOKAZ4lEwZWEGnxwp\nIEJFCScdPmDxK0uqMw2DaEjlAVblg1EOcs1xG4JwOcY/aWkuslp2MrmOIh7a\nSUdlr+SBi7faEMIslG24s3noDD4DFU5CQSb0ErH6j02VsUi90QYrm9XCkfEl\n2OcbvC9KICmKEj1mxvTQLBALtyTJGXIOzPbxp/Dw2a9o/WnsWDaXhTcLGqdu\nNn3ghESEb1G+pYHJa7lJ62RSQTpRp19gpdUS8SRhqwUkceFCnuuFST3SmspU\ngpjY8xsRZ3h9fzI/ob1nan5pXnzZCf76X7bGL3DqNlpq1SkdGI5NaN7ko42u\nkPafYy6MiAU6lYvg4G4pobJu8qnGcX9Wuf4K2Jl7niOQTUDIwjyrd+1uI9S2\nn5rLmwhQFxPrT/FuLg3nYAohrnAuMDXFQ13XO0q9smaSZDXPheGdTxT4HRTE\nkN1oAvvmhtVbBqNbKBY09Dn1khiUa3mIineJ6wuKS1buiTDlLGiSPAXhaJRB\naplbJLGjtBXSGiAuxHEb2l/G/kIa71R7Vc7h2fYzAXFbPhApllEof43cZVtM\n9kN1m2bshbAG2boD51jb9P4C9H73ICJXGDAUVvScgYAIs4YnCVFIPdmU6dP+\nd4yZTM9bxuezUI2sj6cpWcq8H9+skZjRY+J2vKH/twAaWcnxLUxKfLuUAWNy\nH63iRIAhaWfl3k6dhPbYFnsxrrch99NuMTAEyE5vykiCMg8WlCmittteGyIq\nfOs9eFaoNRkf4Qh5IrOUoPhXO/8Jw7eY3aK2bQvGuutlfxOYsFJWjK3qT7RQ\nAeyv639jDn1W3vvOlFX5+Xx8R5IZLVdElAe39y6rgw27pMZT+IJew/j5EF2j\nsinxUvARi98wW+NP8WXV5CMFXh2JnmxfTLvdsWHJlB/XyktIiJE4KaHlNIaV\nxLdKmarS3hS31DQmpB2LDGPp8QFyV9kY0gvE282A1Fs0w01pByKDcMmvr3pD\nHh40DfYt4ZTJGnLP69IKt3328KEeMlHqns22zZuAidMus1o6k4YkF1WNpZn2\nSdXVG0hcdnvRC4qKdVv+TBFuPSy68cdwPeHs612hcezoHi2pbTkM2YKDJ75m\nvqaBzdpSDcuKVovuwBt3/guHoLD2ipRM0EfZ208aKiuOuYXwGD3PPm5WKUvd\nBSiZw7p37QY6zYh0/bTN2FumftYWz7mrZL4pFIcd8m/tSlU537+TnCbPm1KT\nWFVFBonxsyhHnZC4X0YQQTZ0V9TKCGWdVUgRxZwwQ/0acxFe1j1bqVnDBxR6\nH98xnEPvEh6bHpHujwcdCKTN4AbIJcFVKuCyvl/OtzMBjUXVKOAZcRS42TvY\nkhzQXiOOKqoE29aNDtQ/VRC8s1aN6L6xCorlCcBBurMcmDdJy+r4YUrNqmEA\nZQwFecRXxwzguk6GR3m8RzY1iDRSqm+yCMqjWKx6eycV91izjXbueT45g3Hn\nSqw2cw6rowGZUEcP3vRdHyxsJSEG2kPvU9JLzgkCwUovtlbdHee2JkV9TdkF\nzEMxjA9B5mxPp5lMFj8jhHhzDmZRxpW/EUBZCkZh5SVbGeg6qTFKRS6zZPYC\nkfv0XICx154cOj0TsW4QHxTHLOV9r93HIPihZDHg2udN7JhYfwsO4RbwDQEv\nxumaM3NTGrXOBxV2vtYSoGSQOmCd8X+gXKxKtTeaV4rCm2aIGVsdfeYQTNSD\nrBxetCJdGB0DrEAr/9bJ5RS2CB9JmEa4ktMHEFTmvTqhWu4Ye2TJBC+H/yqP\nNrYQ4+5lYnZ4BuvxKBvhbH52UURqG27NwQXmFd/h3NlI5GVi5tveRO1+3F1j\ncMTgj49UCB2SNndcJDkK9z7kSBdnmtNo3m3/K9wucw9NxH7sM0yrgeQupbrU\nlgsobzoGluvBijJlp6A7qy4AoOsDGoo4gevK23CR8XN+droGY2RGWThWGuPZ\np7hsG/0f6ICQmU8ARsj/Civ9EbGe/2ZnlHafBtRhmfpZp2/Y7UxX6pmcNARB\nj8Gmr9DWiUXKUBtIkiBSTr7keRF8GuaXSc4pz1phKuAhngy7rYuMhqQr7Sw0\nJCk7cwdvZdq/erjtIh/AHJOPboUCalsLfTdMJguuocUuQr+SEg==\n",
+    "iv": "3uagVTqoXUcWvs9W\n",
+    "auth_tag": "s3wlsnLRHCI2NjC6/ZwbiQ==\n",
    "version": 3,
    "cipher": "aes-256-gcm"
  },
  "passphrase": {
-    "encrypted_data": "5n1l4Mi3ik1RgcF+c71fQbTS1kAOgNaGEcpdKV11uDbzHDVuw21S\n",
-    "iv": "N+AVJrfPxoRJlWOO\n",
-    "auth_tag": "x5Wr3zuJhCXzTIl3gAOA0w==\n",
+    "encrypted_data": "wzSJQ+VfZuXmqrL3xW/LxiUvF/B6EYHAQtmhrJjt2oMT1G2OEgp5\n",
+    "iv": "BqTyfQwKKCTOn3q3\n",
+    "auth_tag": "sh1e8UuQSrq1o5G0O5fXCA==\n",
    "version": 3,
    "cipher": "aes-256-gcm"
  },
  "repository": {
-    "encrypted_data": "Jz0IoAeeeF5lXMTgpkanRqshOxUW0IAJ8tUYFEQckWB13tmsEwNd+val8g+d\nkQ6NQMg8oLRtPbDOi6bTgmTykFrYW5JS5EiD2/ynQQktWA/ZIxnyuoHocX+A\naw==\n",
-    "iv": "BGl1aUBCHzuG61H+\n",
-    "auth_tag": "mlYt/CKamtPZTaESlG/lFA==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "nodes": {
-    "encrypted_data": "v9vXGwyAu2fqj5blo/6Jeht3R7SLlxMSWCuC2nTlURBODz9fled1z/LAoABc\nOaVLXKrgHYUnYgriSF7Q9zemrRnrcsPmqKFVLKqNDIjjyd1LnxwdopG9EGxD\nKNVY3GQI1L511kY+0ahZj6OJ63o0MSccysabSnptWNHCsD2eFh+77oMpYfYy\n3OWWLOT4kzK1lbNDmI8IM6JywLE=\n",
-    "iv": "r4LctfXGF86FNXbZ\n",
-    "auth_tag": "P01f5Vcxz8EyY6BohQWzOA==\n",
+    "encrypted_data": "Ezc5YMp0VM82dlq0+ikk2xZeqNHi+XETlsc2cDlFG/NxY408JO3ErPDEa9d9\nzud+jcCt/01GKqPdslGhP3jsUUb/f3kWMkTWqGkyWXV1121E0uHwyrva62NT\n5A==\n",
+    "iv": "QtNBUjJ5NrQS0JD7\n",
+    "auth_tag": "ZQImzlvHWwX1OsxMZK1jGA==\n",
    "version": 3,
    "cipher": "aes-256-gcm"
  }
--- a/data_bags/credentials/dirsrv.json
+++ b/data_bags/credentials/dirsrv.json
@@ -1,30 +1,9 @@
 {
  "id": "dirsrv",
-  "admin_dn": {
-    "encrypted_data": "zRtz6Scb9WtUXGyjc0xyvsre0YvqupuaFz+RPApj7DEQTmYyZPVb\n",
-    "iv": "xfIXMhEBHBWqa4Dz\n",
-    "auth_tag": "BcA32u1njcnCZ+yrBGSceQ==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
  "admin_password": {
-    "encrypted_data": "7JpXl3JZDqKWDfYt/wuNbkbob+oRuONhkuAlpqUCCEIn+tY=\n",
-    "iv": "Lcwc4NDzrfcBaIKQ\n",
-    "auth_tag": "rrePS3Bhdnwbr2d/o8vMhg==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "service_dn": {
-    "encrypted_data": "sqRFiZreLeTPQljSfhAuV3DmsPxSC8tzWjCdu+WSSbO67sBQA+xhmGtzBhBD\nDZPGJw+jtAxzuVvPdAjxgAVgxXO6C6WEo87L1tdJewE=\n",
-    "iv": "GUEGtyRJXrPhWcUs\n",
-    "auth_tag": "2USsrx//3V7RCyumGCbMkg==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "service_password": {
-    "encrypted_data": "f2wi8B8SEt6p5G0TF3dZ72j0vMFlvwcP1suxYnshBA==\n",
-    "iv": "rOnUoxbnkaJtodM+\n",
-    "auth_tag": "dVLCtBVMjxLfW2D8XjJBdQ==\n",
+    "encrypted_data": "i71l5E129mXCcDAyME8sNMUkYUlQMgt7Eh6noyFcLNgbaMo=\n",
+    "iv": "KNW2B8tpX7ywZwbg\n",
+    "auth_tag": "GawQ+FSlA5v5YVyryeUxng==\n",
    "version": 3,
    "cipher": "aes-256-gcm"
  }
--- a/data_bags/credentials/email.json
+++ b/data_bags/credentials/email.json
@@ -1,17 +0,0 @@
-{
-  "id": "email",
-  "ldap_dn": {
-    "encrypted_data": "jMHHa8DeU4HCieF/ElOxrNJcHLRzjXGGFB1eJubtiARFpMYx+4hG\n",
-    "iv": "ojKHl8Va1GOj1sfr\n",
-    "auth_tag": "wkHLRyFF7WYllh+hXRIBJA==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "ldap_dnpass": {
-    "encrypted_data": "mCyzownpB0Q7BW4k7E+yXIwzSzaChPTEZHAWGiEcnXo2ioQ=\n",
-    "iv": "jc9/VY7AlQ5ttMm8\n",
-    "auth_tag": "mAZuoZOIJ4zRLdYbaetiag==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  }
-}
--- a/data_bags/credentials/gandi_api.json
+++ b/data_bags/credentials/gandi_api.json
@@ -1,24 +0,0 @@
-{
-  "id": "gandi_api",
-  "key": {
-    "encrypted_data": "lU7/xYTmP5Sb6SsK5TNNIyegWozzBtUzpg7oDdl6gcz9FEMmG2ft0Ljh5Q==\n",
-    "iv": "EZPQD3C+wsP/mBhF\n",
-    "auth_tag": "vF9E8Pj4Z8quJJdOMg/QTw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "access_token": {
-    "encrypted_data": "1Uw69JkNrmb8LU/qssuod1SlqxxrWR7TJQZeeivRrNzrMIVTEW/1uwJIYL6b\nM4GeeYl9lIRlMMmLBkc=\n",
-    "iv": "cc1GJKu6Cf4DkIgX\n",
-    "auth_tag": "ERem4S7ozG695kjvWIMghw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "domains": {
-    "encrypted_data": "scZ5blsSjs54DlitR7KZ3enLbyceOR5q0wjHw1golQ==\n",
-    "iv": "oDcHm7shAzW97b4t\n",
-    "auth_tag": "62Zais9yf68SwmZRsmZ3hw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Râu Cao	67244f78e1	Merge branch 'master' into jammy_jellyfish	2023-12-05 14:21:55 +01:00
Râu Cao	ee3b8a3fc1	Merge branch 'master' into jammy_jellyfish	2023-11-04 15:10:50 +01:00
Râu Cao	2571f7e632	Remove default password config again Accidentally added to the previous commit	2023-11-03 18:19:49 +01:00
Râu Cao	21a9ebecd4	Use Ubuntu 22.04 for new VMs Also, remove the custom config image generation and replace it with `--cloud-init` options.	2023-11-03 18:11:31 +01:00
				`@@ -0,0 +1 @@`
				`Please refer to <https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD>`