openvox 9.0.0.pre.alpha2 → 9.0.0.pre.beta2

data/lib/puppet/settings.rb

@@ -54,7 +54,7 @@ class Puppet::Settings
 
   NONE = 'none'
 
-  # This method is intended for puppet internal use only; it is a convenience method that
+  # This method is intended for OpenVox internal use only; it is a convenience method that
   # returns reasonable application default settings values for a given run_mode.
   def self.app_defaults_for_run_mode(run_mode)
     {
@@ -321,10 +321,10 @@ class Puppet::Settings
   def initialize_global_settings(args = [], require_config = true)
     raise Puppet::DevError, _("Attempting to initialize global default settings more than once!") if global_defaults_initialized?
 
-    # The first two phases of the lifecycle of a puppet application are:
+    # The first two phases of the lifecycle of an OpenVox application are:
     # 1) Parse the command line options and handle any of them that are
-    #    registered, defined "global" puppet settings (mostly from defaults.rb).
-    # 2) Parse the puppet config file(s).
+    #    registered, defined "global" OpenVox settings (mostly from defaults.rb).
+    # 2) Parse the OpenVox config file(s).
 
     parse_global_options(args)
     parse_config_files(require_config)
@@ -335,7 +335,7 @@ class Puppet::Settings
   # This method is called during application bootstrapping.  It is responsible for parsing all of the
   # command line options and initializing the settings accordingly.
   #
-  # It will ignore options that are not defined in the global puppet settings list, because they may
+  # It will ignore options that are not defined in the global OpenVox settings list, because they may
   # be valid options for the specific application that we are about to launch... however, at this point
   # in the bootstrapping lifecycle, we don't yet know what that application is.
   def parse_global_options(args)
@@ -512,45 +512,6 @@ class Puppet::Settings
     @config.include?(name)
   end
 
-  # Prints the contents of a config file with the available config settings, or it
-  # prints a single value of a config setting.
-  def print_config_options
-    if Puppet::Util::Log.sendlevel?(:info)
-      Puppet::Util::Log.newdestination(:console)
-      message = _("Using --configprint is deprecated. Use 'puppet config <subcommand>' instead.")
-      Puppet.deprecation_warning(message)
-    end
-
-    env = value(:environment)
-    val = value(:configprint)
-    if val == "all"
-      hash = {}
-      each do |name, _obj|
-        val = value(name, env)
-        val = val.inspect if val == ""
-        hash[name] = val
-      end
-      hash.sort { |a, b| a[0].to_s <=> b[0].to_s }.each do |name, v|
-        puts "#{name} = #{v}"
-      end
-    else
-      val.split(/\s*,\s*/).sort.each do |v|
-        if include?(v)
-          # if there is only one value, just print it for back compatibility
-          if v == val
-            puts value(val, env)
-            break
-          end
-          puts "#{v} = #{value(v, env)}"
-        else
-          puts "invalid setting: #{v}"
-          return false
-        end
-      end
-    end
-    true
-  end
-
   def generate_config
     puts to_config
     true
@@ -562,14 +523,13 @@ class Puppet::Settings
   end
 
   def print_configs
-    return print_config_options if value(:configprint) != ""
     return generate_config if value(:genconfig)
 
     generate_manifest if value(:genmanifest)
   end
 
   def print_configs?
-    (value(:configprint) != "" || value(:genconfig) || value(:genmanifest)) && true
+    (value(:genconfig) || value(:genmanifest)) && true
   end
 
   # The currently configured run mode that is preferred for constructing the application configuration.
@@ -846,7 +806,7 @@ class Puppet::Settings
   # The order in which to search for values, without defaults.
   #
   # @param environment [String,Symbol] symbolic reference to an environment name
-  # @param run_mode [Symbol] symbolic reference to a Puppet run mode
+  # @param run_mode [Symbol] symbolic reference to an OpenVox run mode
   # @return [Array<SearchPathElement>]
   # @api private
   def configsearchpath(environment = nil, run_mode = preferred_run_mode)
@@ -871,7 +831,7 @@ class Puppet::Settings
   # The order in which to search for values.
   #
   # @param environment [String,Symbol] symbolic reference to an environment name
-  # @param run_mode [Symbol] symbolic reference to a Puppet run mode
+  # @param run_mode [Symbol] symbolic reference to an OpenVox run mode
   # @return [Array<SearchPathElement>]
   # @api private
   def searchpath(environment = nil, run_mode = preferred_run_mode)
@@ -1008,9 +968,9 @@ class Puppet::Settings
   #       you do not specify it, it will default to "string".  Legal values include:
   #       :string - A generic string setting
   #       :boolean - A boolean setting; values are expected to be "true" or "false"
-  #       :file - A (single) file path; puppet may attempt to create this file depending on how the settings are used.  This type
+  #       :file - A (single) file path; OpenVox may attempt to create this file depending on how the settings are used.  This type
   #           also supports additional options such as "mode", "owner", "group"
-  #       :directory - A (single) directory path; puppet may attempt to create this file depending on how the settings are used.  This type
+  #       :directory - A (single) directory path; OpenVox may attempt to create this file depending on how the settings are used.  This type
   #           also supports additional options such as "mode", "owner", "group"
   #       :path - This is intended to be used for settings whose value can contain multiple directory paths, represented
   #           as strings separated by the system path separator (e.g. system path, module path, etc.).
@@ -1530,7 +1490,7 @@ Generated on #{Time.now}.
           interpolated_expression
         end
         if failed_environment_interpolation
-          # TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
+          # TRANSLATORS '$environment' is an OpenVox specific variable and should not be translated
           Puppet.warning(_("You cannot interpolate $environment within '%{setting_name}' when using directory environments.") % { setting_name: setting_name } +
                              ' ' + _("Its value will remain %{value}.") % { value: interpolated_value })
         end

data/lib/puppet/ssl/certificate.rb

@@ -9,6 +9,10 @@ require_relative '../../puppet/ssl/base'
 # the case).
 #
 # @deprecated Use {Puppet::SSL::SSLProvider} instead.
+#   This class and its associated helpers are still
+#   necessary as they enable FIPS-mode OpenVox Server
+#   to populate trusted data when `require 'openssl'`
+#   is not available.
 class Puppet::SSL::Certificate < Puppet::SSL::Base
   # This is defined from the base class
   wraps OpenSSL::X509::Certificate

data/lib/puppet/ssl/certificate_request.rb

@@ -202,7 +202,7 @@ class Puppet::SSL::CertificateRequest < Puppet::SSL::Base
 
   private
 
-  # Exclude OIDs that may conflict with how Puppet creates CSRs.
+  # Exclude OIDs that may conflict with how OpenVox creates CSRs.
   #
   # We only have nominal support for Microsoft extension requests, but since we
   # ultimately respect that field when looking for extension requests in a CSR

data/lib/puppet/ssl/oids.rb

@@ -2,7 +2,7 @@
 
 require_relative '../../puppet/ssl'
 
-# This module defines OIDs for use within Puppet.
+# This module defines OIDs for use within OpenVox.
 #
 # # ASN.1 Definition
 #

data/lib/puppet/ssl/openssl_loader.rb

@@ -4,7 +4,7 @@ require_relative '../../puppet/util/platform'
 
 # This file should be required instead of writing `require 'openssl'`
 # or any library that loads openssl like `net/https`. This allows the
-# core Puppet code to load correctly in JRuby environments that do not
+# core OpenVox code to load correctly in JRuby environments that do not
 # have a functioning openssl (eg a FIPS enabled one).
 
 if Puppet::Util::Platform.jruby_fips?

data/lib/puppet/ssl/ssl_provider.rb

@@ -18,7 +18,7 @@ require_relative '../../puppet/ssl'
 #   cert = <OpenSSL::X509::Certificate>
 #   ssl_context = provider.create_context(cacerts: cacerts, crls: crls, private_key: key, client_cert: cert)
 #
-# @example To create an SSLContext to connect to non-puppet HTTPS servers:
+# @example To create an SSLContext to connect to non-OpenVox HTTPS servers:
 #   cacerts = [<OpenSSL::X509::Certificate>]
 #   ssl_context = provider.create_root_context(cacerts: cacerts)
 #
@@ -56,9 +56,9 @@ class Puppet::SSL::SSLProvider
   end
 
   # Create an `SSLContext` using the trusted `cacerts` and any certs in OpenSSL's
-  # default verify path locations. When running puppet as a gem, the location is
-  # system dependent. When running puppet from puppet-agent packages, the location
-  # refers to the cacerts bundle in the puppet-agent package.
+  # default verify path locations. When running OpenVox as a gem, the location is
+  # system dependent. When running OpenVox from openvox-agent packages, the location
+  # refers to the cacerts bundle in the openvox-agent package.
   #
   # Connections made from the returned context will authenticate the server,
   # i.e. `VERIFY_PEER`, but will not use a client certificate (unless requested)
@@ -296,7 +296,7 @@ class Puppet::SSL::SSLProvider
 
   def verify_cert_with_store(store, cert)
     # StoreContext#initialize accepts a chain argument, but it's set to [] because
-    # puppet requires any intermediate CA certs needed to complete the client's
+    # OpenVox requires any intermediate CA certs needed to complete the client's
     # chain to be in the CA bundle that we downloaded from the server, and
     # they've already been added to the store. See PUP-9500.
 

data/lib/puppet/ssl/state_machine.rb

@@ -121,6 +121,10 @@ class Puppet::SSL::StateMachine
     rescue Puppet::HTTP::ResponseError => e
       if e.response.code == 304
         Puppet.info(_("CA certificate is unmodified, using existing CA certificate"))
+        # 304 confirms the local CA is current, so reset the TTL.
+        # Otherwise ca_last_update (backed by ca.pem mtime) never advances
+        # past the initial download and needs_refresh? triggers on every run.
+        @cert_provider.ca_last_update = Time.now
       else
         Puppet.info(_("Failed to refresh CA certificate, using existing CA certificate: %{message}") % { message: e.message })
       end
@@ -219,6 +223,8 @@ class Puppet::SSL::StateMachine
     rescue Puppet::HTTP::ResponseError => e
       if e.response.code == 304
         Puppet.info(_("CRL is unmodified, using existing CRL"))
+        # 304 confirms the local CRL is current, so reset the TTL.
+        @cert_provider.crl_last_update = Time.now
       else
         Puppet.info(_("Failed to refresh CRL, using existing CRL: %{message}") % { message: e.message })
       end
@@ -438,11 +444,11 @@ class Puppet::SSL::StateMachine
         # sleeping, start over from the top
         NeedCACerts.new(@machine)
       elsif @machine.waitforlock < 1
-        LockFailure.new(@machine, _("Another puppet instance is already running and the waitforlock setting is set to 0; exiting"))
+        LockFailure.new(@machine, _("Another OpenVox instance is already running and the waitforlock setting is set to 0; exiting"))
       elsif Time.now.to_i >= @machine.waitlock_deadline
-        LockFailure.new(@machine, _("Another puppet instance is already running and the maxwaitforlock timeout has been exceeded; exiting"))
+        LockFailure.new(@machine, _("Another OpenVox instance is already running and the maxwaitforlock timeout has been exceeded; exiting"))
       else
-        Puppet.info _("Another puppet instance is already running; waiting for it to finish")
+        Puppet.info _("Another OpenVox instance is already running; waiting for it to finish")
         Puppet.info _("Will try again in %{time} seconds.") % { time: @machine.waitforlock }
         Kernel.sleep @machine.waitforlock
 

data/lib/puppet/syntax_checkers.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-# A name space for syntax checkers provided by Puppet.
+# A name space for syntax checkers provided by OpenVox.
 module Puppet::SyntaxCheckers
 end

data/lib/puppet/transaction/report.rb

@@ -58,7 +58,7 @@ class Puppet::Transaction::Report
   # The id of the job responsible for this run.
   attr_accessor :job_id
 
-  # A master generated catalog uuid, useful for connecting a single catalog to multiple reports.
+  # A server generated catalog uuid, useful for connecting a single catalog to multiple reports.
   attr_accessor :catalog_uuid
 
   # Whether a cached catalog was used in the run, and if so, the reason that it was used.
@@ -111,13 +111,13 @@ class Puppet::Transaction::Report
   #
   attr_reader :status
 
-  # @return [String] The Puppet version in String form.
+  # @return [String] The OpenVox version in String form.
   # @see Puppet::version()
   #
   attr_reader :puppet_version
 
   # @return [Integer] report format version number.  This value is constant for
-  #    a given version of Puppet; it is incremented when a new release of Puppet
+  #    a given version of OpenVox; it is incremented when a new release of OpenVox
   #    changes the API for the various objects that make up a report.
   #
   attr_reader :report_format

data/lib/puppet/transaction.rb

@@ -5,7 +5,6 @@ require_relative '../puppet/util/tagging'
 require_relative '../puppet/util/skip_tags'
 require_relative '../puppet/application'
 require 'digest/sha1'
-require 'set'
 
 # the class that actually walks our resource/property tree, collects the changes,
 # and performs them

data/lib/puppet/type/exec.rb

@@ -13,11 +13,11 @@ module Puppet
 
       * The command itself is already idempotent. (For example, `apt-get update`.)
       * The exec has an `onlyif`, `unless`, or `creates` attribute, which prevents
-        Puppet from running the command unless some condition is met. The
+        OpenVox from running the command unless some condition is met. The
         `onlyif` and `unless` commands of an `exec` are used in the process of
         determining whether the `exec` is already in sync, therefore they must be run
-        during a noop Puppet run.
-      * The exec has `refreshonly => true`, which allows Puppet to run the
+        during a noop OpenVox run.
+      * The exec has `refreshonly => true`, which allows OpenVox to run the
         command only when some other resource is changed. (See the notes on refreshing
         below.)
 
@@ -40,7 +40,7 @@ module Puppet
       consider developing a custom resource type instead, as it is much
       more predictable and maintainable.
 
-      **Duplication:** Even though `command` is the namevar, Puppet allows
+      **Duplication:** Even though `command` is the namevar, OpenVox allows
       multiple `exec` resources with the same `command` value.
 
       **Refresh:** `exec` resources can respond to refresh events (via
@@ -65,9 +65,9 @@ module Puppet
       In short: If there's a possibility of your exec receiving refresh events,
       it is extremely important to make sure the run conditions are restricted.
 
-      **Autorequires:** If Puppet is managing an exec's cwd or the executable
+      **Autorequires:** If OpenVox is managing an exec's cwd or the executable
       file used in an exec's command, the exec resource autorequires those
-      files. If Puppet is managing the user that an exec should run as, the
+      files. If OpenVox is managing the user that an exec should run as, the
       exec resource autorequires that user."
 
     # Create a new check mechanism.  It's basically a parameter that
@@ -109,13 +109,13 @@ module Puppet
         both the cmd.exe shell and the .NET runtime cast them to signed
         integers. This means some tools will report negative numbers for exit
         codes above 2147483647. (For example, cmd.exe reports 4294967295 as -1.)
-        Since Puppet uses the plain Win32 APIs, it will report the very large
+        Since OpenVox uses the plain Win32 APIs, it will report the very large
         number instead of the negative number, which might not be what you
         expect if you got the exit code from a cmd.exe session.
 
         Microsoft recommends against using negative/very large exit codes, and
         you should avoid them when possible. To convert a negative exit code to
-        the positive one Puppet will use, add it to 4294967296."
+        the positive one OpenVox will use, add it to 4294967296."
 
       # Make output a bit prettier
       def change_to_s(currentvalue, newvalue)
@@ -202,11 +202,11 @@ module Puppet
         (meaning its return code does not match the specified code) then
         any output is logged at the `err` log level.
 
-        Multiple `exec` resources can use the same `command` value; Puppet
+        Multiple `exec` resources can use the same `command` value; OpenVox
         only uses the resource title to ensure `exec`s are unique.
 
         On *nix platforms, the command can be specified as an array of
-        strings and Puppet will invoke it using the more secure method of
+        strings and OpenVox will invoke it using the more secure method of
         parameterized system calls. For example, rather than executing the
         malicious injected code, this command will echo it out:
 
@@ -236,10 +236,10 @@ module Puppet
     newparam(:user) do
       desc "The user to run the command as.
 
-        > **Note:** Puppet cannot execute commands as other users on Windows.
+        > **Note:** OpenVox cannot execute commands as other users on Windows.
 
         Note that if you use this attribute, any error output is not captured
-        due to a bug within Ruby. If you use Puppet to create this user, the
+        due to a bug within Ruby. If you use OpenVox to create this user, the
         exec automatically requires the user, as long as it is specified by
         name.
 
@@ -258,7 +258,7 @@ module Puppet
     newparam(:group) do
       desc "The group to run the command as.  This seems to work quite
         haphazardly on different platforms -- it is a platform issue
-        not a Ruby or Puppet one, since the same variety exists when
+        not a Ruby or OpenVox one, since the same variety exists when
         running commands as different users in the shell."
       # Validation is handled by the SUIDManager class.
     end
@@ -282,7 +282,7 @@ module Puppet
 
     newparam(:refresh) do
       desc "An alternate command to run when the `exec` receives a refresh event
-        from another resource. By default, Puppet runs the main command again.
+        from another resource. By default, OpenVox runs the main command again.
         For more details, see the notes about refresh behavior above, in the
         description for this resource type.
 
@@ -422,7 +422,7 @@ module Puppet
         A file to look for before running the command. The command will
         only run if the file **doesn't exist.**
 
-        This parameter doesn't cause Puppet to create a file; it is only
+        This parameter doesn't cause OpenVox to create a file; it is only
         useful if **the command itself** creates a file.
 
             exec { 'tar -xf /Volumes/nfs02/important.tar':
@@ -435,7 +435,7 @@ module Puppet
         `important.tar`. If it is ever deleted, the exec will bring it
         back by re-extracting the tarball. If `important.tar` does **not**
         actually contain `myfile`, the exec will keep running every time
-        Puppet runs.
+        OpenVox runs.
 
         This parameter can also take an array of files, and the command will
         not run if **any** of these files exist. Consider this example:
@@ -459,7 +459,7 @@ module Puppet
     newcheck(:unless) do
       desc <<-'EOT'
         A test command that checks the state of the target system and restricts
-        when the `exec` can run. If present, Puppet runs this test command
+        when the `exec` can run. If present, OpenVox runs this test command
         first, then runs the main command unless the test has an exit code of 0
         (success). For example:
 
@@ -476,7 +476,7 @@ module Puppet
         must fully qualify the command's name.
 
         Since this command is used in the process of determining whether the
-        `exec` is already in sync, it must be run during a noop Puppet run.
+        `exec` is already in sync, it must be run during a noop OpenVox run.
 
         This parameter can also take an array of commands. For example:
 
@@ -522,7 +522,7 @@ module Puppet
     newcheck(:onlyif) do
       desc <<-'EOT'
         A test command that checks the state of the target system and restricts
-        when the `exec` can run. If present, Puppet runs this test command
+        when the `exec` can run. If present, OpenVox runs this test command
         first, and only runs the main command if the test has an exit code of 0
         (success). For example:
 
@@ -539,7 +539,7 @@ module Puppet
         must fully qualify the command's name.
 
         Since this command is used in the process of determining whether the
-        `exec` is already in sync, it must be run during a noop Puppet run.
+        `exec` is already in sync, it must be run during a noop OpenVox run.
 
         This parameter can also take an array of commands. For example:
 

data/lib/puppet/type/file/content.rb

@@ -37,8 +37,8 @@ module Puppet
           }
 
       ...but for larger files, this attribute is more useful when combined with the
-      [template](https://puppet.com/docs/puppet/latest/function.html#template)
-      or [file](https://puppet.com/docs/puppet/latest/function.html#file)
+      [template](https://docs.openvoxproject.org/openvox/latest/function.html#template)
+      or [file](https://docs.openvoxproject.org/openvox/latest/function.html#file)
       function.
     EOT
 
@@ -47,24 +47,14 @@ module Puppet
     munge do |value|
       if value == :absent
         value
-      elsif value.is_a?(String) && checksum?(value)
-        # XXX This is potentially dangerous because it means users can't write a file whose
-        # entire contents are a plain checksum unless it is a Binary content.
-        Puppet.puppet_deprecation_warning([
-          # TRANSLATORS "content" is an attribute and should not be translated
-          _('Using a checksum in a file\'s "content" property is deprecated.'),
-          # TRANSLATORS "filebucket" is a resource type and should not be translated. The quoted occurrence of "content" is an attribute and should not be translated.
-          _('The ability to use a checksum to retrieve content from the filebucket using the "content" property will be removed in a future release.'),
-          # TRANSLATORS "content" is an attribute and should not be translated.
-          _('The literal value of the "content" property will be written to the file.'),
-          # TRANSLATORS "static catalogs" should not be translated.
-          _('The checksum retrieval functionality is being replaced by the use of static catalogs.'),
-          _('See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.')
-        ].join(" "),
-                                          :file => @resource.file,
-                                          :line => @resource.line) if !@actual_content && !resource.parameter(:source)
+      elsif value.is_a?(String) && checksum?(value) && (@actual_content || resource.parameter(:source))
+        # The actual content is already known, either because it was
+        # previously set or because it comes from a source, and the value is
+        # its checksum.
         value
       else
+        # The value is the desired file content, even if it happens to look
+        # like a checksum.
         @actual_content = value.is_a?(Puppet::Pops::Types::PBinaryType::Binary) ? value.binary_buffer : value
         resource.parameter(:checksum).sum(@actual_content)
       end
@@ -150,31 +140,14 @@ module Puppet
 
     private
 
-    # the content is munged so if it's a checksum source_or_content is nil
-    # unless the checksum indirectly comes from source
+    # actual_content is only nil when the munged value is a checksum of
+    # content that comes from a source
     def each_chunk_from
       if actual_content.is_a?(String)
         yield actual_content
-      elsif content_is_really_a_checksum? && actual_content.nil?
-        yield read_file_from_filebucket
       elsif actual_content.nil?
         yield ''
       end
     end
-
-    def content_is_really_a_checksum?
-      checksum?(should)
-    end
-
-    def read_file_from_filebucket
-      dipper = resource.bucket
-      raise "Could not get filebucket from file" unless dipper
-
-      sum = should.sub(/\{\w+\}/, '')
-
-      dipper.getfile(sum)
-    rescue => detail
-      self.fail Puppet::Error, "Could not retrieve content for #{should} from filebucket: #{detail}", detail
-    end
   end
 end

data/lib/puppet/type/file/ensure.rb

@@ -21,14 +21,14 @@ module Puppet
       * `link` ensures the file is a symlink, and **requires** that you also
         set the `target` attribute. Symlinks are supported on all Posix
         systems and on Windows Vista / 2008 and higher. On Windows, managing
-        symlinks requires Puppet agent's user account to have the "Create
+        symlinks requires the OpenVox agent's user account to have the "Create
         Symbolic Links" privilege; this can be configured in the "User Rights
-        Assignment" section in the Windows policy editor. By default, Puppet
+        Assignment" section in the Windows policy editor. By default, the OpenVox
         agent runs as the Administrator account, which has this privilege.
 
-      Puppet avoids destroying directories unless the `force` attribute is set
+      OpenVox avoids destroying directories unless the `force` attribute is set
       to `true`. This means that if a file is currently a directory, setting
-      `ensure` to anything but `directory` or `present` will cause Puppet to
+      `ensure` to anything but `directory` or `present` will cause OpenVox to
       skip managing the resource and log either a notice or an error.
 
       There is one other non-standard value for `ensure`. If you specify the
@@ -86,12 +86,21 @@ module Puppet
         raise Puppet::Error,
               "Cannot create #{@resource[:path]}; parent directory #{parent} does not exist"
       end
-      if mode
-        Puppet::Util.withumask(0o00) do
-          Dir.mkdir(@resource[:path], symbolic_mode_to_int(mode, 0o755, true))
+      begin
+        if mode
+          Puppet::Util.withumask(0o00) do
+            Dir.mkdir(@resource[:path], symbolic_mode_to_int(mode, 0o755, true))
+          end
+        else
+          Dir.mkdir(@resource[:path])
         end
-      else
-        Dir.mkdir(@resource[:path])
+      rescue Errno::EEXIST
+        # Another process may have created the directory concurrently. If it
+        # really is a directory now, treat that as success.
+        #
+        # Directory mode, and other properties, will be checked and enforced by
+        # the call to `property_fix`.
+        raise unless Puppet::FileSystem.directory?(@resource[:path])
       end
       @resource.send(:property_fix)
       return :directory_created

data/lib/puppet/type/file/mode.rb

@@ -14,7 +14,7 @@ module Puppet
       notation. This value **must** be specified as a string; do not use
       un-quoted numbers to represent file modes.
 
-      If the mode is omitted (or explicitly set to `undef`), Puppet does not
+      If the mode is omitted (or explicitly set to `undef`), OpenVox does not
       enforce permissions on existing files and creates new files with
       permissions of `0644`.
 
@@ -22,7 +22,7 @@ module Puppet
       them to equivalent permissions for systems which represent permissions
       differently, including Windows. For detailed ACL controls on Windows,
       you can leave `mode` unmanaged and use
-      [the puppetlabs/acl module.](https://forge.puppetlabs.com/puppetlabs/acl)
+      [the puppetlabs/acl module.](https://forge.puppet.com/puppetlabs/acl)
 
       Numeric modes should use the standard octal notation of
       `<SETUID/SETGID/STICKY><OWNER><GROUP><OTHER>` (for example, "0644").
@@ -32,10 +32,10 @@ module Puppet
         execute/search = 1.
       * The setuid/setgid/sticky digit is also a sum, where setuid = 4, setgid = 2,
         and sticky = 1.
-      * The setuid/setgid/sticky digit is optional. If it is absent, Puppet will
+      * The setuid/setgid/sticky digit is optional. If it is absent, OpenVox will
         clear any existing setuid/setgid/sticky permissions. (So to make your intent
         clear, you should use at least four digits for numeric modes.)
-      * When specifying numeric permissions for directories, Puppet sets the search
+      * When specifying numeric permissions for directories, OpenVox sets the search
         permission wherever the read permission is set.
 
       Symbolic modes should be represented as a string of comma-separated

data/lib/puppet/type/file/selcontext.rb

@@ -86,10 +86,10 @@ module Puppet
   end
 
   Puppet::Type.type(:file).newparam(:selinux_ignore_defaults) do
-    desc "If this is set, Puppet will not call the SELinux function selabel_lookup to
+    desc "If this is set, OpenVox will not call the SELinux function selabel_lookup to
       supply defaults for the SELinux attributes (seluser, selrole,
       seltype, and selrange). In general, you should leave this set at its
-      default and only set it to true when you need Puppet to not try to fix
+      default and only set it to true when you need OpenVox to not try to fix
       SELinux labels automatically."
     newvalues(:true, :false)