diff --git a/metadata.rb b/metadata.rb index ff097de..454e321 100644 --- a/metadata.rb +++ b/metadata.rb @@ -25,7 +25,7 @@ Installs and configures Dovecot, open source IMAP and POP3 email server. EOH long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '3.3.0' # WiP +version '3.3.1' # WiP source_url "https://github.com/zuazo/#{name}-cookbook" if respond_to?(:source_url) issues_url "https://github.com/zuazo/#{name}-cookbook/issues" if respond_to?(:issues_url) @@ -41,13 +41,13 @@ supports 'ubuntu', '>= 14.04' # TODO: remove this as it will be deprecated in Chef 15 -depends 'ohai' +#depends 'ohai' recipe 'dovecot::default', 'Installs and configures Dovecot.' recipe 'dovecot::user', 'Creates the dovecot system user.' recipe 'dovecot::conf_files', 'Generates all the configuration files.' -recipe 'dovecot::ohai_plugin', - 'Provides an Ohai plugin for reading dovecot install information.' +#recipe 'dovecot::ohai_plugin', +# 'Provides an Ohai plugin for reading dovecot install information.' recipe 'dovecot::from_package', 'Installs the required packages.' recipe 'dovecot::service', 'Configures the Dovecot service.' recipe 'dovecot::create_pwfile', 'Creates a userdb password file from databag.' diff --git a/recipes/default.rb b/recipes/default.rb index 459bb43..306b5a7 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -17,7 +17,7 @@ # limitations under the License. # -include_recipe 'dovecot::ohai_plugin' +#include_recipe 'dovecot::ohai_plugin' include_recipe 'dovecot::user' include_recipe "dovecot::from_#{node['dovecot']['install_from']}" include_recipe 'dovecot::conf_files' diff --git a/recipes/from_package.rb b/recipes/from_package.rb index 2d459d1..b357616 100644 --- a/recipes/from_package.rb +++ b/recipes/from_package.rb @@ -18,7 +18,7 @@ # # Already included in ::default recipe, required for ChefSpec tests -include_recipe 'dovecot::ohai_plugin' +#include_recipe 'dovecot::ohai_plugin' node['dovecot']['packages'].each do |type, pkgs| if pkgs.is_a?(String) @@ -32,9 +32,9 @@ package "(#{type}) #{pkg}" do package_name pkg only_if { DovecotCookbook::Conf.require?(type, node['dovecot']) } - if type == 'core' || node['dovecot']['ohai_plugin']['build-options'] - notifies :reload, 'ohai[dovecot]', :immediately - end + #if type == 'core' || node['dovecot']['ohai_plugin']['build-options'] + # notifies :reload, 'ohai[dovecot]', :immediately + #end end # package end # pkg.each end # node['dovecot']['packages'].each diff --git a/recipes/ohai_plugin.rb b/recipes/ohai_plugin.rb.disabled similarity index 100% rename from recipes/ohai_plugin.rb rename to recipes/ohai_plugin.rb.disabled