diff --git a/README.md b/README.md index 07d97b6..1cede1c 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,6 @@ Query all current internal users: '$puppet resource qdr_user' ```puppet qdr_user { 'anyUser' : - file => '/var/lib/qdrouterd/qdrouterd.sasldb', password => 'changeme', } ``` diff --git a/examples/site.pp b/examples/site.pp index 1c4f41f..c40b178 100644 --- a/examples/site.pp +++ b/examples/site.pp @@ -19,6 +19,5 @@ node default { # qdr_user { 'SaslUser' : # ensure => present, # password => 'testpw', -# file => '/var/lib/qdrouterd/qdrouterd.sasldb', # } } diff --git a/lib/puppet/provider/qdr_user/sasl.rb b/lib/puppet/provider/qdr_user/sasl.rb index e75b95c..dc1bcce 100644 --- a/lib/puppet/provider/qdr_user/sasl.rb +++ b/lib/puppet/provider/qdr_user/sasl.rb @@ -4,11 +4,8 @@ Puppet::Type.type(:qdr_user).provide(:sasl) do commands :saslpasswd2 => 'saslpasswd2' optional_commands :sasldblistusers2 => 'sasldblistusers2' - #sasldb should be a config param - def self.instances users = [] - #TODO (ansmith) - why did first and last get discarded by dp? userlist=sasldblistusers2('-f', '/var/lib/qdrouterd/qdrouterd.sasldb').split(/\n/).each do |line| if line =~ /^(\S+)@(\S+):.*$/ users << new(:name => $1, @@ -22,7 +19,8 @@ Puppet::Type.type(:qdr_user).provide(:sasl) do def create # is there a way to pipe to commands? - if not system(%{echo "#{resource[:password]}" | saslpasswd2 -f #{resource[:file]} #{resource[:name]}}) + if not system(%{echo "#{resource[:password]}" | saslpasswd2 -f '/var/lib/qdrouterd/qdrouterd.sasldb' #{resource[:name]}}) + raise Puppet::Error, "Failed to create user" end end @@ -35,7 +33,7 @@ Puppet::Type.type(:qdr_user).provide(:sasl) do def exists? begin - users = sasldblistusers2('-f', '/var/lib/qdrouterd/qdrouterd.sasldb').split(/\n/).detect do |user| + users = sasldblistusers2('-f', "/var/lib/qdrouterd/qdrouterd.sasldb").split(/\n/).detect do |user| user.match(/^#{resource[:name]}@.*$/) end rescue diff --git a/lib/puppet/type/qdr_user.rb b/lib/puppet/type/qdr_user.rb index d98f38e..3a0e1c1 100644 --- a/lib/puppet/type/qdr_user.rb +++ b/lib/puppet/type/qdr_user.rb @@ -8,11 +8,6 @@ Puppet::Type.newtype(:qdr_user) do newvalues(/^\S+$/) end - newparam(:file) do - desc "The location of the sasl password file" - newvalues(/^\S+$/) - end - newparam(:password) do desc "The user password to be set on creation" end