puppet 3.4.3 → 3.5.0.rc1

data/lib/puppet/type/selboolean.rb

@@ -9,7 +9,7 @@ module Puppet
     end
 
     newproperty(:value) do
-      desc "Whether the the SELinux boolean should be enabled or disabled."
+      desc "Whether the SELinux boolean should be enabled or disabled."
       newvalue(:on)
       newvalue(:off)
     end

data/lib/puppet/type/selmodule.rb

@@ -42,7 +42,7 @@ Puppet::Type.newtype(:selmodule) do
 
     desc "If set to `true`, the policy will be reloaded if the
     version found in the on-disk file differs from the loaded
-    version.  If set to `false` (the default) the the only check
+    version.  If set to `false` (the default) the only check
     that will be made is if the policy is loaded at all or not."
 
     newvalue(:true)

data/lib/puppet/type/ssh_authorized_key.rb

@@ -20,9 +20,10 @@ module Puppet
     newproperty(:type) do
       desc "The encryption type used: ssh-dss or ssh-rsa."
 
-      newvalues :'ssh-dss', :'ssh-rsa', :'ecdsa-sha2-nistp256', :'ecdsa-sha2-nistp384', :'ecdsa-sha2-nistp521'
+      newvalues :'ssh-dss', :'ssh-rsa', :'ecdsa-sha2-nistp256', :'ecdsa-sha2-nistp384', :'ecdsa-sha2-nistp521', :'ssh-ed25519'
 
       aliasvalue(:dsa, :'ssh-dss')
+      aliasvalue(:ed25519, :'ssh-ed25519')
       aliasvalue(:rsa, :'ssh-rsa')
     end
 

data/lib/puppet/type/sshkey.rb

@@ -9,9 +9,10 @@ module Puppet
     newproperty(:type) do
       desc "The encryption type used.  Probably ssh-dss or ssh-rsa."
 
-      newvalues :'ssh-dss', :'ssh-rsa', :'ecdsa-sha2-nistp256', :'ecdsa-sha2-nistp384', :'ecdsa-sha2-nistp521'
+      newvalues :'ssh-dss', :'ssh-ed25519', :'ssh-rsa', :'ecdsa-sha2-nistp256', :'ecdsa-sha2-nistp384', :'ecdsa-sha2-nistp521'
 
       aliasvalue(:dsa, :'ssh-dss')
+      aliasvalue(:ed25519, :'ssh-ed25519')
       aliasvalue(:rsa, :'ssh-rsa')
     end
 

data/lib/puppet/type/tidy.rb

@@ -312,7 +312,7 @@ Puppet::Type.newtype(:tidy) do
 
   def stat(path)
     begin
-      Puppet::FileSystem::File.new(path).lstat
+      Puppet::FileSystem.lstat(path)
     rescue Errno::ENOENT => error
       info "File does not exist"
       return nil

data/lib/puppet/type/user.rb

@@ -54,6 +54,9 @@ module Puppet
       "Allows local users to be managed on systems that also use some other
        remote NSS method of managing accounts."
 
+    feature :manages_shell,
+      "The provider allows for setting shell and validates if possible"
+
     newproperty(:ensure, :parent => Puppet::Property::Ensure) do
       newvalue(:present, :event => :user_created) do
         provider.create
@@ -169,7 +172,7 @@ module Puppet
       end
     end
 
-    newproperty(:shell) do
+    newproperty(:shell, :required_features => :manages_shell) do
       desc "The user's login shell.  The shell must exist and be
         executable.
 

data/lib/puppet/type/yumrepo.rb

@@ -1,395 +1,270 @@
-require 'puppet/util/inifile'
-
-module Puppet
-  # A property for one entry in a .ini-style file
-  class IniProperty < Puppet::Property
-    def insync?(is)
-      # A should property of :absent is the same as nil
-      if is.nil? && should == :absent
-        return true
-      end
-      super(is)
-    end
+require 'uri'
 
-    def sync
-      if safe_insync?(retrieve)
-        result = nil
-      else
-        result = set(self.should)
-        if should == :absent
-          resource.section[inikey] = nil
-        else
-          resource.section[inikey] = should
-        end
-      end
-      result
-    end
+Puppet::Type.newtype(:yumrepo) do
+  @doc = "The client-side description of a yum repository. Repository
+    configurations are found by parsing `/etc/yum.conf` and
+    the files indicated by the `reposdir` option in that file
+    (see `yum.conf(5)` for details).
 
-    def retrieve
-      resource.section[inikey]
-    end
+    Most parameters are identical to the ones documented
+    in the `yum.conf(5)` man page.
 
-    def inikey
-      name.to_s
-    end
+    Continuation lines that yum supports (for the `baseurl`, for example)
+    are not supported. This type does not attempt to read or verify the
+    exinstence of files listed in the `include` attribute."
 
-    # Set the key associated with this property to KEY, instead
-    # of using the property's NAME
-    def self.inikey(key)
-      # Override the inikey instance method
-      # Is there a way to do this without resorting to strings ?
-      # Using a block fails because the block can't access
-      # the variable 'key' in the outer scope
-      self.class_eval("def inikey ; \"#{key.to_s}\" ; end")
-    end
+  # Ensure yumrepos can be removed too.
+  ensurable
+  # Doc string for properties that can be made 'absent'
+  ABSENT_DOC="Set this to `absent` to remove it from the file completely."
+  # False can be false/0/no and True can be true/1/yes in yum.
+  YUM_BOOLEAN=/(True|False|0|1|No|Yes)/
+  YUM_BOOLEAN_DOC="Valid values are: False/0/No or True/1/Yes."
 
+  newparam(:name, :namevar => true) do
+    desc "The name of the repository.  This corresponds to the
+     `repositoryid` parameter in `yum.conf(5)`."
   end
 
-  # Doc string for properties that can be made 'absent'
-  ABSENT_DOC="Set this to `absent` to remove it from the file completely."
+  newparam(:target) do
+    desc "The filename to write the yum repository to."
 
-  newtype(:yumrepo) do
-    @doc = "The client-side description of a yum repository. Repository
-      configurations are found by parsing `/etc/yum.conf` and
-      the files indicated by the `reposdir` option in that file
-      (see `yum.conf(5)` for details).
-
-      Most parameters are identical to the ones documented
-      in the `yum.conf(5)` man page.
-
-      Continuation lines that yum supports (for the `baseurl`, for example)
-      are not supported. This type does not attempt to read or verify the
-      exinstence of files listed in the `include` attribute."
-
-    class << self
-      attr_accessor :filetype
-      # The writer is only used for testing, there should be no need
-      # to change yumconf or inifile in any other context
-      attr_accessor :yumconf
-      attr_writer :inifile
-    end
+    defaultto :absent
+  end
 
-    self.filetype = Puppet::Util::FileType.filetype(:flat)
-
-    @inifile = nil
-
-    @yumconf = "/etc/yum.conf"
-
-    # Where to put files for brand new sections
-    @defaultrepodir = nil
-
-    def self.instances
-      l = []
-      check = validproperties
-      clear
-      inifile.each_section do |s|
-        next if s.name == "main"
-        obj = new(:name => s.name, :audit => check)
-        current_values = obj.retrieve
-        obj.eachproperty do |property|
-          if current_values[property].nil?
-            obj.delete(property.name)
-          else
-            property.should = current_values[property]
-          end
-        end
-        obj.delete(:audit)
-        l << obj
-      end
-      l
-    end
+  newproperty(:descr) do
+    desc "A human-readable description of the repository.
+      This corresponds to the name parameter in `yum.conf(5)`.
+      #{ABSENT_DOC}"
 
-    # Return the Puppet::Util::IniConfig::File for the whole yum config
-    def self.inifile
-      if @inifile.nil?
-        @inifile = read
-        main = @inifile['main']
-        raise Puppet::Error, "File #{yumconf} does not contain a main section" if main.nil?
-        reposdir = main['reposdir']
-        reposdir ||= "/etc/yum.repos.d, /etc/yum/repos.d"
-        reposdir.gsub!(/[\n,]/, " ")
-        reposdir.split.each do |dir|
-          Dir::glob("#{dir}/*.repo").each do |file|
-            @inifile.read(file) if ::File.file?(file)
-          end
-        end
-        reposdir.split.each do |dir|
-          if ::File.directory?(dir) && ::File.writable?(dir)
-            @defaultrepodir = dir
-            break
-          end
-        end
-      end
-      @inifile
-    end
+    newvalues(/.*/, :absent)
+  end
 
-    # Parse the yum config files. Only exposed for the tests
-    # Non-test code should use self.inifile to get at the
-    # underlying file
-    def self.read
-      result = Puppet::Util::IniConfig::File.new
-      result.read(yumconf)
-      main = result['main']
-      raise Puppet::Error, "File #{yumconf} does not contain a main section" if main.nil?
-      reposdir = main['reposdir']
-      reposdir ||= "/etc/yum.repos.d, /etc/yum/repos.d"
-      reposdir.gsub!(/[\n,]/, " ")
-      reposdir.split.each do |dir|
-        Dir::glob("#{dir}/*.repo").each do |file|
-          result.read(file) if ::File.file?(file)
-        end
-      end
-      if @defaultrepodir.nil?
-        reposdir.split.each do |dir|
-          if ::File.directory?(dir) && ::File.writable?(dir)
-            @defaultrepodir = dir
-            break
-          end
-        end
-      end
-      result
-    end
+  newproperty(:mirrorlist) do
+    desc "The URL that holds the list of mirrors for this repository.
+      #{ABSENT_DOC}"
 
-    # Return the Puppet::Util::IniConfig::Section with name NAME
-    # from the yum config
-    def self.section(name)
-      result = inifile[name]
-      if result.nil?
-        # Brand new section
-        path = yumconf
-        path = ::File.join(@defaultrepodir, "#{name}.repo") unless @defaultrepodir.nil?
-        Puppet::info "create new repo #{name} in file #{path}"
-        result = inifile.add_section(name, path)
-      end
-      result
+    newvalues(/.*/, :absent)
+    validate do |value|
+      parsed = URI.parse(value)
+      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
     end
+  end
 
-    # Store all modifications back to disk
-    def self.store
-      inifile.store
-      unless Puppet[:noop]
-        target_mode = 0644 # FIXME: should be configurable
-        inifile.each_file do |file|
-          current_mode = Puppet::FileSystem::File.new(file).stat.mode & 0777
-          unless current_mode == target_mode
-            Puppet::info "changing mode of #{file} from %03o to %03o" % [current_mode, target_mode]
-            ::File.chmod(target_mode, file)
-          end
-        end
-      end
-    end
+  newproperty(:baseurl) do
+    desc "The URL for this repository. #{ABSENT_DOC}"
 
-    # This is only used during testing.
-    def self.clear
-      @inifile = nil
-      @yumconf = "/etc/yum.conf"
-      @defaultrepodir = nil
+    newvalues(/.*/, :absent)
+    validate do |value|
+      parsed = URI.parse(value)
+      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
     end
+  end
 
-    # Return the Puppet::Util::IniConfig::Section for this yumrepo resource
-    def section
-      self.class.section(self[:name])
-    end
+  newproperty(:enabled) do
+    desc "Whether this repository is enabled.
+    #{YUM_BOOLEAN_DOC}
+    #{ABSENT_DOC}"
 
-    # Store modifications to this yumrepo resource back to disk
-    def flush
-      self.class.store
-    end
+    newvalues(YUM_BOOLEAN, :absent)
+  end
 
-    newparam(:name) do
-      desc "The name of the repository.  This corresponds to the
-        `repositoryid` parameter in `yum.conf(5)`."
-      isnamevar
-    end
+  newproperty(:gpgcheck) do
+    desc "Whether to check the GPG signature on packages installed
+      from this repository.
+      #{YUM_BOOLEAN_DOC}
+      #{ABSENT_DOC}"
 
-    newproperty(:descr, :parent => Puppet::IniProperty) do
-      desc "A human-readable description of the repository.
-        This corresponds to the name parameter in `yum.conf(5)`.
-        #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/.*/) { }
-      inikey "name"
-    end
+    newvalues(YUM_BOOLEAN, :absent)
+  end
 
-    newproperty(:mirrorlist, :parent => Puppet::IniProperty) do
-      desc "The URL that holds the list of mirrors for this repository.
-        #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      # Should really check that it's a valid URL
-      newvalue(/.*/) { }
-    end
+  newproperty(:repo_gpgcheck) do
+    desc "Whether to check the GPG signature on repodata.
+      #{YUM_BOOLEAN_DOC}
+      #{ABSENT_DOC}"
 
-    newproperty(:baseurl, :parent => Puppet::IniProperty) do
-      desc "The URL for this repository. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      # Should really check that it's a valid URL
-      newvalue(/.*/) { }
-    end
+    newvalues(YUM_BOOLEAN, :absent)
+  end
 
-    newproperty(:enabled, :parent => Puppet::IniProperty) do
-      desc "Whether this repository is enabled, as represented by a
-        `0` or `1`. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/^(0|1)$/) { }
-    end
+  newproperty(:gpgkey) do
+    desc "The URL for the GPG key with which packages from this
+      repository are signed. #{ABSENT_DOC}"
 
-    newproperty(:gpgcheck, :parent => Puppet::IniProperty) do
-      desc "Whether to check the GPG signature on packages installed
-        from this repository, as represented by a `0` or `1`.
-        #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/^(0|1)$/) { }
+    newvalues(/.*/, :absent)
+    validate do |value|
+      parsed = URI.parse(value)
+      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
     end
+  end
 
-    newproperty(:gpgkey, :parent => Puppet::IniProperty) do
-      desc "The URL for the GPG key with which packages from this
-        repository are signed. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      # Should really check that it's a valid URL
-      newvalue(/.*/) { }
-    end
+  newproperty(:include) do
+    desc "The URL of a remote file containing additional yum configuration
+      settings. Puppet does not check for this file's existence or validity.
+      #{ABSENT_DOC}"
 
-    newproperty(:include, :parent => Puppet::IniProperty) do
-      desc "The URL of a remote file containing additional yum configuration
-        settings. Puppet does not check for this file's existence or validity.
-        #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      # Should really check that it's a valid URL
-      newvalue(/.*/) { }
+    newvalues(/.*/, :absent)
+    validate do |value|
+      parsed = URI.parse(value)
+      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
     end
+  end
 
-    newproperty(:exclude, :parent => Puppet::IniProperty) do
-      desc "List of shell globs. Matching packages will never be
-        considered in updates or installs for this repo.
-        #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/.*/) { }
-    end
+  newproperty(:exclude) do
+    desc "List of shell globs. Matching packages will never be
+      considered in updates or installs for this repo.
+      #{ABSENT_DOC}"
 
-    newproperty(:includepkgs, :parent => Puppet::IniProperty) do
-      desc "List of shell globs. If this is set, only packages
-        matching one of the globs will be considered for
-        update or install from this repo. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/.*/) { }
-    end
+    newvalues(/.*/, :absent)
+  end
 
-    newproperty(:enablegroups, :parent => Puppet::IniProperty) do
-      desc "Whether yum will allow the use of package groups for this
-        repository, as represented by a `0` or `1`. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/^(0|1)$/) { }
-    end
+  newproperty(:includepkgs) do
+    desc "List of shell globs. If this is set, only packages
+      matching one of the globs will be considered for
+      update or install from this repo. #{ABSENT_DOC}"
 
-    newproperty(:failovermethod, :parent => Puppet::IniProperty) do
-      desc "The failover methode for this repository; should be either
-        `roundrobin` or `priority`. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(%r{roundrobin|priority}) { }
-    end
+    newvalues(/.*/, :absent)
+  end
 
-    newproperty(:keepalive, :parent => Puppet::IniProperty) do
-      desc "Whether HTTP/1.1 keepalive should be used with this repository, as
-        represented by a `0` or `1`. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/^(0|1)$/) { }
-    end
+  newproperty(:enablegroups) do
+    desc "Whether yum will allow the use of package groups for this
+      repository.
+      #{YUM_BOOLEAN_DOC}
+      #{ABSENT_DOC}"
 
-     newproperty(:http_caching, :parent => Puppet::IniProperty) do
-       desc "What to cache from this repository. #{ABSENT_DOC}"
-       newvalue(:absent) { self.should = :absent }
-       newvalue(%r(packages|all|none)) { }
-     end
-
-    newproperty(:timeout, :parent => Puppet::IniProperty) do
-      desc "Number of seconds to wait for a connection before timing
-        out. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(%r{[0-9]+}) { }
-    end
+    newvalues(YUM_BOOLEAN, :absent)
+  end
 
-    newproperty(:metadata_expire, :parent => Puppet::IniProperty) do
-      desc "Number of seconds after which the metadata will expire.
-        #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(%r{[0-9]+}) { }
-    end
+  newproperty(:failovermethod) do
+    desc "The failover method for this repository; should be either
+      `roundrobin` or `priority`. #{ABSENT_DOC}"
 
-    newproperty(:protect, :parent => Puppet::IniProperty) do
-      desc "Enable or disable protection for this repository. Requires
-        that the `protectbase` plugin is installed and enabled.
-        #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/^(0|1)$/) { }
-    end
+    newvalues(/roundrobin|priority/, :absent)
+  end
 
-    newproperty(:priority, :parent => Puppet::IniProperty) do
-      desc "Priority of this repository from 1-99. Requires that
-        the `priorities` plugin is installed and enabled.
-        #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(%r{[1-9][0-9]?}) { }
-    end
+  newproperty(:keepalive) do
+    desc "Whether HTTP/1.1 keepalive should be used with this repository.
+      #{YUM_BOOLEAN_DOC}
+      #{ABSENT_DOC}"
 
-    newproperty(:cost, :parent => Puppet::IniProperty) do
-      desc "Cost of this repository. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(%r{\d+}) { }
-    end
+    newvalues(YUM_BOOLEAN, :absent)
+  end
 
-    newproperty(:proxy, :parent => Puppet::IniProperty) do
-      desc "URL to the proxy server for this repository. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      # Should really check that it's a valid URL
-      newvalue(/.*/) { }
-    end
+  newproperty(:http_caching) do
+    desc "What to cache from this repository. #{ABSENT_DOC}"
 
-    newproperty(:proxy_username, :parent => Puppet::IniProperty) do
-      desc "Username for this proxy. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/.*/) { }
-    end
+    newvalues(/(packages|all|none)/, :absent)
+  end
 
-    newproperty(:proxy_password, :parent => Puppet::IniProperty) do
-      desc "Password for this proxy. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/.*/) { }
-    end
+  newproperty(:timeout) do
+    desc "Number of seconds to wait for a connection before timing
+      out. #{ABSENT_DOC}"
 
-    newproperty(:s3_enabled, :parent => Puppet::IniProperty) do
-      desc "Access the repo via S3. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/^(0|1)$/) { }
-    end
+    newvalues(/[0-9]+/, :absent)
+  end
 
-    newproperty(:sslcacert, :parent => Puppet::IniProperty) do
-      desc "Path to the directory containing the databases of the
-        certificate authorities yum should use to verify SSL certificates.
-        #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/.*/) { }
-    end
+  newproperty(:metadata_expire) do
+    desc "Number of seconds after which the metadata will expire.
+      #{ABSENT_DOC}"
 
-    newproperty(:sslverify, :parent => Puppet::IniProperty) do
-      desc "Should yum verify SSL certificates/hosts at all.
-        Possible values are 'True' or 'False'.
-        #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(%r(True|False)) { }
+    newvalues(/[0-9]+/, :absent)
+  end
+
+  newproperty(:protect) do
+    desc "Enable or disable protection for this repository. Requires
+      that the `protectbase` plugin is installed and enabled.
+      #{YUM_BOOLEAN_DOC}
+      #{ABSENT_DOC}"
+
+    newvalues(YUM_BOOLEAN, :absent)
+  end
+
+  newproperty(:priority) do
+    desc "Priority of this repository from 1-99. Requires that
+      the `priorities` plugin is installed and enabled.
+      #{ABSENT_DOC}"
+
+    newvalues(/.*/, :absent)
+    validate do |value|
+      unless value == :absent or (1..99).include?(value.to_i)
+        fail("Must be within range 1-99")
+      end
     end
+  end
+
+  newproperty(:cost) do
+    desc "Cost of this repository. #{ABSENT_DOC}"
+
+    newvalues(/\d+/, :absent)
+  end
+
+  newproperty(:proxy) do
+    desc "URL to the proxy server for this repository. #{ABSENT_DOC}"
 
-    newproperty(:sslclientcert, :parent => Puppet::IniProperty) do
-      desc "Path  to the SSL client certificate yum should use to connect
-        to repos/remote sites. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/.*/) { }
+    newvalues(/.*/, :absent)
+    validate do |value|
+      parsed = URI.parse(value)
+      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
     end
+  end
+
+  newproperty(:proxy_username) do
+    desc "Username for this proxy. #{ABSENT_DOC}"
+
+    newvalues(/.*/, :absent)
+  end
+
+  newproperty(:proxy_password) do
+    desc "Password for this proxy. #{ABSENT_DOC}"
+
+    newvalues(/.*/, :absent)
+  end
+
+  newproperty(:s3_enabled) do
+    desc "Access the repo via S3.
+      #{YUM_BOOLEAN_DOC}
+      #{ABSENT_DOC}"
+
+    newvalues(YUM_BOOLEAN, :absent)
+  end
+
+  newproperty(:sslcacert) do
+    desc "Path to the directory containing the databases of the
+      certificate authorities yum should use to verify SSL certificates.
+      #{ABSENT_DOC}"
+
+    newvalues(/.*/, :absent)
+  end
+
+  newproperty(:sslverify) do
+    desc "Should yum verify SSL certificates/hosts at all.
+      #{YUM_BOOLEAN_DOC}
+      #{ABSENT_DOC}"
+
+    newvalues(YUM_BOOLEAN, :absent)
+  end
+
+  newproperty(:sslclientcert) do
+    desc "Path  to the SSL client certificate yum should use to connect
+      to repos/remote sites. #{ABSENT_DOC}"
+
+    newvalues(/.*/, :absent)
+  end
+
+  newproperty(:sslclientkey) do
+    desc "Path to the SSL client key yum should use to connect
+      to repos/remote sites. #{ABSENT_DOC}"
+
+    newvalues(/.*/, :absent)
+  end
+
+  newproperty(:metalink) do
+    desc "Metalink for mirrors. #{ABSENT_DOC}"
 
-    newproperty(:sslclientkey, :parent => Puppet::IniProperty) do
-      desc "Path to the SSL client key yum should use to connect
-        to repos/remote sites. #{ABSENT_DOC}"
-      newvalue(:absent) { self.should = :absent }
-      newvalue(/.*/) { }
+    newvalues(/.*/, :absent)
+    validate do |value|
+      parsed = URI.parse(value)
+      fail("Must be a valid URL") unless ['file', 'http', 'https', 'ftp'].include?(parsed.scheme)
     end
   end
+
 end