Configure commit signing for Gitea

refs #237
Merge pull request 'Configure nginx default vhost, add specific redirects for some domains' (#565 ) from chore/nginx_redirects into master
2024-08-09 16:13:58 +02:00 · 2024-08-09 12:44:29 +00:00 · 2024-08-04 16:51:57 +02:00 · 2024-08-04 16:51:18 +02:00 · 2024-08-04 16:49:20 +02:00 · 2024-08-04 14:46:26 +00:00
386 changed files with 12071 additions and 9883 deletions
--- a/.chef/config.rb
+++ b/.chef/config.rb
@@ -26,8 +26,7 @@ knife[:automatic_attribute_whitelist] = %w[
  chef_packages
 ]

-knife[:default_attribute_whitelist] = []
-knife[:normal_attribute_whitelist] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd']
-knife[:override_attribute_whitelist] = []
-
-knife[:allowed_normal_attributes] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd']
+# Added to /etc/chef/client.rb on node bootstrap
+# https://docs.chef.io/attribute_persistence/
+knife[:normal_attribute_allowlist] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty']
+knife[:allowed_normal_attributes] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty']
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,9 @@
 [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/4
+++ b/4
@@ -21,6 +21,7 @@ cookbook 'composer',               '~> 2.7.0'
 cookbook 'fail2ban',               '~> 7.0.4'
 cookbook 'git',                    '~> 10.0.0'
 cookbook 'golang',                 '~> 5.3.1'
+cookbook 'gpg',                    '~> 2.0.13'
 cookbook 'hostname',               '= 0.4.2'
 cookbook 'hostsfile',              '~> 3.0.1'
 cookbook 'java',                   '~> 4.3.0'
@@ -32,11 +33,12 @@ 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 'postfix',                '~> 6.0.26'
 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
@@ -8,6 +8,7 @@ DEPENDENCIES
  firewall (~> 6.2.16)
  git (~> 10.0.0)
  golang (~> 5.3.1)
+  gpg (~> 2.0.13)
  hostname (= 0.4.2)
  hostsfile (~> 3.0.1)
  ipfs
@@ -28,11 +29,12 @@ DEPENDENCIES
  ohai (~> 5.2.5)
  openssl (~> 8.5.5)
  php (~> 8.0.0)
-  postfix (= 5.0.2)
+  postfix (~> 6.0.26)
  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)
@@ -58,6 +60,8 @@ GRAPH
  git (10.0.0)
  golang (5.3.1)
    ark (>= 6.0)
+  gpg (2.0.13)
+    yum-epel (>= 0.0.0)
  homebrew (5.4.1)
  hostname (0.4.2)
    hostsfile (>= 0.0.0)
@@ -89,7 +93,7 @@ GRAPH
  openssl (8.5.5)
  php (8.0.1)
    yum-epel (>= 0.0.0)
-  postfix (5.0.2)
+  postfix (6.0.26)
  redisio (6.4.1)
    selinux (>= 0.0.0)
  ruby_build (2.5.0)
@@ -99,6 +103,7 @@ 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/Gemfile.lock
+++ b/Gemfile.lock
@@ -306,6 +306,7 @@ GEM

 PLATFORMS
  x86_64-darwin-18
+  x86_64-darwin-19
  x86_64-linux

 DEPENDENCIES
--- a/27
+++ b/27
@@ -26,7 +26,7 @@ Vagrant.configure(2) do |config|
    ldap.vm.network "private_network", ip: "192.168.56.5"

    ldap.vm.provision :chef_zero do |chef|
-      chef.version                            = "17.10.0"
+      chef.version                            = "18.2.7"
      chef.node_name                          = "vagrant-node-ldap"
      chef.arguments                          = "--chef-license accept"
      chef.cookbooks_path                     = ["cookbooks", "site-cookbooks"]
@@ -49,7 +49,7 @@ Vagrant.configure(2) do |config|
    # bitcoin.vm.synced_folder "../kredits/yap/", "/opt/yap"

    bitcoin.vm.provision :chef_zero do |chef|
-      chef.version                            = "15.13.8"
+      chef.version                            = "18.2.7"
      chef.node_name                          = "vagrant-node-bitcoin"
      chef.arguments                          = "--chef-license accept"
      chef.cookbooks_path                     = ["cookbooks", "site-cookbooks"]
@@ -66,4 +66,27 @@ Vagrant.configure(2) do |config|
    end
  end

+  config.vm.define "openresty" do |openresty|
+    openresty.vm.box = "bento/ubuntu-20.04"
+    openresty.vm.network "forwarded_port", guest: 6379, host: 6379
+    openresty.vm.network "private_network", ip: "192.168.56.7"
+
+    openresty.vm.provision :chef_zero do |chef|
+      chef.version                            = "18.2.7"
+      chef.node_name                          = "vagrant-openresty"
+      chef.arguments                          = "--chef-license accept"
+      chef.cookbooks_path                     = ["cookbooks", "site-cookbooks"]
+      chef.data_bags_path                     = "data_bags"
+      chef.roles_path                         = "roles"
+      chef.nodes_path                         = "nodes"
+      chef.environments_path                  = "environments"
+      chef.encrypted_data_bag_secret_key_path = ".chef/encrypted_data_bag_secret"
+      chef.environment                        = "development"
+
+      chef.add_recipe "kosmos-base"
+      chef.add_role "openresty"
+      chef.add_role "openresty_proxy"
+    end
+  end
+
 end
--- a/clients/barnard.kosmos.org.json
+++ b/clients/barnard.kosmos.org.json
@@ -1,4 +0,0 @@
-{
-  "name": "barnard.kosmos.org",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5Rr+3giLkr0xqZPRPn9Z\ngxvmAaUo6VSs1qnMfznNNN/CGCYett0ndEJp4wI8xp2fq75b2TSm4jqhqjtgYVVD\nEeSOKTZEnoE7YSssodGTAK5YnrVIPNyWd61Ih/NkHzCjlcuVX6sJD7z/pgK+WMao\nAAxzMrefvHALFBmJIxbugakru/nvDcQeV8DOF+UjzsO5CTC0BUzCFeXBG7HD3W+6\nP2wQlMKteM9uQU6Agx7XegeWS2Lfnxg1em5TNbw1PbLofROwr1pCUPfVzQ0CAVxm\nXLzmA2xtMqCT2j83DU9WleZPYiS0rg+r9T1jsDX0TyH4NTV8gO2SJ9BMUNcX+3Ox\nmQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/centaurus.kosmos.org.json
+++ b/clients/centaurus.kosmos.org.json
@@ -1,4 +0,0 @@
-{
-  "name": "centaurus.kosmos.org",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsVV0j8DQSlefAAAmafjx\nyT1j1idLQF0oltTp2p4jFEsnEdFeP4Plpluy+detra1gM9sBBBuvRKGt8NP+Yoc7\nbnn7qU13E/nWUQh9n15+jjgUirXg7CxluKfj2VvsdchJRIvzDwwZz5sqITiGG7/S\n2r2KBBBnuGlGShQJZhhcLW4P+3YgxW8DUgUsRdvreVuvF1hcnaSymldfos1CqYL8\nawtsZ2rtdZHmZxfguXl91WBCu2OxsT13i3kInnDQsFB0tYKq+TFSLAHxneKTYPRW\ngYgP9RSBZ51iQ+6R1CenYsr4SePVCmwaZGb8bmd0QLvGKlBhjX29a5bE5tjzeoBD\nuwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/discourse-1.json
+++ b/clients/discourse-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "discourse-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxJBhKUtTcmjP8eG4aLNF\n9UfNU9lRIFhfywjFJjtXoYdNaUatZHE3s1HKND0SjJs5BRQbZBEKLxTHCgnPZD4U\nlRgZ65JtHwi+JNM6ac4TQm5JYKA++KxX7FtOiJV6oGX6foNoFVHrGi+fhTlLE9hL\npHRQWTpM8ErpUEj3VHez+k6KT1Mr3QO5T9L5kqu1BdTYwtyfXJE0VfyDKz/rwrvc\ngPvZd167p8YCTu/rWLG9X8tag+ySUR9cmlEn5sCsBLmq56Zurf0VIe/0tuGPI8DP\nAVc4dIXHsfGuKLwBfFPSDy9YbI7F8gbaD05UnUVn60IWPmWsE19K/iIc/OnJZwRO\nkQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/ejabberd-6.json
+++ b/clients/ejabberd-6.json
@@ -1,4 +0,0 @@
-{
-  "name": "ejabberd-6",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqvGOanDqJOhf0xl/TYcs\nqYhhGz4ptFzxmfxiCMWbnbDcICBLHni28dJHhP2ggfUKOGcp+OIqiy783eRUrPsf\nnH9VmvTnz4NdXIB5J45FgBtfYiF9ZseaPL+ufTSCbZj7Ih3lzTAbO5Ug+UOj852B\nnnqH2Ht2jXMp2v3NW4gAG9QyRpr6P5cyVWBrMFExjuhNWg119tJv+33oGnflrNRi\njV3yGbRFRpqAomAVCr6DAA9SX/R8J3yKTky6MdRGrXKH/7eXH0ehDi33Y9Pyy9Ci\nkQX/JRHffuJeBF3Tndiojqdx81C6oIh2s/H3JMew/DdRxjzlPP4nemYWXv1/YVcS\nCwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/ejabberd-7.json
+++ b/clients/ejabberd-7.json
@@ -1,4 +0,0 @@
-{
-  "name": "ejabberd-7",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzHfqcI/6w58gLwDFCKxw\n0TeKFOf4MFBnmUGsWyi8BEskkjh4QEDc4pUFeiVuEADFyBfCnALWh004nKhiwamc\nECybfAKlJryoQQEcYZC6H4rZf3SW7xPLk12X00YySNroYM50PM5Ly/G7MI9a669g\n6HNOgn1MYIEh8unpsAHjfKpx72bNutRYKKvBDaHXNvlJ459Jr8HNpERFk8IeaGcF\n4BKqf/MNxkQHOfy7R4ETXeLUBrgD13SmLbs6mM3lXS6IgkoeFyAvAPP4ZgwgiJ6w\nqIKsX4cRt8xnJJ+MTNBX4oc0f9+Gu8bUpr2JZ8tcwq3GUgDjv+JSJpk/uDzzbQUe\nIwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/email-1.json
+++ b/clients/email-1.json
@@ -0,0 +1,4 @@
+{
+  "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-3.json
+++ b/clients/garage-3.json
@@ -1,4 +0,0 @@
-{
-  "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-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-6.json
+++ b/clients/garage-6.json
@@ -0,0 +1,4 @@
+{
+  "name": "garage-6",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwasYgWLM8ShvirFiKRE6\nGWqc3pMlvcrk4YnWAUW5Y/H26EnyexxWNfnwlEcq8thJ3M3hs7zkoF3Yk4uqX869\n4/niYqXwYgeE1K3gzLp4K1+w3yVupYAFVFStVEHJyuMlLJ+ulDEGvNdQDuIfw7+E\nr6DcDLa1o92Eo0wL1ihYyMilduH0LdFTixL+tEBXbbPWBa3RDJJCFsRF1+UC6hAH\nzmaWL661Gdzdabxjm/FlGUYkdbDqeInZq/1GMQqv+9/DcNRkWA9H7i4Ykrfpx4/2\nRZ8xtx/DbnJVB1zYoORygFMMAkTu5E+R8ropeI7Wi77Yq0S7laiRlYQYQml3x9ak\nzQIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/garage-7.json
+++ b/clients/garage-7.json
@@ -0,0 +1,4 @@
+{
+  "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
@@ -0,0 +1,4 @@
+{
+  "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/gitea-1.json
+++ b/clients/gitea-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "gitea-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0bp4I/f5dLL22GRHanLV\nw57sNBEWT3Vx32B24hScKNP5nYDW0dIRkt1c7SLEpe+diNgyIwk7JlI20Vl+oaVo\njdCpmHSB18yXxQT2Ub6aI8ApwFLECVA6SckekcwxLJc/oGRMB52PonI8opJOVbPa\nF+heZ5NNDiMvn3E8qODdMWSjDiJNSVLJgsCPFHAt32aJgLaXQTqG5lrmltaamscW\njGlFqiBJw/5saCkKBPdPwdX4RcDqvGX1FdE1LVB42cskv8CrnvEVFLBxKXAhAr6s\nNhOhenzLGHpy58tNoUoUw3v4WiPRtcnlNxeSVG5LKkjaK04f2oxeZx3SiSU/1naY\nkwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/her.json
+++ b/clients/her.json
@@ -0,0 +1,4 @@
+{
+  "name": "her",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsuj7OCWX2qz/WbsjMgpi\nI4CM13Pxrj+8Enrl4IorkK6O338rhdtfXmOJt2AuDuj6u12Xtnk0LN2n01hffXNu\nU0Hwy+szavnbjiqC8jw1nyCFwYgdy8lCj3WV4t/gRWFhiHZGkhBKaksAoo8jJqZv\nXi/4ZuRov01HJgT6CJBEfR5TUaRCHM4hz2Y60mmegmUNLTRUNIDy6rg5W8JplMlJ\ny0dJc6uEp8asKhPnEfMz1kXukjnsBLXZmxglqdAQeaZ1I78QvRV3rYh0Ge2ZPF8t\nv2c+mUMbH7e80lJPgp7rwqjKrjLfaYo/1ZqTqr3ArWw3253ttLp8KX1ltX69nIHq\nMwIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/jitsi-meet-1.json
+++ b/clients/jitsi-meet-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "jitsi-meet-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyNMD7N7s+JZM6PLlcrKN\n4jnr0jB5kU+Gr8EHtdpaBDGN5x8BahAkMuXcWfMQj4xIvUhTY4tTvDDYgcJGbrY4\ncmmt/YLX4t/OR6g2JxzIRWDBITTTlX7h5QUg10irjfPsyaU9O7lChDk4M3j5J4c2\nZFlZAar1+CeC5nwcEtNg4nL36I6bxUL5e/rEeeUGCGuqn3tAQ+GXj1G4uJYI18JQ\nhv43nIqbF+oVe5iRy58rXILd+zmbOq87cnF8O2ode44jRwtH4K0+uHTmq+83Q8Ld\n3wBZTnrQEnUDm6IuFuWfYhvNGlXAJrcmoH/wA1B5IAcuF3vhw9JY9axy+GDFszOX\nxwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/mastodon-2.json
+++ b/clients/mastodon-2.json
@@ -1,4 +0,0 @@
-{
-  "name": "mastodon-2",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA27a8h17CCQLP8JY59n+M\nURsrbeVvRi3yIUe1IklOlRSTy0L3Z37rFuSNC3dC9rKl/pHDKtorgeukxbFADXQx\nkta2LNX8gf09jCWsUdga5lWIbfOdtlCLRDG1MVEUSA0f6Sxdqr8RbjM2ch31T6Me\n5Z6DYdggwBujcPHwZC1AugI1wJ0T5XHY9f2MDs/XjNEdw3ThYbAdbl1e09ql6Gtg\nSVCa4RlLg/KICdLJtVOLkX6049/XRxi41I6xvu9tXsqgV3+bs8dYbeGLsTWmpPIv\naAUMcf/A5t4B2DVpnlXDytPqfvZQPD3aBVyfEJRGI1yD6Vi9zL3RyIhDQ/I7PMNI\naQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/nodejs-1.json
+++ b/clients/nodejs-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "nodejs-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9L4BQgLEpQSSbSLwXOab\nfFey5VSk8ynDmj2I9sOpPMIXkXpmbONkyXqZ4CqKrMRtesXAg1F1lIwzE/WJy0wP\n9CRhEgnclHRHE3TVqWt8dC6+u5kx5o48EF8X9UWgV1098c21gcn68NZ7+l/janws\ntLYrgMynikcadaGtAkRszGG0dX+qdeRx9hRzhTNUIG4AYe6bUA6/LfOEPyRyuo3Q\ncaN5fAJSK+RRMWr1d7Mzd8k+l3xXzcUTMUL2To+Zh0Fw2SIEocM4NS1W9nAm4+Cq\nhlQUhsoHDwk7bDsIQtRNfy3bX59PSIVMcWLNkWilLzZW1yRtFGPTJfPlR4Y1XJb5\nuwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/nodejs-2.json
+++ b/clients/nodejs-2.json
@@ -1,4 +0,0 @@
-{
-  "name": "nodejs-2",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuWyrBQXathrKzRO7HbX7\nZXqkeGo7X0q3qckO/Uh4Ht67bFb6iQDRo/gRkaVA0PM++2AhtW7wV2NYXR/3qowc\n1gGtO0zuQq56crcL7k9nVuFJ1IbYDyasEq+5nUKzEUVT0hK1/Vzh12gLFhDkBOX+\nCvISLTTQgEGljwNQLf1kZTraJcdDSN0R2k2jl+idJkeAuK5cjMEJa7Fog8scM2rR\nzGhB8gDRp+iq4HQ+yE3R1yXW9rBfWoConnXiNxholt3e2aAte2V1KnEmVLO/8ceo\nvqIp5xEcDKIAIrSqsmopRFXJ0PjS/nbS0Z2ynxpyh1BV4sqr/y4oOryrnwO+LqBB\nHwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/nodejs-3.json
+++ b/clients/nodejs-3.json
@@ -1,4 +0,0 @@
-{
-  "name": "nodejs-3",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyqP7aGx+S9Mdt6xmaGnJ\nfNWWQsg4BvLiP1qtVt3VRrcXF2cy1bhgfnmqoBqnDk4bGlRoTzF+rSOw284+O2UQ\ntUlsBRos4TOyGfbYHehF12Re6NX51K9LHwaprr3eN5h08wLI8pjVrRJlbce8pHST\nXQ/CZvU+CBg43LE08cXr5kRmhnZrgh70g7zTO8+1E6y74r1LEh77Ar4uaaB5jXw7\n6o9TyfaA1HgyqvfYbH+9KPrJfMX/DeLrYPMI3IG/j3fzDUQQ8o9Pb5B+G1Apl+I+\nsTcgWRei5u06aZHLMMd8MMo4O1yUhbt05kxfVhlDGUDWBdi3cvsMf95t6MNdz/eq\niwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/postgres-2.json
+++ b/clients/postgres-2.json
@@ -1,4 +0,0 @@
-{
-  "name": "postgres-2",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoQmrHoW5X6jpN6cJnafW\nWKz1LpT2DvOFPeRmrlSPOPIUSVPUMZI8ojdxzmri/dzC8C4quCIYaL5ssARhe17L\no16LG3z/wdPENYONBj/oH5GRvmG1/uCgzL5+QQENk3kAWVAUb7EL3EgHNx90b2oC\nDNoHcjuoi3ZkCUXxkX7BESvw1jII4hP+HyoIqGh8TZLIAQ25/mS9aNL3TbcLYp5d\npqoM0Ruc4DHVuZTamN+zBZwNRCBz6uxMmaEBD+piYTEPJOnf7yUT7d2l/QzLftfE\nkSo80KOyrPOFdIPCpqKJyPOJZgg7fSgpR0YC6BH7I/JgIsIwUsQcMS8/ELUC5+Zg\nfwIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/postgres-4.json
+++ b/clients/postgres-4.json
@@ -1,4 +0,0 @@
-{
-  "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
@@ -0,0 +1,4 @@
+{
+  "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/rsk-mainnet-1.json
+++ b/clients/rsk-mainnet-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "rsk-mainnet-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtavs6RQW6af9fWuEuhI1\nQa4Ff7Z1CfZ0fHz152UqUeUKatQ/psKVs5ULWDV/b69fSuNsUzkCny9OwtwyQB/F\n2U+vbv3/3As3z6i3V3q8q4ahCHd7tkMmxMLaWcdkfWbpupWTRkCEX+PSDKS0hdfp\n3EQKVA2FrqR0sSnnT+Q66kZw4/WJrNwtSLcps4D5OubG7xr/uUn3Vyv5qXvS/7kx\nGvMONs55qh64Gtc3FSFPEdVyZXasCMEWwXyadqzf+/qJtEYlK0Uy5E/u7CTsnmcH\n9TEiYVw0/6PomQ2HJfSlZVUUO007OliBHO9bWOwZ6qI5c53pt5KES0dyy6SQ4m+8\nawIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/rsk-mainnet-2.json
+++ b/clients/rsk-mainnet-2.json
@@ -1,4 +0,0 @@
-{
-  "name": "rsk-mainnet-2",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu1cuvB3l7sBKJXqjhTih\nQloXteYOr/cQ24R5xUDnHZpCzM75khBjf9ZIX5fskManQ7MI4oFHAaKF6sCWT9QQ\nnL3ON0rCX8wDwBJpKY3iFisAK7f86GO5qkG2ovwG4wO1x69eKX52w33xGpPLPrmw\nBhFv+KfT56KZ3NCvDIQ6tew9VJ3g2V2zUtlL7xZIcdkgTXB06Ec8gbtoCAD3MVUQ\noxMCn+CK6QIAHGxpLIFEv5Y4hNRJ3+0RSuQikhhFzd7P2swnUgDSxDpbfoShroCC\neDw29sapOkQ+PwiHo2Zy8Qtr5m1ToGIhh8l1f/k2vi0Vf2xWVaTjbaeePEDMy9Fd\nKQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/rsk-mainnet-3.json
+++ b/clients/rsk-mainnet-3.json
@@ -0,0 +1,4 @@
+{
+  "name": "rsk-mainnet-3",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwdrYfy0Spmt8VETCdUgW\nHbxV3uYA3kn2swvOdIjIR29gNO+t6wWv6FHnV/pfefIweIPaNlr9VMoUejUKX809\ngzdsiVWh1T6s4Yzbbt+O8mF3my5RXiSvizda8c6U65vofBSL2WVzE1AW9v7lXRHX\nJ4auKrpgKWkNLU52QLIP9/X5YLUHQtpTnplO31eb+jSD185aN1qoIxugunxnWSgm\n2NgUPlVbNCFrhv0PVv4Ts10eX6smRX3LKyNBtRRXM3GIrQHlAYRohIpy3lt8tKm4\nE/v9qpXQHvqEmX9FH1/Sonea849cWX3LuxUYLT2XFpaNwUxJK56Ef0HsgZESaxL+\n3QIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/rsk-testnet-1.json
+++ b/clients/rsk-testnet-1.json
@@ -1,4 +0,0 @@
-{
-  "name": "rsk-testnet-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0JU46rCyLGOi5OdeeE2M\nobUUxO+Jqd9t9bP75Pyj0uH8WaxNv1PIdWZJiR+fcE+draBV86/YLxHzOFvsnMi+\nE/qgeXLKErGtTSb12mWq0gYv/wz9uqRbtcsv40gpu2BtNv9ycdXYACB/s0ipnuUO\nX/os4YHDvWV1cshwzgsQ87ad7OdT/Nldggtp4go60TkBi49VaftiJzYqVm1ey3xz\nd7+EsQWqhQHAac6POEuPjwNuM2valf/8+nI4Uday/CiFrDDV1SffRG30sd4rJF15\nh1S1Kxyetr72EmQwIGbJuDJL7eUU7blXjg6UtTxDDsl6rYUO5s/j7wZLoFhmC854\npQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/rsk-testnet-2.json
+++ b/clients/rsk-testnet-2.json
@@ -1,4 +0,0 @@
-{
-  "name": "rsk-testnet-2",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzG2bgL0n5Q7bTR4WYHOB\nZNOuRem/jjarU/bL0VKKn0JqD3PPDAnhq9gRn7H8SwyGoVFN60YGzu45O4c+SqN3\nCXN+FeFabigH2tKLxBz3kNDYTT/F1ErLLi/6ydrCV3tpddR5KTqLSOntojG8KNzc\nyG4rMV9ebCE1wDVxAFdEA+YDZS8YjP0nO5sLWFacA0ZTx27t5ugqZP1acjSvKzWs\nZ+ekX5Pbws/oUHyaqEEPdz7er4MTBm0bdkCHZbM7132oBcH/huJZhmTXFEdoy4ML\nhP4MWWSvwo66HDYjnaID82a8W1RJZZu2irbPHrfVlaFAh8VQk1T1kkUu0bMovT3V\nYQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/rsk-testnet-3.json
+++ b/clients/rsk-testnet-3.json
@@ -1,4 +0,0 @@
-{
-  "name": "rsk-testnet-3",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxbo3GccgPZp8UWhb9l2w\n+o6Qe5s4Tf/1TMOw3ppLw+IGCZhq9LEe8s8kngbBX7dMywbyDuf8vLXwvAHFKvC+\nx4XOXq0r9xDX8ujTCfqJxiSYk1KTyqM4lmi7qno7F9/Nwo7h3HuVbpkT752ojf+/\nDCSXwHL+uHlF6z3jKZ8iYBRHFrWmudh8bOm6lVsp/Iv4pQ/btZf8W5zULlk/Z6lT\nb6GS538Lnaoeu7wPCf/awL5GBg9findY3oS1lsEE+PfAu6SAHmbJcItMkrON7Esd\ng9xtwsjX1VICpJhOSkVS1nmRfYohELVJMdiKSLq+b5UskscbCjkRGY6GAPH8cVGg\nSQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
--- a/clients/rsk-testnet-4.json
+++ b/clients/rsk-testnet-4.json
@@ -0,0 +1,4 @@
+{
+  "name": "rsk-testnet-4",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1NgmlPomxGRtu5oyro+m\ndQwBXwrhEuE73aLrUsqGOVSezph6LnETiEMFUIe1weoG+xdcykcUUMt7o1+nKs+E\nl8dxMIgbXAxdpI4n8gOpii70Sh30BDbh8+qZHsKBq32UmkCpz2ViVe/Vb3ViqB3e\n0GIkknPle5G4IC612O8EUkCenwcD1jSXYyug5zWI2T/TwnTuw4JdxfhkMgBM7Y2n\nR1YY6GwAMkK97wE/yBM74+Tiv/6lDy/JDbYmUVcQ55C937oodSWLAEM24EcOOtMA\nKfGumnthbdHzmHjONmLIegD3OJGYC2ulcB9qmaL/7cyIRhf6fEQrBolCH5881fxl\nxwIDAQAB\n-----END PUBLIC KEY-----\n"
+}
--- a/clients/rsk-testnet-5.json
+++ b/clients/rsk-testnet-5.json
@@ -0,0 +1,4 @@
+{
+  "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
@@ -0,0 +1,4 @@
+{
+  "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/gpg/.markdownlint-cli2.yaml
+++ b/cookbooks/gpg/.markdownlint-cli2.yaml
@@ -0,0 +1,5 @@
+config:
+  ul-indent: false # MD007
+  line-length: false # MD013
+  no-duplicate-heading: false # MD024
+  reference-links-images: false # MD052
--- a/cookbooks/gpg/CHANGELOG.md
+++ b/cookbooks/gpg/CHANGELOG.md
@@ -0,0 +1,89 @@
+# gpg Cookbook CHANGELOG
+
+This file is used to list changes made in each version of the gpg cookbook.
+
+## 2.0.13 - *2024-05-02*
+
+## 2.0.12 - *2024-05-02*
+
+## 2.0.11 - *2023-09-28*
+
+## 2.0.10 - *2023-09-04*
+
+## 2.0.9 - *2023-07-10*
+
+## 2.0.8 - *2023-05-16*
+
+- Fix markdown formatting in the changelog
+- Standardise files with files in sous-chefs/repo-management
+
+## 2.0.7 - *2023-05-16*
+
+- Standardise files with files in sous-chefs/repo-management
+
+## 2.0.6 - *2023-05-03*
+
+- Standardise files with files in sous-chefs/repo-management
+
+## 2.0.5 - *2023-04-01*
+
+- Standardise files with files in sous-chefs/repo-management
+
+## 2.0.4 - *2023-03-02*
+
+- Standardise files with files in sous-chefs/repo-management
+
+## 2.0.3 - *2023-02-14*
+
+- Remove delivery folder
+
+## 2.0.2 - *2021-08-31*
+
+- Standardise files with files in sous-chefs/repo-management
+
+## 2.0.1 - *2021-06-01*
+
+- Standardise files with files in sous-chefs/repo-management
+
+## 2.0.0 - *2021-05-07*
+
+- Update tested platforms
+- Set minimum Chef version to 15.3 for unified_mode support
+
+## 1.3.0 - *2020-12-14*
+
+- Added support for SUSE and OpenSUSE
+
+## 1.2.0 (2020-08-26)
+
+- Comment out enforce_idempotency in kitchen.dokken.yml so tests work
+- Update/Remove the platforms we test against
+- Fix support for pinentry_mode on Ubuntu 16.04
+
+## 1.1.0 (2020-05-14)
+
+- resolved cookstyle error: resources/install.rb:1:36 convention: `Layout/TrailingWhitespace`
+- resolved cookstyle error: resources/install.rb:1:37 refactor: `ChefModernize/FoodcriticComments`
+
+## 1.0.1 (2020-01-26)
+
+- Use Github Actions for testing
+- Fix Ubuntu platform checks in the `gpg_key` resource
+- Use true/false in the resource to simplify the types
+
+## 1.0.0 (2019-01-26)
+
+- Adds two new resources `gpg_install` and `gpg_key`
+- Use CircleCI for testing
+
+## 0.3.0 (2018-05-08)
+
+- Sous Chefs will now be maintaining this cookbook. For more information on Sous Chefs see <http://sous-chefs.org/>
+- This cookbook now requires Chef 12 or later
+- Added a chefignore file
+- Added local testing with delivery local mode
+- Added Code of conduct, testing, contributing, license, and changelog files
+- Added `chef_version`, `source_url`, and `issues_url` to the metadata
+- Added ubuntu/debian to the metadata as supported platforms
+- Updated the kitchen config to use Vagrant on common platforms
+- Resolved all cookstyle / foodcritic warnings
--- a/cookbooks/gpg/LICENSE
+++ b/cookbooks/gpg/LICENSE
@@ -0,0 +1,202 @@
+                                 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/gpg/README.md
+++ b/cookbooks/gpg/README.md
@@ -0,0 +1,63 @@
+# GPG cookbook
+
+[![Cookbook Version](https://img.shields.io/cookbook/v/gpg.svg)](https://supermarket.chef.io/cookbooks/gpg)
+[![Build Status](https://img.shields.io/circleci/project/github/sous-chefs/gpg/master.svg)](https://circleci.com/gh/sous-chefs/gpg)
+[![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 configures GPG on a system
+
+## 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).
+
+## Custom resources
+
+This cookboks uses custom resources to control GPG2.
+
+Install GPG2 and haveged
+
+```ruby
+gpg_install
+```
+
+Generate a GPG key for a user
+
+```ruby
+gpg_key 'foo' do
+  user 'foo'
+  passphrase 'this-is-not-secure'
+end
+```
+
+For further detail please see the documentation for each resource, or the test cookbook for example usage.
+
+- [gpg_install](https://github.com/sous-chefs/gpg/blob/master/documentation/resource/install.md)
+- [gpg_key](https://github.com/sous-chefs/gpg/blob/master/documentation/resource/key.md)
+- [Test Cookbook](https://github.com/sous-chefs/gpg/blob/master/test/fixtures/cookbooks/test/recipes)
+
+## 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/gpg/chefignore
+++ b/cookbooks/gpg/chefignore
@@ -0,0 +1,115 @@
+# 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/gpg/libraries/helpers.rb
+++ b/cookbooks/gpg/libraries/helpers.rb
@@ -0,0 +1,43 @@
+module Gpg
+  module Helpers
+    include Chef::Mixin::ShellOut
+
+    def key_exists(new_resource)
+      gpg_check = gpg_cmd
+      gpg_check << gpg_opts if new_resource.override_default_keyring
+      gpg_check << "--list-keys | grep '#{new_resource.name_real}'"
+
+      cmd = Mixlib::ShellOut.new(
+        gpg_check,
+        user: new_resource.user,
+        group: new_resource.group
+      )
+
+      cmd.run_command
+
+      cmd.exitstatus == 0
+    end
+
+    def gpg_opts(new_resource)
+      if new_resource.override_default_keyring
+        "--no-default-keyring --secret-keyring #{new_resource.secring_file} --keyring #{new_resource.pubring_file}"
+      else
+        false
+      end
+    end
+
+    def gpg_cmd
+      "gpg2 --homedir #{new_resource.home_dir} "
+    end
+
+    def gpg2_packages
+      packages = %w(haveged)
+      if platform_family?('suse')
+        packages.push('gpg2')
+      else
+        packages.push('gnupg2')
+      end
+      packages
+    end
+  end
+end
--- a/cookbooks/gpg/metadata.json
+++ b/cookbooks/gpg/metadata.json
@@ -0,0 +1,43 @@
+{
+  "name": "gpg",
+  "description": "Installs/Configures gpg",
+  "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",
+    "oracle": ">= 0.0.0",
+    "amazon": ">= 0.0.0",
+    "opensuse": ">= 0.0.0",
+    "suse": ">= 0.0.0"
+  },
+  "dependencies": {
+    "yum-epel": ">= 0.0.0"
+  },
+  "providing": {
+
+  },
+  "recipes": {
+
+  },
+  "version": "2.0.13",
+  "source_url": "https://github.com/sous-chefs/gpg",
+  "issues_url": "https://github.com/sous-chefs/gpg/issues",
+  "privacy": false,
+  "chef_versions": [
+    [
+      ">= 15.3"
+    ]
+  ],
+  "ohai_versions": [
+
+  ],
+  "gems": [
+
+  ],
+  "eager_load_libraries": true
+}
--- a/cookbooks/gpg/metadata.rb
+++ b/cookbooks/gpg/metadata.rb
@@ -0,0 +1,20 @@
+name             'gpg'
+maintainer       'Sous Chefs'
+maintainer_email 'help@sous-chefs.org'
+license          'Apache-2.0'
+description      'Installs/Configures gpg'
+source_url       'https://github.com/sous-chefs/gpg'
+issues_url       'https://github.com/sous-chefs/gpg/issues'
+version          '2.0.13'
+chef_version     '>= 15.3'
+
+depends 'yum-epel'
+
+supports 'debian'
+supports 'ubuntu'
+supports 'centos'
+supports 'redhat'
+supports 'oracle'
+supports 'amazon'
+supports 'opensuse'
+supports 'suse'
--- a/cookbooks/gpg/renovate.json
+++ b/cookbooks/gpg/renovate.json
@@ -0,0 +1,18 @@
+{
+  "$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/gpg/resources/install.rb
+++ b/cookbooks/gpg/resources/install.rb
@@ -0,0 +1,18 @@
+unified_mode true
+
+property :name, String, default: ''
+
+action :install do
+  include_recipe 'yum-epel' if platform_family?('rhel', 'amazon')
+
+  package gpg2_packages
+
+  service 'haveged' do
+    supports [:status, :restart]
+    action :start
+  end
+end
+
+action_class do
+  include Gpg::Helpers
+end
--- a/cookbooks/gpg/resources/key.rb
+++ b/cookbooks/gpg/resources/key.rb
@@ -0,0 +1,166 @@
+unified_mode true
+
+property :batch_name, String,
+         name_property: true,
+         description: 'Name of  the key/batch to generate.'
+
+property :override_default_keyring, [true, false],
+         default: false,
+         description: 'Set to true if you want to override the pubring_file and secring_file locations.'
+
+property :pubring_file, String,
+         description: 'Public keyring file location (override_default_keyring must be set to true or this option will be ignored)'
+
+property :secring_file, String,
+         description: 'Secret keyring file location (override_default_keyring must be set to true or this option will be ignored)'
+
+property :user, String,
+         default: 'root',
+         description: 'User to generate the key for'
+
+property :group, String,
+         default: lazy { user },
+         description: 'Group to run the generate command as'
+
+property :key_type, String,
+         default: '1', equal_to: %w(RSA 1 DSA 17 ),
+         description: 'Corresponds to GPG option: Key-Type (RSA or DSA)'
+
+property :key_length, String,
+         default: '2048', equal_to: %w( 2048 4096 ),
+         description: 'Corresponds to GPG option: Key-Length (2048 or 4096)'
+
+property :name_real, String,
+         default: lazy { "Chef Generated Default (#{batch_name})" },
+         description: 'Corresponds to GPG option: Name-Real'
+
+property :name_comment, String,
+         default: 'generated by Chef',
+         description: 'Corresponds to GPG option: Name-Comment'
+
+property :name_email, String,
+         default: lazy { "#{node.name}@example.com" },
+         description: 'Corresponds to GPG option: Name-Email'
+
+property :expire_date, String,
+         default: '0',
+         description: 'Corresponds to GPG option: Expire-Date. Defaults to 0 (no expiry)'
+
+property :home_dir, String,
+         default: lazy { ::File.expand_path("~#{user}/.gnupg") },
+         description: 'Location to store the keyring. Defaults to ~/.gnupg'
+
+property :batch_config_file, String,
+         default: lazy { ::File.join(home_dir, "gpg_batch_config_#{batch_name}") },
+         description: 'Batch config file name'
+
+property :passphrase, String,
+         sensitive: true,
+         description: 'Passphrase for key'
+
+property :key_file, String,
+         description: 'Keyfile name'
+
+property :key_fingerprint, String,
+         description: 'Key finger print. Used to identify when deleting keys using the :delete action'
+
+# Only Ubuntu > 16.04 supports the pinetree_mode. And requires it
+property :pinentry_mode, [String, FalseClass],
+         default: platform?('ubuntu') && node['platform_version'].to_f > 16.04 ? 'loopback' : false,
+         description: 'Pinentry mode. Set to loopback on Ubuntu and False (off) for all other platforms.'
+
+property :batch, [true, false],
+         default: true,
+         description: 'Turn batch mode on or off when genrating keys'
+
+action :generate do
+  unless key_exists(new_resource)
+
+    config_dir = ::File.dirname(new_resource.batch_config_file)
+
+    directory config_dir do
+      owner new_resource.user
+      mode '0700'
+      recursive true
+      not_if { ::Dir.exist?(config_dir) }
+    end
+
+    file new_resource.batch_config_file do
+      content <<~EOS
+        Key-Type: #{new_resource.key_type}
+        Key-Length: #{new_resource.key_length}
+        Name-Real: #{new_resource.name_real}
+        Name-Comment: #{new_resource.name_comment}
+        Name-Email: #{new_resource.name_email}
+        Expire-Date: #{new_resource.expire_date}
+      EOS
+
+      if new_resource.override_default_keyring
+        content << "%pubring #{new_resource.pubring_file}\n"
+        content << "%secring #{new_resource.secring_file}\n"
+      end
+
+      content << "Passphrase: #{new_resource.passphrase}" if new_resource.passphrase
+      content << "%commit\n"
+      mode '0600'
+      owner new_resource.user
+      sensitive true
+    end
+
+    cmd = gpg_cmd
+    cmd << gpg_opts(new_resource) if new_resource.override_default_keyring
+    cmd << " --passphrase #{new_resource.passphrase}"
+    cmd << ' --yes'
+    cmd << ' --batch' if new_resource.batch
+    cmd << ' --pinentry-mode loopback' if new_resource.pinentry_mode
+    cmd << " --gen-key #{new_resource.batch_config_file}"
+
+    execute 'gpg2: generate' do
+      command cmd
+      live_stream true
+      user new_resource.user
+      group new_resource.group
+    end
+
+  end
+end
+
+action :import do
+  execute 'gpg2: import key' do
+    command "#{gpg_cmd} --import #{new_resource.key_file}"
+    user new_resource.user
+    group new_resource.group
+    not_if { key_exists(new_resource) }
+  end
+end
+
+action :export do
+  execute 'gpg2: export key' do
+    command "#{gpg_cmd} --export -a \"#{new_resource.name_real}\" > #{new_resource.key_file}"
+    user new_resource.user
+    group new_resource.group
+    not_if { ::File.exist?(new_resource.key_file) }
+  end
+end
+
+action :delete_public_key do
+  execute 'gpg2: delete key' do
+    command "#{gpg_cmd} --batch --yes --delete-key \"#{new_resource.key_fingerprint}\""
+    user new_resource.user
+    group new_resource.group
+    only_if { key_exists(new_resource) }
+  end
+end
+
+action :delete_secret_keys do
+  execute 'gpg2: delete key' do
+    command "#{gpg_cmd} --batch --yes --delete-secret-keys \"#{new_resource.key_fingerprint}\""
+    user new_resource.user
+    group new_resource.group
+    only_if { key_exists(new_resource) }
+  end
+end
+
+action_class do
+  include Gpg::Helpers
+end
--- a/cookbooks/jemalloc/.kitchen.yml
+++ b/cookbooks/jemalloc/.kitchen.yml
@@ -0,0 +1,51 @@
+---
+driver:
+  name: docker
+
+provisioner:
+  name: chef_solo
+  log_level: info
+
+platforms:
+  - name: ubuntu-16.04-chef-12
+    provisioner:
+      product_name: chef
+      install_strategy: once
+      product_version: 12
+      hostname: chef-12-ubuntu.local
+      run_options:
+        e:
+          - LANGUAGE=en_US.UTF-8
+          - LC_ALL=en_US.UTF-8
+  - name: ubuntu-16.04-chef-latest
+    provisioner:
+      product_name: chef
+      install_strategy: once
+      product_version: latest
+      hostname: chef-latest-ubuntu.local
+      run_options:
+        e:
+          - LANGUAGE=en_US.UTF-8
+          - LC_ALL=en_US.UTF-8
+  - name: centos-7.5-chef-latest
+    driver_config:
+      image: centos/systemd
+      run_command: /usr/sbin/init
+      privileged: true
+      provision_command:
+        - sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
+        - systemctl enable sshd.service
+    provisioner:
+      product_name: chef
+      install_strategy: once
+      product_version: latest
+      hostname: chef-latest-centos.local
+      run_options:
+        e:
+          - LANGUAGE=en_US.UTF-8
+          - LC_ALL=en_US.UTF-8
+
+suites:
+  - name: default
+    run_list:
+      - recipe[jemalloc::default]
--- a/cookbooks/jemalloc/Gemfile
+++ b/cookbooks/jemalloc/Gemfile
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'berkshelf', '~> 6.3'
+gem 'test-kitchen', '~> 1.23'
+gem 'kitchen-docker', '~> 2.7'
--- a/cookbooks/jemalloc/LICENSE
+++ b/cookbooks/jemalloc/LICENSE
@@ -0,0 +1,13 @@
+Copyright (C) 2013 Panagiotis Papadomitsos
+
+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/jemalloc/README.md
+++ b/cookbooks/jemalloc/README.md
@@ -0,0 +1,77 @@
+# jemalloc Chef Cookbook
+
+![Tag Version](https://img.shields.io/github/tag/priestjim/chef-jemalloc.svg) [![Cookbook Version](https://img.shields.io/cookbook/v/jemalloc.svg)](https://supermarket.chef.io/cookbooks/jemalloc) [![Build Status](https://travis-ci.org/priestjim/chef-jemalloc.svg?branch=master)](https://travis-ci.org/priestjim/chef-jemalloc) [![GitHub issues](https://img.shields.io/github/issues/priestjim/chef-jemalloc.svg)](https://github.com/priestjim/chef-jemalloc/issues) [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/priestjim/chef-jemalloc/master/LICENSE)
+
+This simple recipe configures, compiles and installs the memory allocation
+library `jemalloc` via source. jemalloc shines on high-request manycore
+threaded applications and is a cheap upgrade if your workloads happen to fall
+into this category.
+
+## Requirements
+
+### Platform
+
+The following platforms are supported and tested using kitchen:
+
+* Ubuntu 12.04, 12.10
+* CentOS 7
+
+Other Debian and RHEL family distributions are assumed to work.
+
+### Chef Server
+
+The cookbook converges best on Chef installations >= 10.16.2
+
+## Attributes
+
+The following attributes are available on this cookbook:
+
+* `node['jemalloc']['url']` and `node['jemalloc']['version']` - The version and URL that
+  the library will be downloaded from
+* `node['jemalloc']['checksum']` - The SHA-256 checksum of the above file
+
+In addition, the following configuration flags are available as switches
+
+* `node['jemalloc']['configure']['lazy_lock']` - Enables lazy locking (locking on multi-threaded applications only)
+* `node['jemalloc']['configure']['xmalloc']` - Enables the `xmalloc` feature of jemalloc
+* `node['jemalloc']['configure']['dss']` - Enables `sbrk` along `mmap` for memory allocations
+* `node['jemalloc']['configure']['mremap']` - Enables the `mremap` feature of jemalloc
+* `node['jemalloc']['configure']['stats']` - Enables the statistics gathering features of jemalloc
+* `node['jemalloc']['configure']['profiling']` - Enables the code profiling features of jemalloc
+* `node['jemalloc']['configure']['valgrind']` - Enables valgrind support in jemalloc
+
+Recipes
+=======
+
+## default.rb
+
+The default recipe downloads, compiles and installs the selected version of
+jemalloc.
+
+Usage
+=====
+
+Include the recipe on your node or role. Modify the
+attributes as required in your role to change how various
+configuration is applied per the attributes section above. In general,
+override attributes in the role should be used when changing
+attributes.
+
+License and Author
+==================
+
+- Author:: Panagiotis Papadomitsos (<pj@ezgr.net>)
+
+Copyright 2013, Panagiotis Papadomitsos
+
+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/jemalloc/Thorfile
+++ b/cookbooks/jemalloc/Thorfile
@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+require 'bundler'
+require 'bundler/setup'
+require 'berkshelf/thor'
--- a/cookbooks/jemalloc/VERSION
+++ b/cookbooks/jemalloc/VERSION
@@ -0,0 +1 @@
+0.1.7
--- a/cookbooks/jemalloc/attributes/default.rb
+++ b/cookbooks/jemalloc/attributes/default.rb
@@ -0,0 +1,33 @@
+#
+# Cookbook Name:: jemalloc
+# Attribute:: default
+#
+# Copyright (C) 2013 Panagiotis Papadomitsos
+#
+# 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.
+#
+
+default['jemalloc']['version']                = '5.1.0'
+default['jemalloc']['url']                    = "https://github.com/jemalloc/jemalloc/releases/download/#{node['jemalloc']['version']}/jemalloc-#{node['jemalloc']['version']}.tar.bz2"
+default['jemalloc']['checksum']               = '5396e61cc6103ac393136c309fae09e44d74743c86f90e266948c50f3dbb7268'
+
+# Configure options
+default['jemalloc']['configure']['munmap']    = true
+default['jemalloc']['configure']['lazy_lock'] = true
+default['jemalloc']['configure']['xmalloc']   = false
+default['jemalloc']['configure']['dss']       = false
+default['jemalloc']['configure']['mremap']    = false
+
+default['jemalloc']['configure']['stats']     = false
+default['jemalloc']['configure']['profiling'] = false
+default['jemalloc']['configure']['valgrind']  = false
--- a/cookbooks/jemalloc/chefignore
+++ b/cookbooks/jemalloc/chefignore
@@ -0,0 +1,96 @@
+# Put files/directories that should be ignored in this file when uploading
+# or sharing to the community site.
+# Lines that start with '# ' are comments.
+
+# OS generated files #
+######################
+.DS_Store
+Icon?
+nohup.out
+ehthumbs.db
+Thumbs.db
+
+# SASS #
+########
+.sass-cache
+
+# EDITORS #
+###########
+\#*
+.#*
+*~
+*.sw[a-z]
+*.bak
+REVISION
+TAGS*
+tmtags
+*_flymake.*
+*_flymake
+*.tmproj
+.project
+.settings
+mkmf.log
+
+## COMPILED ##
+##############
+a.out
+*.o
+*.pyc
+*.so
+*.com
+*.class
+*.dll
+*.exe
+*/rdoc/
+
+# Testing #
+###########
+.watchr
+.rspec
+spec/*
+spec/fixtures/*
+test/*
+features/*
+Guardfile
+Procfile
+
+# SCM #
+#######
+.git
+*/.git
+.gitignore
+.gitmodules
+.gitconfig
+.gitattributes
+.svn
+*/.bzr/*
+*/.hg/*
+*/.svn/*
+
+# Berkshelf #
+#############
+Berksfile
+Berksfile.lock
+cookbooks/*
+tmp
+
+# Cookbooks #
+#############
+CONTRIBUTING
+CHANGELOG*
+
+# Strainer #
+############
+Colanderfile
+Strainerfile
+.colander
+.strainer
+
+# Vagrant #
+###########
+.vagrant
+Vagrantfile
+
+# Travis #
+##########
+.travis.yml
--- a/cookbooks/jemalloc/metadata.json
+++ b/cookbooks/jemalloc/metadata.json
@@ -0,0 +1,55 @@
+{
+  "name": "jemalloc",
+  "description": "Installs and configures the jemalloc library",
+  "long_description": "# jemalloc Chef Cookbook\n\n![Tag Version](https://img.shields.io/github/tag/priestjim/chef-jemalloc.svg) [![Cookbook Version](https://img.shields.io/cookbook/v/jemalloc.svg)](https://supermarket.chef.io/cookbooks/jemalloc) [![Build Status](https://travis-ci.org/priestjim/chef-jemalloc.svg?branch=master)](https://travis-ci.org/priestjim/chef-jemalloc) [![GitHub issues](https://img.shields.io/github/issues/priestjim/chef-jemalloc.svg)](https://github.com/priestjim/chef-jemalloc/issues) [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/priestjim/chef-jemalloc/master/LICENSE)\n\nThis simple recipe configures, compiles and installs the memory allocation\nlibrary `jemalloc` via source. jemalloc shines on high-request manycore\nthreaded applications and is a cheap upgrade if your workloads happen to fall\ninto this category.\n\n## Requirements\n\n### Platform\n\nThe following platforms are supported and tested using kitchen:\n\n* Ubuntu 12.04, 12.10\n* CentOS 7\n\nOther Debian and RHEL family distributions are assumed to work.\n\n### Chef Server\n\nThe cookbook converges best on Chef installations >= 10.16.2\n\n## Attributes\n\nThe following attributes are available on this cookbook:\n\n* `node['jemalloc']['url']` and `node['jemalloc']['version']` - The version and URL that\n  the library will be downloaded from\n* `node['jemalloc']['checksum']` - The SHA-256 checksum of the above file\n\nIn addition, the following configuration flags are available as switches\n\n* `node['jemalloc']['configure']['lazy_lock']` - Enables lazy locking (locking on multi-threaded applications only)\n* `node['jemalloc']['configure']['xmalloc']` - Enables the `xmalloc` feature of jemalloc\n* `node['jemalloc']['configure']['dss']` - Enables `sbrk` along `mmap` for memory allocations\n* `node['jemalloc']['configure']['mremap']` - Enables the `mremap` feature of jemalloc\n* `node['jemalloc']['configure']['stats']` - Enables the statistics gathering features of jemalloc\n* `node['jemalloc']['configure']['profiling']` - Enables the code profiling features of jemalloc\n* `node['jemalloc']['configure']['valgrind']` - Enables valgrind support in jemalloc\n\nRecipes\n=======\n\n## default.rb\n\nThe default recipe downloads, compiles and installs the selected version of\njemalloc.\n\nUsage\n=====\n\nInclude the recipe on your node or role. Modify the\nattributes as required in your role to change how various\nconfiguration is applied per the attributes section above. In general,\noverride attributes in the role should be used when changing\nattributes.\n\nLicense and Author\n==================\n\n- Author:: Panagiotis Papadomitsos (<pj@ezgr.net>)\n\nCopyright 2013, Panagiotis Papadomitsos\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
+  "maintainer": "Panagiotis Papadomitsos",
+  "maintainer_email": "pj@ezgr.net",
+  "license": "Apache 2.0",
+  "platforms": {
+    "ubuntu": ">= 12.04",
+    "debian": ">= 6.0",
+    "redhat": ">= 6.0",
+    "scientific": ">= 6.0",
+    "oracle": ">= 6.0"
+  },
+  "dependencies": {
+    "build-essential": ">= 0.0.0"
+  },
+  "recommendations": {
+
+  },
+  "suggestions": {
+
+  },
+  "conflicting": {
+
+  },
+  "providing": {
+
+  },
+  "replacing": {
+
+  },
+  "attributes": {
+
+  },
+  "groupings": {
+
+  },
+  "recipes": {
+    "jemalloc": "Installs and configures the jemalloc library"
+  },
+  "version": "0.1.7",
+  "source_url": "",
+  "issues_url": "",
+  "privacy": false,
+  "chef_versions": [
+
+  ],
+  "ohai_versions": [
+
+  ],
+  "gems": [
+
+  ]
+}
--- a/cookbooks/jemalloc/metadata.rb
+++ b/cookbooks/jemalloc/metadata.rb
@@ -0,0 +1,17 @@
+name              'jemalloc'
+maintainer        'Panagiotis Papadomitsos'
+maintainer_email  'pj@ezgr.net'
+license           'Apache 2.0'
+description       'Installs and configures the jemalloc library'
+long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version           IO.read(File.join(File.dirname(__FILE__), 'VERSION')).chomp rescue '0.1.0'
+
+recipe            'jemalloc', 'Installs and configures the jemalloc library'
+
+supports          'ubuntu',      '>= 12.04'
+supports          'debian',      '>= 6.0'
+supports          'redhat',      '>= 6.0'
+supports          'scientific',  '>= 6.0'
+supports          'oracle',      '>= 6.0'
+
+depends           'build-essential'
--- a/cookbooks/jemalloc/recipes/default.rb
+++ b/cookbooks/jemalloc/recipes/default.rb
@@ -0,0 +1,73 @@
+#
+# Cookbook Name:: jemalloc
+# Recipe:: default
+#
+# Copyright (C) 2013 Panagiotis Papadomitsos
+#
+# 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.
+#
+
+include_recipe 'build-essential'
+
+package 'bzip2' # For archive extraction
+
+tmp = Chef::Config['file_cache_path'] || '/tmp'
+jem_filename = ::File.basename(node['jemalloc']['url'])
+jem_path = "#{tmp}/jemalloc-#{node['jemalloc']['version']}"
+jem_libdir = (platform_family?('rhel') && node['kernel']['machine'].eql?('x86_64')) ? '/usr/lib64' : '/usr/lib'
+
+remote_file "#{tmp}/#{jem_filename}" do
+  owner 'root'
+  group 'root'
+  mode 00644
+  source node['jemalloc']['url']
+  checksum node['jemalloc']['checksum']
+  action :create
+end
+
+execute 'extract-jemalloc' do
+  user 'root'
+  cwd(tmp)
+  command "tar xjf #{tmp}/#{jem_filename}"
+  not_if { ::File.directory?(jem_path)}
+end
+
+bash 'compile-jemalloc' do
+  user 'root'
+  cwd jem_path
+  code <<-EOH
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-debug \\
+  #{'--enable-lazy-lock' if node['jemalloc']['configure']['lazy_lock']} \\
+  #{'--enable-xmalloc' if node['jemalloc']['configure']['xmalloc']} \\
+  #{'--enable-dss' if node['jemalloc']['configure']['dss']} \\
+  #{'--enable-mremap' if node['jemalloc']['configure']['mremap']} \\
+  #{'--disable-stats' unless node['jemalloc']['configure']['stats']} \\
+  #{'--enable-prof ' if node['jemalloc']['configure']['profiling']} \\
+  #{'--disable-valgrind' unless node['jemalloc']['configure']['valgrind']} &&
+  make
+  EOH
+  not_if { ::File.exists?("#{jem_path}/lib/libjemalloc.so.2")}
+end
+
+execute 'install-jemalloc' do
+  command 'make install'
+  cwd jem_path
+  not_if { ::FileUtils.cmp("#{jem_path}/lib/libjemalloc.so.2", "#{jem_libdir}/libjemalloc.so.2") rescue false }
+  action :run
+  notifies :run, 'execute[jemalloc-ldconfig]'
+end
+
+execute 'jemalloc-ldconfig' do
+  command 'ldconfig'
+  action :nothing
+end
--- a/cookbooks/postfix/.markdownlint-cli2.yaml
+++ b/cookbooks/postfix/.markdownlint-cli2.yaml
@@ -0,0 +1,5 @@
+config:
+  ul-indent: false # MD007
+  line-length: false # MD013
+  no-duplicate-heading: false # MD024
+  reference-links-images: false # MD052
--- a/cookbooks/postfix/CHANGELOG.md
+++ b/cookbooks/postfix/CHANGELOG.md
@@ -2,6 +2,176 @@

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

+## 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
@@ -117,51 +287,51 @@ Reverting #37 - [COOK-3418] Virtual Domain Support PR - duplicate of #55

 ### Bug

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

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

 ### Bug

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

 ### New Feature

- **[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
+- use conf_dir attribute for sasl recipe, and add omnios support
+- Support creating the sender_canonical map file

 ## v3.0.4

 ### Bug

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

 ### Improvement

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

 ### New Feature

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

 ## v3.0.2

 ### Bug

- **[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
+- Fix error when no there is no FQDN
+- Update `client.rb` after 3.0.0 refactor
+- Do not use resource cloning

 ### Improvement

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

 ## v3.0.0

 ### Improvement

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

 **Breaking changes**:

--- a/cookbooks/postfix/CONTRIBUTING.md
+++ b/cookbooks/postfix/CONTRIBUTING.md
@@ -1 +0,0 @@
-Please refer to <https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD>
--- a/cookbooks/postfix/LICENSE
+++ b/cookbooks/postfix/LICENSE
@@ -0,0 +1,202 @@
+                                 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
@@ -1,15 +0,0 @@
-<!-- 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,19 +1,28 @@
 # postfix Cookbook

-[![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)
+[![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)

 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 12.04+
- Debian 7.0+
- RHEL/CentOS/Scientific 5.7+, 6.2+
+- Ubuntu
+- Debian
+- RHEL/CentOS/Scientific
 - Amazon Linux (as of AMIs created after 4/9/2012)
+- FreeBSD

 May work on other platforms with or without modification.

@@ -33,6 +42,7 @@ 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
@@ -43,7 +53,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'

@@ -75,10 +85,20 @@ 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:

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

-## License & Authors
+## Contributors

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

-**Copyright:** 2009-2016, Chef Software, Inc.
+### 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
+Thank you to all our backers!

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

-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.
-```
+### 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/postfix/attributes/default.rb
+++ b/cookbooks/postfix/attributes/default.rb
@@ -1,5 +1,5 @@
 # Author:: Joshua Timberman <joshua@chef.io>
-# Copyright:: 2009-2017, Chef Software, Inc.
+# Copyright:: 2009-2019, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+default['postfix']['packages'] = %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'] = (node['platform'] == 'freebsd')
+default['postfix']['use_alias_maps'] = platform?('freebsd')
 default['postfix']['use_transport_maps'] = false
 default['postfix']['use_access_maps'] = false
 default['postfix']['use_virtual_aliases'] = false
@@ -33,6 +36,7 @@ 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']['access_db_type'] = 'hash'
 default['postfix']['aliases_db_type'] = 'hash'
 default['postfix']['transport_db_type'] = 'hash'
@@ -84,6 +88,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
@@ -99,6 +107,11 @@ 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
@@ -374,27 +387,24 @@ 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'] = case node['platform']
-                                when 'freebsd'
+default['postfix']['aliases'] = if platform?('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

-if node['postfix']['use_relay_restrictions_maps']
-  default['postfix']['main']['smtpd_relay_restrictions'] = "hash:#{node['postfix']['relay_restrictions_db']}, reject"
-end
+default['postfix']['main']['smtpd_relay_restrictions'] = "hash:#{node['postfix']['relay_restrictions_db']}, reject" if node['postfix']['use_relay_restrictions_maps']
--- a/cookbooks/postfix/chefignore
+++ b/cookbooks/postfix/chefignore
@@ -0,0 +1,115 @@
+# 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
@@ -0,0 +1,20 @@
+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.0.26'
+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-2017, Chef Software, Inc.
+# Copyright:: 2012-2019, 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,9 +13,7 @@
 # limitations under the License.
 #

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

 if node['postfix']['main']['smtpd_use_tls'] == 'yes'
  node.default_unless['postfix']['main']['smtpd_tls_cert_file'] = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
@@ -38,34 +36,18 @@ if node['postfix']['main']['smtp_sasl_auth_enable'] == 'yes'
  node.default_unless['postfix']['main']['relayhost'] = ''
 end

-if node['postfix']['use_alias_maps']
-  node.default_unless['postfix']['main']['alias_maps'] = ["hash:#{node['postfix']['aliases_db']}"]
-end
+node.default_unless['postfix']['main']['alias_maps'] = ["hash:#{node['postfix']['aliases_db']}"] if node['postfix']['use_alias_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']['transport_maps'] = ["hash:#{node['postfix']['transport_db']}"] if node['postfix']['use_transport_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']['access_maps'] = ["hash:#{node['postfix']['access_db']}"] if node['postfix']['use_access_maps']

-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_maps'] = ["#{node['postfix']['virtual_alias_db_type']}:#{node['postfix']['virtual_alias_db']}"] if node['postfix']['use_virtual_aliases']

-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']['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_relay_restrictions_maps']
-  default['postfix']['main']['smtpd_relay_restrictions'] = "hash:#{node['postfix']['relay_restrictions_db']}, reject"
-end
+node.default_unless['postfix']['main']['smtpd_relay_restrictions'] = "hash:#{node['postfix']['relay_restrictions_db']}, reject" if node['postfix']['use_relay_restrictions_maps']

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

-if node['postfix']['master']['cyrus']['active']
-  node.default_unless['postfix']['main']['cyrus_destination_recipient_limit'] = 1
-end
+node.default_unless['postfix']['main']['cyrus_destination_recipient_limit'] = 1 if node['postfix']['master']['cyrus']['active']
--- a/cookbooks/postfix/recipes/_common.rb
+++ b/cookbooks/postfix/recipes/_common.rb
@@ -2,7 +2,7 @@
 # Cookbook:: common
 # Recipe:: default
 #
-# Copyright:: 2009-2017, Chef Software, Inc.
+# Copyright:: 2009-2020, 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,12 +19,19 @@

 include_recipe 'postfix::_attributes'

-package 'postfix'
+# 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 'procmail' if node['postfix']['use_procmail']

 case node['platform_family']
-when 'rhel', 'fedora'
+when 'rhel', 'fedora', 'amazon'
  service 'sendmail' do
    action :nothing
  end
@@ -35,6 +42,8 @@ when 'rhel', 'fedora'
    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')

@@ -67,7 +76,68 @@ when 'omnios'
  execute 'load postfix manifest' do
    action :nothing
    command "svccfg import #{manifest_path}"
-    notifies :restart, 'service[postfix]'
+    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"]
  end
 end

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

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

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

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

-%w( main master ).each do |cfg|
-  template "#{node['postfix']['conf_dir']}/#{cfg}.cf" do
-    source "#{cfg}.cf.erb"
+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
    owner 'root'
    group node['root_group']
    mode '0644'
-    notifies :restart, 'service[postfix]'
-    variables(settings: node['postfix'][cfg])
-    cookbook node['postfix']["#{cfg}_template_source"]
+    notifies :run, 'execute[update-postfix-recipient_canonical]', :immediately
+    notifies :reload, 'service[postfix]'
  end
+
+  node.default['postfix']['main']['recipient_canonical_maps'] = "hash:#{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
+  action [:enable, :start]
 end
--- a/cookbooks/postfix/recipes/access.rb
+++ b/cookbooks/postfix/recipes/access.rb
@@ -1,4 +1,4 @@
-# Copyright:: 2012-2017, Chef Software, Inc.
+# Copyright:: 2012-2019, 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]'
+  notifies :run, 'execute[update-postfix-access]', :immediately
 end
--- a/cookbooks/postfix/recipes/aliases.rb
+++ b/cookbooks/postfix/recipes/aliases.rb
@@ -1,4 +1,4 @@
-# Copyright:: 2012-2017, Chef Software, Inc.
+# Copyright:: 2012-2019, 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]'
+  notifies :run, 'execute[update-postfix-aliases]', :immediately
 end
--- a/cookbooks/postfix/recipes/client.rb
+++ b/cookbooks/postfix/recipes/client.rb
@@ -2,7 +2,7 @@
 # Cookbook:: postfix
 # Recipe:: client
 #
-# Copyright:: 2009-2017, Chef Software, Inc.
+# Copyright:: 2009-2019, 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,6 +24,9 @@ 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'])
@@ -36,6 +39,6 @@ else
  relayhost = results.map { |n| n['ipaddress'] }.first
 end

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

 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-2017, Chef Software, Inc.
+# Copyright:: 2009-2019, 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,5 +1,4 @@
-# encoding: utf-8
-# Copyright:: 2012-2017, Chef Software, Inc.
+# Copyright:: 2012-2019, 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,7 +14,11 @@
 #

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

@@ -38,9 +41,7 @@ node['postfix']['maps'].each do |type, maps|
        map: content,
        separator: separator
      )
-      if %w(btree cdb dbm hash sdbm).include?(type)
-        notifies :run, "execute[update-postmap-#{file}]"
-      end
+      notifies :run, "execute[update-postmap-#{file}]" if %w(btree cdb dbm hash sdbm).include?(type)
      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-2017, Chef Software, Inc.
+# Copyright:: 2012-2019, 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,13 +15,15 @@

 include_recipe 'postfix::_common'

+postmap_command = platform_family?('rhel') ? '/usr/sbin/postmap' : 'postmap'
+
 execute 'update-postfix-relay-restrictions' do
-  command "postmap #{node['postfix']['relay_restrictions_db']}"
+  command "#{postmap_command} #{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]'
+  notifies :run, 'execute[update-postfix-relay-restrictions]', :immediately
 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-2017, Chef Software, Inc.
+# Copyright:: 2009-2019, 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,11 +28,9 @@ case node['platform_family']
 when 'debian'
  sasl_pkgs = %w(libsasl2-2 libsasl2-modules ca-certificates)
 when 'rhel'
-  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
+  sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain ca-certificates)
+when 'amazon'
+  sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain ca-certificates)
 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-2017, Chef Software, Inc.
+# Copyright:: 2009-2019, 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-2017, Chef Software, Inc.
+# Copyright:: 2012-2019, 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,13 +15,15 @@

 include_recipe 'postfix::_common'

+postmap_command = platform_family?('rhel') ? '/usr/sbin/postmap' : 'postmap'
+
 execute 'update-postfix-transport' do
-  command "postmap #{node['postfix']['transport_db']}"
+  command "#{postmap_command} #{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]'
+  notifies :run, 'execute[update-postfix-transport]', :immediately
 end
--- a/cookbooks/postfix/recipes/virtual_aliases.rb
+++ b/cookbooks/postfix/recipes/virtual_aliases.rb
@@ -1,4 +1,4 @@
-# Copyright:: 2012-2017, Chef Software, Inc.
+# Copyright:: 2012-2019, 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]'
+  notifies :run, 'execute[update-postfix-virtual-alias]', :immediately
  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-2017, Chef Software, Inc.
+# Copyright:: 2012-2019, 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]'
+  notifies :run, 'execute[update-postfix-virtual-alias-domains]', :immediately
  notifies :restart, 'service[postfix]'
 end
--- a/cookbooks/postfix/renovate.json
+++ b/cookbooks/postfix/renovate.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base"],
+  "packageRules": [{
+      "groupName": "Actions",
+      "matchUpdateTypes": ["patch", "pin", "digest"],
+      "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
--- a/cookbooks/postfix/templates/default/sasl_passwd.erb
+++ b/cookbooks/postfix/templates/default/sasl_passwd.erb
@@ -1,4 +0,0 @@
-# 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/mailer.erb
+++ b/cookbooks/postfix/templates/mailer.erb
@@ -0,0 +1,10 @@
+#
+# 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/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/recipient_canonical.erb
+++ b/cookbooks/postfix/templates/recipient_canonical.erb
@@ -0,0 +1,9 @@
+#
+# 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/default/relay_restrictions.erb
+++ b/cookbooks/postfix/templates/default/relay_restrictions.erb
--- a/cookbooks/postfix/templates/sasl_passwd.erb
+++ b/cookbooks/postfix/templates/sasl_passwd.erb
@@ -0,0 +1,8 @@
+# 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/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/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`Please refer to <https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD>`