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

data/lib/puppet/http/service/compiler.rb

@@ -138,11 +138,11 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
   # @param [String] certname The name of the node for which to compile the catalog.
   # @param [Hash] persistent A hash containing two required keys, facts and catalog,
   #   which when set to true will cause the facts and reports to be stored in
-  #   PuppetDB, or discarded if set to false.
+  #   OpenVoxDB, or discarded if set to false.
   # @param [String] environment The name of the environment for which to compile the catalog.
   # @param [Hash] facts A hash with a required values key, containing a hash of all the
-  #    facts for the node. If not provided, Puppet will attempt to fetch facts for the node
-  #    from PuppetDB.
+  #    facts for the node. If not provided, OpenVox will attempt to fetch facts for the node
+  #    from OpenVoxDB.
   # @param [Hash] trusted_facts A hash with a required values key containing a hash of
   #    the trusted facts for a node
   # @param [String] transaction_uuid The id for tracking the catalog compilation and

data/lib/puppet/http/service/file_server.rb

@@ -78,7 +78,7 @@ class Puppet::HTTP::Service::FileServer < Puppet::HTTP::Service
   #   with `:recurselimit`. See the reference documentation for the file type
   #   for more details.
   # @param [Integer] recurselimit When `recurse` is set, `recurselimit` defines
-  #   how far Puppet should descend into subdirectories. `0` is effectively the
+  #   how far OpenVox should descend into subdirectories. `0` is effectively the
   #   same as `recurse => false`, `1` will return files and directories directly
   #   inside the defined directory, `2` will return the direct content of the
   #   directory as well as the contents of the _first_ level of subdirectories.

data/lib/puppet/http/service.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Represents an abstract Puppet web service.
+# Represents an abstract OpenVox web service.
 #
 # @abstract Subclass and implement methods for the service's REST APIs.
 # @api public
@@ -32,6 +32,24 @@ class Puppet::HTTP::Service
   #
   # @api private
   def self.create_service(client, session, name, server = nil, port = nil)
+    # this is the entry point for creating all services, check and issue warning here.
+    unless Puppet.settings.set_by_config? :server
+      if Puppet.features.root?
+        Puppet.deprecation_warning('OpenVox will not default to `server=puppet` as of version 9.0. Please update your configuration appropriately.')
+      else
+        Puppet.deprecation_warning('OpenVox no longer defaults to `server=puppet` when running as a non-privileged user. (Did you mean to run as root?)')
+
+        case name
+        when :ca
+          raise ArgumentError, 'Neither `server` nor `ca_server` is specified.' unless Puppet.settings.set_by_config? :ca_server
+        when :report
+          raise ArgumentError, 'Neither `server` nor `report_server` is specified.' unless Puppet.settings.set_by_config? :report_server
+        when :fileserver, :puppet, :puppetserver
+          raise ArgumentError, 'Required setting `server` is not specified.'
+        end
+      end
+    end
+
     case name
     when :ca
       Puppet::HTTP::Service::Ca.new(client, session, server, port)

data/lib/puppet/http/session.rb

@@ -35,7 +35,7 @@ class Puppet::HTTP::Session
   # port. Otherwise, we walk the list of resolvers in priority order:
   #     - DNS SRV
   #     - Server List
-  #     - Puppet server/port settings
+  #     - OpenVox server/port settings
   # If a given resolver fails to connect, it tries the next available resolver
   # until a successful connection is found and returned. The successful service
   # is cached and returned if `route_to` is called again.

data/lib/puppet/http.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Puppet
-  # Contains an HTTP client for making network requests to puppet and other
+  # Contains an HTTP client for making network requests to OpenVox and other
   # HTTP servers.
   #
   # @see Puppet::HTTP::Client

data/lib/puppet/indirector/catalog/compiler.rb

@@ -11,7 +11,7 @@ require 'yaml'
 require 'uri'
 
 class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
-  desc "Compiles catalogs on demand using Puppet's compiler."
+  desc "Compiles catalogs on demand using OpenVox's compiler."
 
   include Puppet::Util
   include Puppet::Util::Checksums
@@ -310,7 +310,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     if node.environment && node.environment.static_catalogs? && options[:static_catalog] && options[:code_id]
       # Check for errors before compiling the catalog
       checksum_type = common_checksum_type(options[:checksum_type])
-      raise Puppet::Error, _("Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'.") % { agent_type: options[:checksum_type], master_type: known_checksum_types } unless checksum_type
+      raise Puppet::Error, _("Unable to find a common checksum type between agent '%{agent_type}' and server '%{master_type}'.") % { agent_type: options[:checksum_type], master_type: known_checksum_types } unless checksum_type
     end
 
     escaped_node_name = node.name.gsub(/%/, '%%')

data/lib/puppet/indirector/data_binding/hiera.rb

@@ -1,8 +1,99 @@
 # frozen_string_literal: true
 
-require_relative '../../../puppet/indirector/hiera'
+require_relative '../../../puppet/indirector/code'
 require 'hiera/scope'
 
-class Puppet::DataBinding::Hiera < Puppet::Indirector::Hiera
+class Puppet::DataBinding::Hiera < Puppet::Indirector::Code
   desc "Retrieve data using Hiera."
+
+  def initialize(*args)
+    unless Puppet.features.hiera?
+      # TRANSLATORS "Hiera" is the name of a code library and should not be translated
+      raise _("Hiera terminus not supported without hiera library")
+    end
+
+    super
+  end
+
+  if defined?(::Psych::SyntaxError)
+    DATA_BINDING_EXCEPTIONS = [::StandardError, ::Psych::SyntaxError]
+  else
+    DATA_BINDING_EXCEPTIONS = [::StandardError]
+  end
+
+  def find(request)
+    not_found = Object.new
+    options = request.options
+    Puppet.debug { "Performing a hiera indirector lookup of #{request.key} with options #{options.inspect}" }
+    value = hiera.lookup(request.key, not_found, Hiera::Scope.new(options[:variables]), nil, convert_merge(options[:merge]))
+    throw :no_such_key if value.equal?(not_found)
+    value
+  rescue *DATA_BINDING_EXCEPTIONS => detail
+    error = Puppet::DataBinding::LookupError.new("DataBinding 'hiera': #{detail.message}")
+    error.set_backtrace(detail.backtrace)
+    raise error
+  end
+
+  private
+
+  # Converts a lookup 'merge' parameter argument into a Hiera 'resolution_type' argument.
+  #
+  # @param merge [String,Hash,nil] The lookup 'merge' argument
+  # @return [Symbol,Hash,nil] The Hiera 'resolution_type'
+  def convert_merge(merge)
+    case merge
+    when nil, 'first'
+      # Nil is OK. Defaults to Hiera :priority
+      nil
+    when Puppet::Pops::MergeStrategy
+      convert_merge(merge.configuration)
+    when 'unique'
+      # Equivalent to Hiera :array
+      :array
+    when 'hash'
+      # Equivalent to Hiera :hash with default :native merge behavior. A Hash must be passed here
+      # to override possible Hiera deep merge config settings.
+      { :behavior => :native }
+    when 'deep'
+      # Equivalent to Hiera :hash with :deeper merge behavior.
+      { :behavior => :deeper }
+    when Hash
+      strategy = merge['strategy']
+      if strategy == 'deep'
+        result = { :behavior => :deeper }
+        # Remaining entries must have symbolic keys
+        merge.each_pair { |k, v| result[k.to_sym] = v unless k == 'strategy' }
+        result
+      else
+        convert_merge(strategy)
+      end
+    else
+      # TRANSLATORS "merge" is a parameter name and should not be translated
+      raise Puppet::DataBinding::LookupError, _("Unrecognized value for request 'merge' parameter: '%{merge}'") % { merge: merge }
+    end
+  end
+
+  public
+
+  def self.hiera_config
+    hiera_config = Puppet.settings[:hiera_config]
+    config = {}
+
+    if Puppet::FileSystem.exist?(hiera_config)
+      config = Hiera::Config.load(hiera_config)
+    else
+      Puppet.warning _("Config file %{hiera_config} not found, using Hiera defaults") % { hiera_config: hiera_config }
+    end
+
+    config[:logger] = 'puppet'
+    config
+  end
+
+  def self.hiera
+    @hiera ||= Hiera.new(:config => hiera_config)
+  end
+
+  def hiera
+    self.class.hiera
+  end
 end

data/lib/puppet/indirector/face.rb

@@ -6,16 +6,16 @@ class Puppet::Indirector::Face < Puppet::Face
   option "--terminus _" + _("TERMINUS") do
     summary _("The indirector terminus to use.")
     description <<-EOT
-      Indirector faces expose indirected subsystems of Puppet. These
+      Indirector faces expose indirected subsystems of OpenVox. These
       subsystems are each able to retrieve and alter a specific type of data
       (with the familiar actions of `find`, `search`, `save`, and `destroy`)
-      from an arbitrary number of pluggable backends. In Puppet parlance,
+      from an arbitrary number of pluggable backends. In OpenVox parlance,
       these backends are called terminuses.
 
       Almost all indirected subsystems have a `rest` terminus that interacts
-      with the puppet master's data. Most of them have additional terminuses
+      with the OpenVox server's data. Most of them have additional terminuses
       for various local data models, which are in turn used by the indirected
-      subsystem on the puppet master whenever it receives a remote request.
+      subsystem on the OpenVox server whenever it receives a remote request.
 
       The terminus for an action is often determined by context, but
       occasionally needs to be set explicitly. See the "Notes" section of this

data/lib/puppet/indirector/facts/facter.rb

@@ -4,8 +4,8 @@ require_relative '../../../puppet/node/facts'
 require_relative '../../../puppet/indirector/code'
 
 class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
-  desc "Retrieve facts from Facter.  This provides a somewhat abstract interface
-    between Puppet and Facter.  It's only `somewhat` abstract because it always
+  desc "Retrieve facts from OpenFact.  This provides a somewhat abstract interface
+    between OpenVox and OpenFact.  It's only `somewhat` abstract because it always
     returns the local host's facts, regardless of what you attempt to find."
 
   def allow_remote_requests?
@@ -13,25 +13,25 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
   end
 
   def destroy(facts)
-    raise Puppet::DevError, _('You cannot destroy facts in the code store; it is only used for getting facts from Facter')
+    raise Puppet::DevError, _('You cannot destroy facts in the code store; it is only used for getting facts from OpenFact')
   end
 
   def save(facts)
-    raise Puppet::DevError, _('You cannot save facts to the code store; it is only used for getting facts from Facter')
+    raise Puppet::DevError, _('You cannot save facts to the code store; it is only used for getting facts from OpenFact')
   end
 
-  # Lookup a host's facts up in Facter.
+  # Lookup a host's facts up in OpenFact.
   def find(request)
     Puppet.runtime[:facter].reset
 
-    # Note: we need to setup puppet's external search paths before adding the puppetversion
+    # Note: we need to setup OpenVox's external search paths before adding the puppetversion
     # fact. This is because in Facter 2.x, the first `Puppet.runtime[:facter].add` causes Facter to create
     # its directory loaders which cannot be changed, meaning other external facts won't
     # be resolved. (PUP-4607)
     self.class.setup_external_search_paths(request)
     self.class.setup_search_paths(request)
 
-    # Initialize core Puppet facts, such as puppetversion
+    # Initialize core OpenVox facts, such as puppetversion
     Puppet.initialize_facts
 
     result = if request.options[:resolve_options]

data/lib/puppet/indirector/file_bucket_file/file.rb

@@ -121,7 +121,7 @@ module Puppet::FileBucketFile
     # @param files_original_path [String]
     #
     def matches(paths_file, files_original_path)
-      # Puppet will have already written the paths_file in the systems encoding
+      # OpenVox will have already written the paths_file in the systems encoding
       # given its possible that request.options[:bucket_path] or Puppet[:bucketdir]
       # contained characters in an encoding that are not represented the
       # same way when the bytes are decoded as UTF-8, continue using system encoding
@@ -157,7 +157,7 @@ module Puppet::FileBucketFile
           Puppet::FileSystem.dir_mkpath(paths_file)
         end
 
-        # Puppet will have already written the paths_file in the systems encoding
+        # OpenVox will have already written the paths_file in the systems encoding
         # given its possible that request.options[:bucket_path] or Puppet[:bucketdir]
         # contained characters in an encoding that are not represented the
         # same way when the bytes are decoded as UTF-8, continue using system encoding

data/lib/puppet/indirector/file_bucket_file/rest.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'uri'
 require_relative '../../../puppet/indirector/rest'
 require_relative '../../../puppet/file_bucket/file'
 
@@ -9,7 +10,8 @@ module Puppet::FileBucketFile
 
     def head(request)
       session = Puppet.lookup(:http_session)
-      api = session.route_to(:puppet)
+      url = URI::HTTPS.build(host: request.server, port: request.port) if request.server
+      api = session.route_to(:puppet, url: url)
       api.head_filebucket_file(
         request.key,
         environment: request.environment.to_s,
@@ -23,7 +25,8 @@ module Puppet::FileBucketFile
 
     def find(request)
       session = Puppet.lookup(:http_session)
-      api = session.route_to(:puppet)
+      url = URI::HTTPS.build(host: request.server, port: request.port) if request.server
+      api = session.route_to(:puppet, url: url)
       _, filebucket_file = api.get_filebucket_file(
         request.key,
         environment: request.environment.to_s,
@@ -40,7 +43,8 @@ module Puppet::FileBucketFile
 
     def save(request)
       session = Puppet.lookup(:http_session)
-      api = session.route_to(:puppet)
+      url = URI::HTTPS.build(host: request.server, port: request.port) if request.server
+      api = session.route_to(:puppet, url: url)
       api.put_filebucket_file(
         request.key,
         body: request.instance.render,

data/lib/puppet/indirector/file_content/file_server.rb

@@ -5,5 +5,5 @@ require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/file_server'
 
 class Puppet::Indirector::FileContent::FileServer < Puppet::Indirector::FileServer
-  desc "Retrieve file contents using Puppet's fileserver."
+  desc "Retrieve file contents using OpenVox's fileserver."
 end

data/lib/puppet/indirector/file_metadata/file_server.rb

@@ -5,5 +5,5 @@ require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/file_server'
 
 class Puppet::Indirector::FileMetadata::FileServer < Puppet::Indirector::FileServer
-  desc "Retrieve file metadata using Puppet's fileserver."
+  desc "Retrieve file metadata using OpenVox's fileserver."
 end

data/lib/puppet/indirector/node/exec.rb

@@ -5,7 +5,7 @@ require_relative '../../../puppet/indirector/exec'
 
 class Puppet::Node::Exec < Puppet::Indirector::Exec
   desc "Call an external program to get node information.  See
-  the [External Nodes](https://puppet.com/docs/puppet/latest/lang_write_functions_in_puppet.html) page for more information."
+  the [External Nodes](https://docs.openvoxproject.org/openvox/latest/lang_write_functions_in_puppet.html) page for more information."
   include Puppet::Util
 
   def command

data/lib/puppet/indirector/node/rest.rb

@@ -4,7 +4,7 @@ require_relative '../../../puppet/node'
 require_relative '../../../puppet/indirector/rest'
 
 class Puppet::Node::Rest < Puppet::Indirector::REST
-  desc "Get a node via REST. Puppet agent uses this to allow the puppet master
+  desc "Get a node via REST. OpenVox agent uses this to allow the OpenVox server
     to override its environment."
 
   def find(request)

data/lib/puppet/indirector/report/processor.rb

@@ -5,7 +5,7 @@ require_relative '../../../puppet/indirector/code'
 require_relative '../../../puppet/reports'
 
 class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
-  desc "Puppet's report processor.  Processes the report with each of
+  desc "OpenVox's report processor.  Processes the report with each of
     the report types listed in the 'reports' setting."
 
   def initialize

data/lib/puppet/indirector.rb

@@ -32,7 +32,7 @@ module Puppet::Indirector
   end
 
   # Declare that the including class indirects its methods to
-  # this terminus.  The terminus name must be the name of a Puppet
+  # this terminus.  The terminus name must be the name of an OpenVox
   # default, not the value -- if it's the value, then it gets
   # evaluated at parse time, which is before the user has had a chance
   # to override it.

data/lib/puppet/interface/documentation.rb

@@ -58,7 +58,7 @@ class Puppet::Interface
     # @dsl Faces
     attr_doc :summary do |value|
       value =~ /\n/ and
-        # TRANSLATORS 'Face' refers to a programming API in Puppet, 'summary' and 'description' are specifc attribute names and should not be translated
+        # TRANSLATORS 'Face' refers to a programming API in OpenVox, 'summary' and 'description' are specifc attribute names and should not be translated
         raise ArgumentError, _("Face summary should be a single line; put the long text in 'description' instead.")
       value
     end

data/lib/puppet/interface/face_collection.rb

@@ -131,7 +131,7 @@ module Puppet::Interface::FaceCollection
 
   def self.underscorize(name)
     unless name.to_s =~ /^[-_a-z][-_a-z0-9]*$/i then
-      # TRANSLATORS 'face' refers to a programming API in Puppet
+      # TRANSLATORS 'face' refers to a programming API in OpenVox
       raise ArgumentError, _("%{name} (%{class_name}) is not a valid face name") %
                            { name: name.inspect, class_name: name.class }
     end

data/lib/puppet/interface/option.rb

@@ -29,14 +29,14 @@ class Puppet::Interface::Option
         # for our duplicate checking purpose, we don't make a check with the
         # translated '-' -> '_'. Right now, we do that on purpose because of
         # a duplicated option made publicly available on certificate and ca
-        # faces for dns alt names. Puppet defines 'dns_alt_names', those
+        # faces for dns alt names. OpenVox defines 'dns_alt_names', those
         # faces include 'dns-alt-names'.  We can't get rid of 'dns-alt-names'
         # yet, so we need to do our duplicate checking on the untranslated
         # version of the option.
         # jeffweiss 17 april 2012
         name = optparse_to_optionname(item)
         if Puppet.settings.include? name then
-          raise ArgumentError, _("%{option}: already defined in puppet") % { option: item.inspect }
+          raise ArgumentError, _("%{option}: already defined in OpenVox") % { option: item.inspect }
         end
 
         dup = dups[name]

data/lib/puppet/module/task.rb

@@ -117,7 +117,7 @@ class Puppet::Module
         end
 
         unless MOUNTS.include? mount
-          msg = _("Files must be saved in module directories that Puppet makes available via mount points: %{mounts}" %
+          msg = _("Files must be saved in module directories that OpenVox makes available via mount points: %{mounts}" %
                   { mounts: MOUNTS.join(', ') })
           raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
         end

data/lib/puppet/module_tool/applications/application.rb

@@ -47,7 +47,7 @@ module Puppet::ModuleTool
         end
 
         if require_metadata && !Puppet::ModuleTool.is_module_root?(@path)
-          raise ArgumentError, _("Unable to find metadata.json in module root at %{path} See https://puppet.com/docs/puppet/latest/modules_publishing.html for required file format.") % { path: @path }
+          raise ArgumentError, _("Unable to find metadata.json in module root at %{path} See https://docs.openvoxproject.org/openvox/latest/modules_publishing.html for required file format.") % { path: @path }
         end
 
         metadata_path = File.join(@path, 'metadata.json')

data/lib/puppet/module_tool/metadata.rb

@@ -4,7 +4,6 @@ require_relative '../../puppet/module_tool'
 require_relative '../../puppet/network/format_support'
 require 'uri'
 require_relative '../../puppet/util/json'
-require 'set'
 
 module Puppet::ModuleTool
   # This class provides a data structure representing a module's metadata.
@@ -89,7 +88,7 @@ module Puppet::ModuleTool
       @data['dependencies'].to_a
     end
 
-    # Returns a hash of the module's metadata.  Used by Puppet's automated
+    # Returns a hash of the module's metadata.  Used by OpenVox's automated
     # serialization routines.
     #
     # @see Puppet::Network::FormatSupport#to_data_hash

data/lib/puppet/module_tool.rb

@@ -140,7 +140,7 @@ module Puppet
     #
     # Generally speaking, the `:modulepath` parameter should supersede all
     # others, the `:environment` parameter should follow after that, and we
-    # should default to Puppet's current environment.
+    # should default to OpenVox's current environment.
     #
     # @param options [{Symbol => Object}] the options to derive environment from
     # @return [Puppet::Node::Environment] the environment described by the options

data/lib/puppet/network/authorization.rb

@@ -8,7 +8,7 @@ module Puppet::Network
         @authconfigloader_class = klass
       end
 
-      # Verify something external to puppet is authorizing REST requests, so
+      # Verify something external to OpenVox is authorizing REST requests, so
       # we don't fail insecurely due to misconfiguration.
       def check_external_authorization(method, path)
         if @authconfigloader_class.nil?

data/lib/puppet/network/http/api.rb

@@ -15,13 +15,13 @@ class Puppet::Network::HTTP::API
     Puppet::Network::HTTP::Route
       .path(/.*/)
       .any(lambda do |_req, _res|
-        raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("Error: Invalid URL - Puppet expects requests that conform to the " \
+        raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("Error: Invalid URL - OpenVox expects requests that conform to the " \
                                                                   "/puppet and /puppet-ca APIs.\n\n" \
                                                                   "Note that Puppet 3 agents aren't compatible with this version; if you're " \
                                                                   "running Puppet 3, you must either upgrade your agents to match the server " \
                                                                   "or point them to a server running Puppet 3.\n\n" \
                                                                   "Server Info:\n" \
-                                                                  "  Puppet version: #{Puppet.version}\n" \
+                                                                  "  OpenVox version: #{Puppet.version}\n" \
                                                                   "  Supported /puppet API versions: #{Puppet::Network::HTTP::SERVER_URL_VERSIONS}\n",
                                                                   Puppet::Network::HTTP::Issues::HANDLER_NOT_FOUND)
       end)

data/lib/puppet/network/http/connection.rb

@@ -10,7 +10,7 @@ class Puppet::Network::HTTP::RedirectionLimitExceededException < Puppet::Error;
 # object, but it provides a few important bits of additional
 # functionality.  Notably:
 #
-# * Any HTTPS requests made using this class will use Puppet's SSL
+# * Any HTTPS requests made using this class will use OpenVox's SSL
 #   certificate configuration for their authentication, and
 # * Provides some useful error handling for any SSL errors that occur
 #   during a request.
@@ -88,7 +88,7 @@ class Puppet::Network::HTTP::Connection
   #   be thrown.
   #   @option options [Hash{Symbol => String}] :basic_auth The basic auth
   #     :username and :password to use for the request, :metric_id Ignored
-  #     by this class - used by Puppet Server only. The metric id by which
+  #     by this class - used by OpenVox Server only. The metric id by which
   #     to track metrics on requests.
 
   # @param path [String]

data/lib/puppet/node/environment.rb

@@ -206,10 +206,10 @@ class Puppet::Node::Environment
   end
 
   # Checks to make sure that this environment did not have a manifest set in
-  # its original environment.conf if Puppet is configured with
+  # its original environment.conf if OpenVox is configured with
   # +disable_per_environment_manifest+ set true.  If it did, the environment's
   # modules may not function as intended by the original authors, and we may
-  # seek to halt a puppet compilation for a node in this environment.
+  # seek to halt an OpenVox compilation for a node in this environment.
   #
   # The only exception to this would be if the environment.conf manifest is an exact,
   # uninterpolated match for the current +default_manifest+ setting.
@@ -272,7 +272,7 @@ class Puppet::Node::Environment
     @rich_data = rich_data_from_env_conf.nil? ? Puppet[:rich_data] : rich_data_from_env_conf
   end
 
-  # Return an environment-specific Puppet setting.
+  # Return an environment-specific OpenVox setting.
   #
   # @api public
   #
@@ -571,11 +571,11 @@ class Puppet::Node::Environment
   #
   # There are two sources that can be used for the initial parse:
   #
-  #   1. The value of `Puppet[:code]`: Puppet can take a string from
+  #   1. The value of `Puppet[:code]`: OpenVox can take a string from
   #     its settings and parse that as a manifest. This is used by various
-  #     Puppet applications to read in a manifest and pass it to the
+  #     OpenVox applications to read in a manifest and pass it to the
   #     environment as a side effect. This is attempted first.
-  #   2. The contents of this environment's +manifest+ attribute: Puppet will
+  #   2. The contents of this environment's +manifest+ attribute: OpenVox will
   #     try to load the environment manifest.
   #
   # @return [Puppet::Parser::AST::Hostclass] The AST hostclass object

data/lib/puppet/node.rb

@@ -208,7 +208,7 @@ class Puppet::Node
   #
   def sanitize
     # Resurrect "trusted information" that comes from node/fact terminus.
-    # The current way this is done in puppet db (currently the only one)
+    # The current way this is done in OpenVoxDB (currently the only one)
     # is to store the node parameter 'trusted' as a hash of the trusted information.
     #
     # Thus here there are two main cases:
@@ -217,7 +217,7 @@ class Puppet::Node
     # 2  It is a command line call with a given node that use a terminus that:
     # 2.1 does not include a 'trusted' fact - use local from node trusted information
     # 2.2 has a 'trusted' fact - this in turn could be
-    # 2.2.1 puppet db having stored trusted node data as a fact (not a great design)
+    # 2.2.1 OpenVoxDB having stored trusted node data as a fact (not a great design)
     # 2.2.2 some other terminus having stored a fact called "trusted" (most likely that would have failed earlier, but could
     #       be spoofed).
     #

data/lib/puppet/pal/catalog_compiler.rb

@@ -97,7 +97,7 @@ module Pal
       internal_compiler.evaluate_additions
     end
 
-    # Attempts to evaluate AST for node defnintions https://puppet.com/docs/puppet/latest/lang_node_definitions.html
+    # Attempts to evaluate AST for node defnintions https://docs.openvoxproject.org/openvox/latest/lang_node_definitions.html
     # if there are any.
     def evaluate_ast_node
       internal_compiler.evaluate_ast_node

data/lib/puppet/pal/pal_impl.rb

@@ -107,30 +107,6 @@ module Pal
     Puppet[:code] = previous_code_value
   end
 
-  # Evaluates a Puppet Language script string.
-  # @param code_string [String] a snippet of Puppet Language source code
-  # @return [Object] what the Puppet Language code_string evaluates to
-  # @deprecated Use {#with_script_compiler} and then evaluate_string on the given compiler - to be removed in 1.0 version
-  #
-  def self.evaluate_script_string(code_string)
-    # prevent the default loading of Puppet[:manifest] which is the environment's manifest-dir by default settings
-    # by setting code_string to 'undef'
-    with_script_compiler do |compiler|
-      compiler.evaluate_string(code_string)
-    end
-  end
-
-  # Evaluates a Puppet Language script (.pp) file.
-  # @param manifest_file [String] a file with Puppet Language source code
-  # @return [Object] what the Puppet Language manifest_file contents evaluates to
-  # @deprecated Use {#with_script_compiler} and then evaluate_file on the given compiler - to be removed in 1.0 version
-  #
-  def self.evaluate_script_manifest(manifest_file)
-    with_script_compiler do |compiler|
-      compiler.evaluate_file(manifest_file)
-    end
-  end
-
   # Defines a context in which multiple operations in an env with a catalog producing compiler can be performed
   # in a given block.
   # The calls that takes place to PAL inside of the given block are all with the same instance of the compiler.
@@ -411,7 +387,7 @@ module Pal
       $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
     end
 
-    # Puppet requires Facter, which initializes its lookup paths. Reset Facter to
+    # OpenVox requires OpenFact, which initializes its lookup paths. Reset OpenFact to
     # pickup the new $LOAD_PATH.
     Puppet.runtime[:facter].reset
 

data/lib/puppet/parser/compiler.rb

@@ -28,7 +28,7 @@ class Puppet::Parser::Compiler
       errors.each { |e| Puppet.err(e) } if errors.size > 1
       errmsg = [
         _("Compilation has been halted because: %{error}") % { error: errors.first },
-        _("For more information, see https://puppet.com/docs/puppet/latest/environments_about.html")
+        _("For more information, see https://docs.openvoxproject.org/openvox/latest/environments_about.html")
       ]
       raise(Puppet::Error, errmsg.join(' '))
     end