Merge branch 'master' into master

2019-11-18 14:08:07 -04:00 · 2019-11-18 14:08:07 -04:00 · e47c889763
commit e47c889763
parent a5fd0f7acd cdfb02ee7b
24 changed files with 23 additions and 33 deletions
--- a/attributes/default.rb
+++ b/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");
--- 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
--- 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
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.