aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/provider/mailalias/aliases.rb3
-rw-r--r--lib/puppet/type/mailalias.rb11
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/puppet/provider/mailalias/aliases.rb b/lib/puppet/provider/mailalias/aliases.rb
index 16f41ad..a87a9f8 100644
--- a/lib/puppet/provider/mailalias/aliases.rb
+++ b/lib/puppet/provider/mailalias/aliases.rb
@@ -6,7 +6,6 @@ Puppet::Type.type(:mailalias).provide(
default_target: '/etc/aliases',
filetype: :flat,
) do
-
desc 'The alias provider for mailalias.'
text_line :comment, match: %r{^#}
@@ -37,7 +36,7 @@ Puppet::Type.type(:mailalias).provide(
if record[:recipient]
dest = record[:recipient].map { |d|
# Quote aliases that have non-alpha chars
- if d =~ %r{[^-+\w@.]}
+ if %r{[^-+\w@.]}.match?(d)
'"%s"' % d
else
d
diff --git a/lib/puppet/type/mailalias.rb b/lib/puppet/type/mailalias.rb
index 59c88ef..f65eb62 100644
--- a/lib/puppet/type/mailalias.rb
+++ b/lib/puppet/type/mailalias.rb
@@ -2,13 +2,14 @@
module Puppet
Type.newtype(:mailalias) do
desc <<-DESC
- Creates an email alias in the local alias database.
+ @summary Creates an email alias in the local alias database.
@example using mailalias to redirect mail for the ftp account to root's mailbox
- mailalias { 'ftp':
- ensure => present,
- recipient => 'root',
- }
+
+ mailalias { 'ftp':
+ ensure => present,
+ recipient => 'root',
+ }
DESC
ensurable