Skip to content

Very crudly janked out the ohai plugin #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Very crudly janked out the ohai plugin #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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.'
2 changes: 1 addition & 1 deletion recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions recipes/from_package.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
0 recipes/ohai_plugin.rb → recipes/ohai_plugin.rb.disabled
View file
Open in desktop
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file should probably be deleted, but renaming disables it without throwing it away

File renamed without changes.