From 632191521e1f2adc23b157433d8d81a2106a16c9 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Sun, 10 Nov 2019 18:11:24 -0800 Subject: [PATCH 1/2] Update copyrights Signed-off-by: Tim Smith --- attributes/default.rb | 2 +- kitchen.dokken.yml | 1 + recipes/_attributes.rb | 2 +- recipes/_common.rb | 2 +- recipes/access.rb | 2 +- recipes/aliases.rb | 2 +- recipes/client.rb | 2 +- recipes/default.rb | 2 +- recipes/maps.rb | 2 +- recipes/relay_restrictions.rb | 2 +- recipes/sasl_auth.rb | 2 +- recipes/server.rb | 2 +- recipes/transports.rb | 2 +- recipes/virtual_aliases.rb | 2 +- recipes/virtual_aliases_domains.rb | 2 +- test/integration/aliases/serverspec/aliases_spec.rb | 2 +- test/integration/canonical/serverspec/canonical_spec.rb | 2 +- test/integration/client/serverspec/client_spec.rb | 2 +- test/integration/default/serverspec/default_spec.rb | 2 +- .../sasl_auth_multiple/serverspec/sasl_auth_multiple_spec.rb | 2 +- .../sasl_auth_none/serverspec/sasl_auth_none_spec.rb | 2 +- test/integration/sasl_auth_one/serverspec/sasl_auth_one_spec.rb | 2 +- test/integration/server/serverspec/server_spec.rb | 2 +- 23 files changed, 23 insertions(+), 22 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index e497b31..8928c30 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,5 +1,5 @@ # Author:: Joshua Timberman -# 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"); diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml index 384cc07..cfddda4 100644 --- a/kitchen.dokken.yml +++ b/kitchen.dokken.yml @@ -2,6 +2,7 @@ driver: name: dokken privileged: true # because Docker and SystemD/Upstart chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> + chef_license: accept-no-persist transport: name: dokken diff --git a/recipes/_attributes.rb b/recipes/_attributes.rb index ff426e8..5e7449d 100644 --- a/recipes/_attributes.rb +++ b/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. diff --git a/recipes/_common.rb b/recipes/_common.rb index 2ac4f50..069495b 100644 --- a/recipes/_common.rb +++ b/recipes/_common.rb @@ -2,7 +2,7 @@ # Cookbook:: common # 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. diff --git a/recipes/access.rb b/recipes/access.rb index 62e3025..d774347 100644 --- a/recipes/access.rb +++ b/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. diff --git a/recipes/aliases.rb b/recipes/aliases.rb index 67d6db7..dcdbb4d 100644 --- a/recipes/aliases.rb +++ b/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. diff --git a/recipes/client.rb b/recipes/client.rb index 571077a..d58fa20 100644 --- a/recipes/client.rb +++ b/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. diff --git a/recipes/default.rb b/recipes/default.rb index 07026e4..9fed0be 100644 --- a/recipes/default.rb +++ b/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. diff --git a/recipes/maps.rb b/recipes/maps.rb index 56cfde7..c90816f 100644 --- a/recipes/maps.rb +++ b/recipes/maps.rb @@ -1,5 +1,5 @@ # 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. diff --git a/recipes/relay_restrictions.rb b/recipes/relay_restrictions.rb index 3c5bf11..de576e9 100644 --- a/recipes/relay_restrictions.rb +++ b/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. diff --git a/recipes/sasl_auth.rb b/recipes/sasl_auth.rb index c531f5d..21ffa0b 100644 --- a/recipes/sasl_auth.rb +++ b/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. diff --git a/recipes/server.rb b/recipes/server.rb index 2166777..eaa14a6 100644 --- a/recipes/server.rb +++ b/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. diff --git a/recipes/transports.rb b/recipes/transports.rb index 7386caa..6514d65 100644 --- a/recipes/transports.rb +++ b/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. diff --git a/recipes/virtual_aliases.rb b/recipes/virtual_aliases.rb index f8e9eda..8c79d87 100644 --- a/recipes/virtual_aliases.rb +++ b/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. diff --git a/recipes/virtual_aliases_domains.rb b/recipes/virtual_aliases_domains.rb index 067b697..6c61152 100644 --- a/recipes/virtual_aliases_domains.rb +++ b/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. diff --git a/test/integration/aliases/serverspec/aliases_spec.rb b/test/integration/aliases/serverspec/aliases_spec.rb index dffc3ed..6262f37 100644 --- a/test/integration/aliases/serverspec/aliases_spec.rb +++ b/test/integration/aliases/serverspec/aliases_spec.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. diff --git a/test/integration/canonical/serverspec/canonical_spec.rb b/test/integration/canonical/serverspec/canonical_spec.rb index 3650087..5b23ea6 100644 --- a/test/integration/canonical/serverspec/canonical_spec.rb +++ b/test/integration/canonical/serverspec/canonical_spec.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. diff --git a/test/integration/client/serverspec/client_spec.rb b/test/integration/client/serverspec/client_spec.rb index 4ac03a2..a6fb275 100644 --- a/test/integration/client/serverspec/client_spec.rb +++ b/test/integration/client/serverspec/client_spec.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. diff --git a/test/integration/default/serverspec/default_spec.rb b/test/integration/default/serverspec/default_spec.rb index 6a28a16..df83558 100644 --- a/test/integration/default/serverspec/default_spec.rb +++ b/test/integration/default/serverspec/default_spec.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. diff --git a/test/integration/sasl_auth_multiple/serverspec/sasl_auth_multiple_spec.rb b/test/integration/sasl_auth_multiple/serverspec/sasl_auth_multiple_spec.rb index 6c247ff..6210b79 100644 --- a/test/integration/sasl_auth_multiple/serverspec/sasl_auth_multiple_spec.rb +++ b/test/integration/sasl_auth_multiple/serverspec/sasl_auth_multiple_spec.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -# Copyright 2012, 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. diff --git a/test/integration/sasl_auth_none/serverspec/sasl_auth_none_spec.rb b/test/integration/sasl_auth_none/serverspec/sasl_auth_none_spec.rb index 20d16ec..46d86dc 100644 --- a/test/integration/sasl_auth_none/serverspec/sasl_auth_none_spec.rb +++ b/test/integration/sasl_auth_none/serverspec/sasl_auth_none_spec.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. diff --git a/test/integration/sasl_auth_one/serverspec/sasl_auth_one_spec.rb b/test/integration/sasl_auth_one/serverspec/sasl_auth_one_spec.rb index 8a19b65..90b93d2 100644 --- a/test/integration/sasl_auth_one/serverspec/sasl_auth_one_spec.rb +++ b/test/integration/sasl_auth_one/serverspec/sasl_auth_one_spec.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -# Copyright 2012, 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. diff --git a/test/integration/server/serverspec/server_spec.rb b/test/integration/server/serverspec/server_spec.rb index 6eb8c2a..2edb492 100644 --- a/test/integration/server/serverspec/server_spec.rb +++ b/test/integration/server/serverspec/server_spec.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. From cdfb02ee7ba21d5065355c9c0964ab6191c2a894 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Sun, 10 Nov 2019 18:11:50 -0800 Subject: [PATCH 2/2] Remove long_description and recipe metadata Neither of these are used anymore Signed-off-by: Tim Smith --- metadata.rb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/metadata.rb b/metadata.rb index 69e1db7..8387ea0 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,19 +3,8 @@ maintainer 'Chef Software, Inc.' maintainer_email 'cookbooks@chef.io' license 'Apache-2.0' description 'Installs and configures postfix for client or outbound relayhost, or to do SASL auth' -long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '5.3.1' -recipe 'postfix', 'Installs and configures postfix' -recipe 'postfix::sasl_auth', 'Set up postfix to auth to a server with sasl' -recipe 'postfix::aliases', 'Manages /etc/aliases' -recipe 'postfix::transports', 'Manages /etc/postfix/transport' -recipe 'postfix::access', 'Manages /etc/postfix/access' -recipe 'postfix::virtual_aliases', 'Manages /etc/postfix/virtual' -recipe 'postfix::client', 'Searches for the relayhost based on an attribute' -recipe 'postfix::server', 'Sets the mail_type attribute to master' -recipe 'postfix::maps', 'Manages any number of any type postfix lookup tables' - %w(ubuntu debian redhat centos amazon oracle scientific smartos fedora freebsd).each do |os| supports os end