From 0d5672ce6dc3f8d032a1f9b28c37f89c20d9cfc9 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Sat, 1 Aug 2026 15:42:18 +0000 Subject: [PATCH] Rebrand Puppet Server -> OpenVox Server in docs and comments Apply the same treatment as OpenVoxProject/openvox#530 to user-facing prose in this repository: - Rebrand "Puppet Server" -> "OpenVox Server" and "Puppet" (the product) -> "OpenVox" in the README, documentation pointer, shipped and dev config file comments, Clojure docstrings and comments, Java and embedded Ruby comments, and log/warning messages (including i18n/trs strings; the locales/*.pot catalog will need regeneration). - Rebrand prose Facter -> OpenFact and puppet-agent (AIO package) -> openvox-agent where they name the product in comments. - Neutralize the remaining Puppet Enterprise reference. - Point documentation/README.md at https://docs.openvoxproject.org/openvox-server/latest/. - Update RSpec and clojure.test assertions/descriptions that reference the changed strings, plus the acceptance check for the startup log message. Deliberately unchanged: the puppetserver CLI/service/package name, Clojure namespaces and service/protocol names, HTTP API routes and X-Puppet-* headers, config file names/settings and file paths, Ruby Puppet:: namespaces and Puppet[:setting] code, the "Puppet Server Internal Certificate" Netscape comment value embedded in certificates, Puppet Labs OID attribution, historical version references (Puppet 3.x/4/6/8, Puppet Server 2.0/2.1), Puppet language/DSL references, CHANGELOG, LICENSE/copyright lines, generated locale catalogs, and the legacy upstream-targeting acceptance harness. Co-Authored-By: Claude Fable 5 Signed-off-by: Steven Pritchard --- README.md | 2 +- .../subcommand/foreground.rb | 2 +- dev/puppetserver.conf | 6 +- documentation/README.md | 4 +- ext/thread_test/puppetserver.conf | 10 +-- locales/puppetserver.pot | 63 ++++--------------- resources/ext/config/conf.d/puppetserver.conf | 14 ++--- .../puppet/jvm/config_spec.rb | 2 +- .../puppet/jvm/puppet_config_spec.rb | 2 +- .../puppetserver/certificate_authority.clj | 40 ++++++------ .../config/puppet_server_config_core.clj | 12 ++-- .../config/puppet_server_config_service.clj | 2 +- .../services/jruby/jruby_puppet_core.clj | 2 +- .../services/jruby/jruby_puppet_schemas.clj | 14 ++--- .../services/master/master_core.clj | 8 +-- .../services/master/master_service.clj | 2 +- .../services/protocols/puppet_profiler.clj | 4 +- .../protocols/puppet_server_config.clj | 2 +- .../puppet_admin/puppet_admin_core.clj | 2 +- .../request_handler/request_handler_core.clj | 6 +- .../puppetserver/MetricsPuppetProfiler.java | 4 +- .../puppetserver/PuppetProfiler.java | 2 +- .../puppet/server/auth_config.rb | 6 +- .../puppet/server/auth_config_loader.rb | 6 +- .../puppet/server/auth_provider.rb | 6 +- .../puppetserver-lib/puppet/server/config.rb | 2 +- .../puppet/server/http_client.rb | 2 +- .../puppet/server/jvm_profiler.rb | 2 +- .../puppetserver-lib/puppet/server/logger.rb | 2 +- .../puppetserver-lib/puppet/server/master.rb | 2 +- .../puppet/server/puppet_config.rb | 8 +-- .../puppetserver/bootstrap_testutils.clj | 2 +- .../services/master/master_service_test.clj | 4 +- .../puppet_server_config_service_test.clj | 4 +- .../request_handler_core_test.clj | 2 +- 35 files changed, 107 insertions(+), 146 deletions(-) diff --git a/README.md b/README.md index 266a8261f..f1c2dee33 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ developer, you should definitely check it out! [JRuby](http://jruby.org/) is an implementation of the Ruby programming language that runs on the JVM. It's a fantastic project, and the bridge that allows us to -run Puppet Ruby code while taking advantage of the JVM's advanced features and +run OpenVox Ruby code while taking advantage of the JVM's advanced features and libraries. We're very grateful to the developers for building such a great product and for helping us work through a few bugs that we've discovered along the way. diff --git a/acceptance/suites/tests/010-puppetserver-cli/subcommand/foreground.rb b/acceptance/suites/tests/010-puppetserver-cli/subcommand/foreground.rb index 876693ec2..c2a52a1ca 100644 --- a/acceptance/suites/tests/010-puppetserver-cli/subcommand/foreground.rb +++ b/acceptance/suites/tests/010-puppetserver-cli/subcommand/foreground.rb @@ -11,7 +11,7 @@ / DEBUG .*Debug logging enabled/ => "Debug logging isn't enabled", /Initializing the JRuby service/ => "JRuby didn't initialize", /Starting web server/ => "Expected web server to start", - /Puppet Server has successfully started and is now ready to handle requests/ => "puppetserver never finished starting", + /OpenVox Server has successfully started and is now ready to handle requests/ => "puppetserver never finished starting", /Beginning shutdown sequence/ => "Test ended without puppetserver triggering shutdown" } diff --git a/dev/puppetserver.conf b/dev/puppetserver.conf index abd7b7733..a026d9b19 100644 --- a/dev/puppetserver.conf +++ b/dev/puppetserver.conf @@ -43,8 +43,8 @@ web-router-service: { # configuration for the JRuby interpreters jruby-puppet: { - # Where the puppet-agent dependency places puppet, facter, etc... - # Puppet server expects to load Puppet from this location + # Where the openvox-agent dependency places puppet, facter, etc... + # OpenVox Server expects to load OpenVox from this location ruby-load-path: [./ruby/puppet/lib, ./ruby/facter/lib, ./ruby/hiera/lib, ./ruby/resource_api/lib] # This setting determines where JRuby will install gems. It is used for loading gems, @@ -92,7 +92,7 @@ jruby-puppet: { # instance-creation-concurrency: 1 } -# Settings related to HTTP client requests made by Puppet Server. +# Settings related to HTTP client requests made by OpenVox Server. # These settings only apply to client connections using the Puppet::Network::HttpPool # classes. Client connections using net/http or net/https directly will not be # configured with these settings automatically. diff --git a/documentation/README.md b/documentation/README.md index 89773aa5e..039543d9c 100644 --- a/documentation/README.md +++ b/documentation/README.md @@ -1,5 +1,5 @@ ## Docs have moved! -Puppetserver's markdown for documentation has moved to https://github.com/puppetlabs/osp-docs. Please file a ticket in the SERVER JIRA project to request changes. +OpenVox Server's documentation is maintained separately from this repository. -Published docs can be found at https://puppet.com/docs/puppet/latest/server/about_server.html. +Published docs can be found at https://docs.openvoxproject.org/openvox-server/latest/. diff --git a/ext/thread_test/puppetserver.conf b/ext/thread_test/puppetserver.conf index b06f82aee..ab6f74fb1 100644 --- a/ext/thread_test/puppetserver.conf +++ b/ext/thread_test/puppetserver.conf @@ -42,8 +42,8 @@ web-router-service: { # configuration for the JRuby interpreters jruby-puppet: { - # Where the puppet-agent dependency places puppet, facter, etc... - # Puppet server expects to load Puppet from this location + # Where the openvox-agent dependency places puppet, facter, etc... + # OpenVox Server expects to load OpenVox from this location ruby-load-path: [./ruby/puppet/lib, ./ruby/facter/lib, ./ruby/hiera/lib, ./ruby/resource_api/lib] # This setting determines where JRuby will install gems. It is used for loading gems, @@ -73,9 +73,9 @@ jruby-puppet: { # (optional) maximum number of JRuby instances to allow max-active-instances: 2 - # (optional) Authorize access to Puppet master endpoints via rules + # (optional) Authorize access to OpenVox master endpoints via rules # specified in the legacy Puppet auth.conf file (if true) or via rules - # specified in the Puppet Server HOCON-formatted auth.conf (if false or not + # specified in the OpenVox Server HOCON-formatted auth.conf (if false or not # specified). #use-legacy-auth-conf: true @@ -92,7 +92,7 @@ jruby-puppet: { multithreaded: true } -# Settings related to HTTP client requests made by Puppet Server. +# Settings related to HTTP client requests made by OpenVox Server. # These settings only apply to client connections using the Puppet::Network::HttpPool # classes. Client connections using net/http or net/https directly will not be # configured with these settings automatically. diff --git a/locales/puppetserver.pot b/locales/puppetserver.pot index 07d5ddf6a..f1f01bac8 100644 --- a/locales/puppetserver.pot +++ b/locales/puppetserver.pot @@ -7,7 +7,6 @@ msgid "" msgstr "" "Project-Id-Version: puppetlabs.puppetserver \n" -"X-Git-Ref: 6efb46b8c2a4a58988e2ed260a1243495df48272\n" "Report-Msgid-Bugs-To: docs@puppet.com\n" "POT-Creation-Date: \n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" @@ -21,8 +20,8 @@ msgstr "" #: src/clj/puppetlabs/puppetserver/certificate_authority.clj msgid "" -"Detected ca-ttl setting in CA config which will take precedence over puppet." -"conf setting" +"Detected ca-ttl setting in CA config which will take precedence over " +"puppet.conf setting" msgstr "" #: src/clj/puppetlabs/puppetserver/certificate_authority.clj @@ -127,7 +126,7 @@ msgid "" msgstr "" #: src/clj/puppetlabs/puppetserver/certificate_authority.clj -msgid "Failed to find certificate for Puppet Infrastructure Node: {0}" +msgid "Failed to find certificate for OpenVox Infrastructure Node: {0}" msgstr "" #: src/clj/puppetlabs/puppetserver/certificate_authority.clj @@ -239,7 +238,7 @@ msgid "Recent changes to the CRL may not have taken effect." msgstr "" #: src/clj/puppetlabs/puppetserver/certificate_authority.clj -msgid "To load the updated CRL, reload or restart the Puppet Server service." +msgid "To load the updated CRL, reload or restart the OpenVox Server service." msgstr "" #: src/clj/puppetlabs/puppetserver/certificate_authority.clj @@ -556,44 +555,6 @@ msgstr "" msgid "Access to {0} rejected; no client certificate found" msgstr "" -#: src/clj/puppetlabs/services/analytics/analytics_service.clj -msgid "Running dropsonde" -msgstr "" - -#: src/clj/puppetlabs/services/analytics/analytics_service.clj -msgid "dropsonde run complete" -msgstr "" - -#: src/clj/puppetlabs/services/analytics/analytics_service.clj -msgid "Failed while running dropsonde" -msgstr "" - -#: src/clj/puppetlabs/services/analytics/analytics_service.clj -msgid "Failed to check for product updates" -msgstr "" - -#: src/clj/puppetlabs/services/analytics/analytics_service.clj -msgid "Not checking for updates - opt-out setting exists" -msgstr "" - -#: src/clj/puppetlabs/services/analytics/analytics_service.clj -msgid "" -"Puppet Server Update Service has successfully started and will run in the " -"background" -msgstr "" - -#: src/clj/puppetlabs/services/analytics/analytics_service.clj -msgid "Puppet Server Update Service shutting down" -msgstr "" - -#: src/clj/puppetlabs/services/analytics/dropsonde.clj -msgid "Successfully submitted module metrics via Dropsonde." -msgstr "" - -#: src/clj/puppetlabs/services/analytics/dropsonde.clj -msgid "Failed to submit module metrics via Dropsonde. Error: {0}" -msgstr "" - #: src/clj/puppetlabs/services/ca/certificate_authority_core.clj msgid "Could not find certificate {0}" msgstr "" @@ -724,15 +685,15 @@ msgid "" msgstr "" #: src/clj/puppetlabs/services/config/puppet_server_config_core.clj -msgid "Not overriding webserver settings with values from core Puppet" +msgid "Not overriding webserver settings with values from core OpenVox" msgstr "" #: src/clj/puppetlabs/services/config/puppet_server_config_core.clj -msgid "Initializing webserver settings from core Puppet" +msgid "Initializing webserver settings from core OpenVox" msgstr "" #: src/clj/puppetlabs/services/config/puppet_server_config_service.clj -msgid "Initializing with the following settings from core Puppet:" +msgid "Initializing with the following settings from core OpenVox:" msgstr "" #: src/clj/puppetlabs/services/jruby/jruby_metrics_core.clj @@ -889,8 +850,8 @@ msgstr "" #: src/clj/puppetlabs/services/master/master_core.clj msgid "" -"Puppet Server requires at least {0}MB of available RAM given this heap size, " -"computed as 1.1 * max heap (-Xmx)." +"OpenVox Server requires at least {0}MB of available RAM given this heap " +"size, computed as 1.1 * max heap (-Xmx)." msgstr "" #: src/clj/puppetlabs/services/master/master_core.clj @@ -905,11 +866,11 @@ msgid "Route not found for service {0}" msgstr "" #: src/clj/puppetlabs/services/master/master_service.clj -msgid "JDK {0} is neither tested nor supported. Please use JDK 11 or 17" +msgid "JDK {0} is neither tested nor supported. Please use JDK 21 or 25" msgstr "" #: src/clj/puppetlabs/services/master/master_service.clj -msgid "JDK {0} is deprecated, please upgrade to JDK 11 or 17" +msgid "JDK {0} is deprecated, please upgrade to JDK 21 or 25" msgstr "" #: src/clj/puppetlabs/services/master/master_service.clj @@ -922,7 +883,7 @@ msgstr "" #: src/clj/puppetlabs/services/master/master_service.clj msgid "" -"Puppet Server has successfully started and is now ready to handle requests" +"OpenVox Server has successfully started and is now ready to handle requests" msgstr "" #: src/clj/puppetlabs/services/puppet_admin/puppet_admin_service.clj diff --git a/resources/ext/config/conf.d/puppetserver.conf b/resources/ext/config/conf.d/puppetserver.conf index f13099f2d..45866ad91 100644 --- a/resources/ext/config/conf.d/puppetserver.conf +++ b/resources/ext/config/conf.d/puppetserver.conf @@ -1,7 +1,7 @@ # configuration for the JRuby interpreters jruby-puppet: { - # Where the puppet-agent dependency places puppet, facter, etc... - # Puppet server expects to load Puppet from this location + # Where the openvox-agent dependency places puppet, facter, etc... + # OpenVox Server expects to load OpenVox from this location ruby-load-path: [/opt/puppetlabs/puppet/lib/ruby/vendor_ruby] # This setting determines where JRuby will install gems. It is used for loading gems, @@ -14,13 +14,13 @@ jruby-puppet: { gem-path: [${jruby-puppet.gem-home}, "/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems", "/opt/puppetlabs/puppet/lib/ruby/vendor_gems"] # PLEASE NOTE: Use caution when modifying the below settings. Modifying - # these settings will change the value of the corresponding Puppet settings - # for Puppet Server, but not for the Puppet CLI tools. This likely will not + # these settings will change the value of the corresponding OpenVox settings + # for OpenVox Server, but not for the OpenVox CLI tools. This likely will not # be a problem with server-var-dir, server-run-dir, or server-log-dir unless # some critical setting in puppet.conf is interpolating the value of one # of the corresponding settings, but it is important that any changes made to - # server-conf-dir and server-code-dir are also made to the corresponding Puppet - # settings when running the Puppet CLI tools. See + # server-conf-dir and server-code-dir are also made to the corresponding OpenVox + # settings when running the OpenVox CLI tools. See # https://docs.openvoxproject.org/openvox-server/latest/config_file_puppetserver.html#settings # for more information. @@ -52,7 +52,7 @@ jruby-puppet: { # track-lookups: true } -# settings related to HTTPS client requests made by Puppet Server +# settings related to HTTPS client requests made by OpenVox Server http-client: { # A list of acceptable protocols for making HTTPS requests #ssl-protocols: [TLSv1.3, TLSv1.2] diff --git a/spec/puppet-server-lib/puppet/jvm/config_spec.rb b/spec/puppet-server-lib/puppet/jvm/config_spec.rb index e10d40379..9fd05e842 100644 --- a/spec/puppet-server-lib/puppet/jvm/config_spec.rb +++ b/spec/puppet-server-lib/puppet/jvm/config_spec.rb @@ -46,7 +46,7 @@ Puppet[:ssl_trust_store] = "spec/fixtures/foo.pem" allow(File).to receive(:exist?).and_return(false) - expect(Puppet).to receive(:warning).with(/Could not find Puppet-vendored keystore/) + expect(Puppet).to receive(:warning).with(/Could not find OpenVox-vendored keystore/) expect(Puppet).to receive(:warning).with(/The 'ssl_trust_store' setting does not refer to a file/) Puppet::Server::Config.puppet_and_system_ssl_context diff --git a/spec/puppet-server-lib/puppet/jvm/puppet_config_spec.rb b/spec/puppet-server-lib/puppet/jvm/puppet_config_spec.rb index f0db90bbd..77461c58f 100644 --- a/spec/puppet-server-lib/puppet/jvm/puppet_config_spec.rb +++ b/spec/puppet-server-lib/puppet/jvm/puppet_config_spec.rb @@ -3,7 +3,7 @@ require 'puppet/server/puppet_config' describe 'Puppet::Server::PuppetConfig' do - context "initializing Puppet Server" do + context "initializing OpenVox Server" do context "setting the Puppet log level from logback" do let(:logger) do double("Logger", isDebugEnabled: false, isInfoEnabled: true, isWarnEnabled: false, isErrorEnabled: false) diff --git a/src/clj/puppetlabs/puppetserver/certificate_authority.clj b/src/clj/puppetlabs/puppetserver/certificate_authority.clj index 7ef3ee9b8..2c6f2ca6d 100644 --- a/src/clj/puppetlabs/puppetserver/certificate_authority.clj +++ b/src/clj/puppetlabs/puppetserver/certificate_authority.clj @@ -89,10 +89,10 @@ (schema/cond-pre schema/Int schema/Str)) (def MasterSettings - "Settings from Puppet that are necessary for SSL initialization on the master. + "Settings from OpenVox that are necessary for SSL initialization on the master. Most of these are files and directories within the SSL directory, excluding the CA directory and its contents; see `CaSettings` for more information. - All of these are Puppet configuration settings." + All of these are OpenVox configuration settings." {:certdir schema/Str :dns-alt-names schema/Str :hostcert schema/Str @@ -121,9 +121,9 @@ (schema/pred positive-integer? 'positive-integer?)) (def CaSettings - "Settings from Puppet that are necessary for CA initialization - and request handling during normal Puppet operation. - Most of these are Puppet configuration settings." + "Settings from OpenVox that are necessary for CA initialization + and request handling during normal OpenVox operation. + Most of these are OpenVox configuration settings." {:access-control (schema/maybe AccessControl) :allow-authorization-extensions schema/Bool :allow-duplicate-certs schema/Bool @@ -617,7 +617,7 @@ "Returns the next serial number to be used when signing a certificate request. Reads the serial number as a hex value from the given file and replaces the contents of `serial-file` with the next serial number for a subsequent call. - Puppet's $serial setting defines the location of the serial number file." + OpenVox's $serial setting defines the location of the serial number file." [{:keys [serial serial-lock serial-lock-timeout-seconds] :as ca-settings} :- CaSettings] (common/with-safe-write-lock serial-lock serial-lock-descriptor serial-lock-timeout-seconds (let [serial-number (get-serial-number! ca-settings)] @@ -747,8 +747,8 @@ (schema/defn ^:always-validate write-cert-to-inventory-unlocked! - "Writes an entry into Puppet's inventory file for a given certificate. - The location of this file is defined by Puppet's 'cert_inventory' setting. + "Writes an entry into OpenVox's inventory file for a given certificate. + The location of this file is defined by OpenVox's 'cert_inventory' setting. The inventory is a text file where each line represents a certificate in the following format: $SN $NB $NA /$S @@ -781,8 +781,8 @@ (schema/defn ^:always-validate write-cert-to-inventory! "Same behavior as `write-cert-to-inventory-unlocked! but acquires the inventory lock prior to doing the work. - Writes an entry into Puppet's inventory file for a given certificate. - The location of this file is defined by Puppet's 'cert_inventory' setting. + Writes an entry into OpenVox's inventory file for a given certificate. + The location of this file is defined by OpenVox's 'cert_inventory' setting. The inventory is a text file where each line represents a certificate in the following format: $SN $NB $NA /$S @@ -968,7 +968,7 @@ (recur (rest local-infra-nodes) (conj augmented-results serial))) (do - (log/warn (i18n/trs "Failed to find certificate for Puppet Infrastructure Node: {0}" infra-node)) + (log/warn (i18n/trs "Failed to find certificate for OpenVox Infrastructure Node: {0}" infra-node)) (recur (rest local-infra-nodes) augmented-results)))) ;; ensure they are unique and ordered so the end result is stable @@ -1364,7 +1364,7 @@ (i18n/trs "Recent changes to the CRL may not have taken effect.") (i18n/trs - "To load the updated CRL, reload or restart the Puppet Server service."))) + "To load the updated CRL, reload or restart the OpenVox Server service."))) (do (Thread/sleep 100) (recur (dec attempts-left))))))))))) @@ -1431,7 +1431,7 @@ standard-err, and exit code. The subject will be passed in as input, and the CSR stream will be provided on standard-in. The ruby-load-path will be prepended to the RUBYLIB found in the environment, and is intended to make - the Puppet and Facter Ruby libraries available to the autosign script. + the OpenVox and OpenFact Ruby libraries available to the autosign script. All output (stdout & stderr) will be logged at the debug level. Warnings are issued for nonzero exit code or if stderr is generated by the autosign script." @@ -1472,7 +1472,7 @@ (schema/defn ^:always-validate config->ca-settings :- CaSettings - "Given the configuration map from the Puppet Server config + "Given the configuration map from the OpenVox Server config service return a map with of all the CA settings." [{:keys [puppetserver jruby-puppet certificate-authority authorization]}] (let [merged (-> (select-keys puppetserver (keys CaSettings)) @@ -1493,7 +1493,7 @@ (schema/defn ^:always-validate config->master-settings :- MasterSettings - "Given the configuration map from the Puppet Server config + "Given the configuration map from the OpenVox Server config service return a map with of all the master settings." [{:keys [puppetserver]}] (select-keys puppetserver (keys MasterSettings))) @@ -1548,7 +1548,7 @@ (schema/defn ^:always-validate autosign-csr? :- schema/Bool "Return true if the CSR should be automatically signed given - Puppet's autosign setting, and false otherwise." + OpenVox's autosign setting, and false otherwise." ([autosign :- AutoSignInput subject :- schema/Str csr-stream :- InputStream] @@ -1667,7 +1667,7 @@ (schema/defn ^:always-validate autosign-certificate-request! "Given a subject name, their certificate request, and the CA settings - from Puppet, auto-sign the request and write the certificate to disk." + from OpenVox, auto-sign the request and write the certificate to disk." [subject :- schema/Str csr :- CertificateRequest {:keys [cacert cakey signeddir ca-ttl allow-auto-renewal auto-renewal-cert-ttl] :as ca-settings} :- CaSettings @@ -1816,7 +1816,7 @@ (schema/defn ^:always-validate get-certificate-revocation-list :- schema/Str - "Given the value of the 'cacrl' setting from Puppet, + "Given the value of the 'cacrl' setting from OpenVox, return the CRL from the .pem file on disk." [cacrl :- schema/Str lock :- ReentrantReadWriteLock @@ -1881,7 +1881,7 @@ (schema/defn ^:always-validate maybe-replace-crl :- CertificateRevocationList "Given a CRL and a map of key identifiers to CRLs, determine the newest CRL with the key-id of the given CRL. Warn if the newest CRL - is the given CRL. Never replaces the CRL corresponding to the Puppet + is the given CRL. Never replaces the CRL corresponding to the OpenVox CA signing cert." [crl :- CertificateRevocationList key-crl-map :- {KeyIdExtension [CertificateRevocationList]}] @@ -2104,7 +2104,7 @@ (autosign-certificate-request! subject (utils/pem->csr csr-path) settings report-activity))) (schema/defn filter-already-revoked-serials :- [BigInteger] - "Given a list of serials and Puppet's CA CRL, returns vector of serials with + "Given a list of serials and OpenVox's CA CRL, returns vector of serials with any already-revoked serials removed." [serials :- [BigInteger] crl :- X509CRL] diff --git a/src/clj/puppetlabs/services/config/puppet_server_config_core.clj b/src/clj/puppetlabs/services/config/puppet_server_config_core.clj index abee4072a..41f0f4351 100644 --- a/src/clj/puppetlabs/services/config/puppet_server_config_core.clj +++ b/src/clj/puppetlabs/services/config/puppet_server_config_core.clj @@ -29,7 +29,7 @@ :certdir :certname :cert-inventory - :codedir ; This is not actually needed in Puppet Server, but it's needed in PE (file sync) + :codedir ; This is not actually needed in OpenVox Server, but is kept for compatibility (upstream file sync used it) :csrdir :csr-attributes :dns-alt-names @@ -58,9 +58,9 @@ (defn get-puppet-config-value "For a given keyword `k`, returns the configuration value (setting) from - JRubyPuppet. Returns `nil` if Puppet does not have a setting for the given + JRubyPuppet. Returns `nil` if OpenVox does not have a setting for the given key. The keyword will be converted into the appropriate format before it is - passed to Puppet - for example, if you want the value of Puppet's + passed to OpenVox - for example, if you want the value of OpenVox's 'autoflush' setting, pass in `:autoflush`." [jruby-puppet k] {:pre [(keyword? k)]} @@ -77,7 +77,7 @@ ;; Schemas (def Config - "Represents valid configuration data from Puppet. Ensures that + "Represents valid configuration data from OpenVox. Ensures that * all config keys are present in the map, and there is a non-nil value for each key. * :puppet-version is present." @@ -117,7 +117,7 @@ :ssl-ca-cert localcacert :ssl-crl-path hostcrl}] (if (some #((key %) webserver-settings) overrides) - (log/info (i18n/trs "Not overriding webserver settings with values from core Puppet")) + (log/info (i18n/trs "Not overriding webserver settings with values from core OpenVox")) (do - (log/info (i18n/trs "Initializing webserver settings from core Puppet")) + (log/info (i18n/trs "Initializing webserver settings from core OpenVox")) (override-webserver-settings! overrides))))) diff --git a/src/clj/puppetlabs/services/config/puppet_server_config_service.clj b/src/clj/puppetlabs/services/config/puppet_server_config_service.clj index 110aa7857..2dc08341d 100644 --- a/src/clj/puppetlabs/services/config/puppet_server_config_service.clj +++ b/src/clj/puppetlabs/services/config/puppet_server_config_service.clj @@ -23,7 +23,7 @@ (core/validate-tk-config! tk-config) (let [jruby-service (tk-services/get-service this :JRubyPuppetService) puppet-config (core/get-puppet-config jruby-service)] - (log/debug (format "%s\n%s" (i18n/trs "Initializing with the following settings from core Puppet:") (ks/pprint-to-string puppet-config))) + (log/debug (format "%s\n%s" (i18n/trs "Initializing with the following settings from core OpenVox:") (ks/pprint-to-string puppet-config))) (core/init-webserver! override-webserver-settings! (get-in tk-config [:webserver :puppet-server] diff --git a/src/clj/puppetlabs/services/jruby/jruby_puppet_core.clj b/src/clj/puppetlabs/services/jruby/jruby_puppet_core.clj index dd2302d22..29fc61667 100644 --- a/src/clj/puppetlabs/services/jruby/jruby_puppet_core.clj +++ b/src/clj/puppetlabs/services/jruby/jruby_puppet_core.clj @@ -74,7 +74,7 @@ (schema/defn ^:always-validate config->puppet-config :- HashMap "Given the raw jruby-puppet configuration section, return a - HashMap with the configuration necessary for ruby Puppet." + HashMap with the configuration necessary for ruby OpenVox." [config :- jruby-puppet-schemas/JRubyPuppetConfig] (let [puppet-config (new HashMap)] (doseq [[setting-name dir] [[:server-conf-dir "confdir"] diff --git a/src/clj/puppetlabs/services/jruby/jruby_puppet_schemas.clj b/src/clj/puppetlabs/services/jruby/jruby_puppet_schemas.clj index f9ece945c..9ffcc2066 100644 --- a/src/clj/puppetlabs/services/jruby/jruby_puppet_schemas.clj +++ b/src/clj/puppetlabs/services/jruby/jruby_puppet_schemas.clj @@ -9,26 +9,26 @@ The keys should have the following values: - * :server-conf-dir - file path to Puppet Server's conf dir; + * :server-conf-dir - file path to OpenVox Server's conf dir; if not specified, will use the puppet default. - * :server-code-dir - file path to Puppet Server's code dir; + * :server-code-dir - file path to OpenVox Server's code dir; if not specified, will use the puppet default. - * :server-var-dir - path to the Puppet Server's var dir; + * :server-var-dir - path to the OpenVox Server's var dir; if not specified, will use the puppet default. - * :server-run-dir - path to the Puppet Server's run dir; + * :server-run-dir - path to the OpenVox Server's run dir; if not specified, will use the puppet default. - * :server-log-dir - path to the Puppet Server's log dir; + * :server-log-dir - path to the OpenVox Server's log dir; if not specified, will use the puppet default. * :track-lookups - a boolean to turn on tracking hiera lookups during compilation; if not specified, no tracking is enabled. - * :disable-i18n - a boolean to pass to Puppet to control whether or not to translate; - if not specified or false, the flag is not passed to Puppet's initialization. + * :disable-i18n - a boolean to pass to OpenVox to control whether or not to translate; + if not specified or false, the flag is not passed to OpenVox's initialization. * :http-client-ssl-protocols - A list of legal SSL protocols that may be used when https client requests are made. diff --git a/src/clj/puppetlabs/services/master/master_core.clj b/src/clj/puppetlabs/services/master/master_core.clj index 981d59cda..1489499c6 100644 --- a/src/clj/puppetlabs/services/master/master_core.clj +++ b/src/clj/puppetlabs/services/master/master_core.clj @@ -249,7 +249,7 @@ ;; used at the time this code was written (9.2.10), however, did not have this ;; logic to strip the "--gzip" characters from the incoming header. This ;; function compensates for that by stripping the characters here - before - ;; other Puppet Server code would use it. When/if Puppet Server is upgraded to + ;; other OpenVox Server code would use it. When/if OpenVox Server is upgraded to ;; a version of trapperkeeper-webserver-jetty9 which is based on Jetty 9.3.x ;; or newer, it may be safe to take out the line that removes the '--gzip' ;; characters. @@ -353,7 +353,7 @@ file-id (:name file-data) size (fs/size file) sha256 (ks/file->sha256 (io/file file)) - ;; we trust the file path from Puppet, so extract the relative path info from the file + ;; we trust the file path from OpenVox, so extract the relative path info from the file [module-root module-name mount relative-path] (task-file-uri-components file-id file) static-path (str/join "/" [module-root module-name mount relative-path]) uri (try @@ -841,7 +841,7 @@ (schema/defn ^:always-validate valid-static-file-path? "Helper function to decide if a static_file_content path is valid. - The access here is designed to mimic Puppet's file_content endpoint." + The access here is designed to mimic OpenVox's file_content endpoint." [path :- schema/Str] ;; Here, keywords represent a single element in the path. Anything between two '/' counts. ;; The second vector takes anything else that might be on the end of the path. @@ -1200,7 +1200,7 @@ (throw (Error. (format "%s %s %s" (i18n/trs "Not enough available RAM ({0}MB) to safely accommodate the configured JVM heap size of {1}MB." (int (/ mem-size 1024.0)) (int (/ heap-size 1024.0))) - (i18n/trs "Puppet Server requires at least {0}MB of available RAM given this heap size, computed as 1.1 * max heap (-Xmx)." (int (/ required-mem-size 1024.0))) + (i18n/trs "OpenVox Server requires at least {0}MB of available RAM given this heap size, computed as 1.1 * max heap (-Xmx)." (int (/ required-mem-size 1024.0))) (i18n/trs "Either increase available memory or decrease the configured heap size by reducing the -Xms and -Xmx values in JAVA_ARGS in /etc/sysconfig/puppetserver on EL systems or /etc/default/puppetserver on Debian systems.")))))))) (defn register-gauge! diff --git a/src/clj/puppetlabs/services/master/master_service.clj b/src/clj/puppetlabs/services/master/master_service.clj index a3928c154..2a4f63b98 100644 --- a/src/clj/puppetlabs/services/master/master_service.clj +++ b/src/clj/puppetlabs/services/master/master_service.clj @@ -209,7 +209,7 @@ (start [this context] (signal-ready! (tk-services/service-id this)) - (log/info (i18n/trs "Puppet Server has successfully started and is now ready to handle requests")) + (log/info (i18n/trs "OpenVox Server has successfully started and is now ready to handle requests")) context) (add-metric-ids-to-http-client-metrics-list! diff --git a/src/clj/puppetlabs/services/protocols/puppet_profiler.clj b/src/clj/puppetlabs/services/protocols/puppet_profiler.clj index 3085c4144..b0895bdc0 100644 --- a/src/clj/puppetlabs/services/protocols/puppet_profiler.clj +++ b/src/clj/puppetlabs/services/protocols/puppet_profiler.clj @@ -2,7 +2,7 @@ (defprotocol PuppetProfilerService "This protocol describes a service that provides a profiler that - can be used to profile the internals of the Puppet ruby code." + can be used to profile the internals of the OpenVox ruby code." (get-profiler [this] "Returns an instance of `com.puppetlabs.master.PuppetProfiler` that - can be used by the ruby Puppet profiling system.")) \ No newline at end of file + can be used by the ruby OpenVox profiling system.")) \ No newline at end of file diff --git a/src/clj/puppetlabs/services/protocols/puppet_server_config.clj b/src/clj/puppetlabs/services/protocols/puppet_server_config.clj index 3d61e9efe..2b741b903 100644 --- a/src/clj/puppetlabs/services/protocols/puppet_server_config.clj +++ b/src/clj/puppetlabs/services/protocols/puppet_server_config.clj @@ -3,7 +3,7 @@ (defprotocol PuppetServerConfigService "The configuration service for puppetserver. This is built on top of Trapperkeeper's normal configuration service. It adds a few features - - most importantly, it merges in settings from the Puppet's 'settings' in ruby. + most importantly, it merges in settings from OpenVox's 'settings' in ruby. It also adds a set of required configuration values and validates them during service initialization. diff --git a/src/clj/puppetlabs/services/puppet_admin/puppet_admin_core.clj b/src/clj/puppetlabs/services/puppet_admin/puppet_admin_core.clj index 39803fc84..2841780d1 100644 --- a/src/clj/puppetlabs/services/puppet_admin/puppet_admin_core.clj +++ b/src/clj/puppetlabs/services/puppet_admin/puppet_admin_core.clj @@ -101,7 +101,7 @@ (schema/defn ^:always-validate config->puppet-admin-settings :- (schema/maybe PuppetAdminSettings) - "Given the full Puppet Server config map, extract and return the Puppet + "Given the full OpenVox Server config map, extract and return the Puppet Admin web service settings." [config] (:puppet-admin config)) diff --git a/src/clj/puppetlabs/services/request_handler/request_handler_core.clj b/src/clj/puppetlabs/services/request_handler/request_handler_core.clj index f06b6c94f..4cdaeba4c 100644 --- a/src/clj/puppetlabs/services/request_handler/request_handler_core.clj +++ b/src/clj/puppetlabs/services/request_handler/request_handler_core.clj @@ -24,7 +24,7 @@ "x-client-cert") (defn unmunge-http-header-name - "Given the value of a Puppet setting which contains a munged HTTP header name, + "Given the value of an OpenVox setting which contains a munged HTTP header name, convert it to the actual header name in all lower-case." [setting] (->> (string/split setting #"_") @@ -33,7 +33,7 @@ string/lower-case)) (defn config->request-handler-settings - "Given an entire Puppet Server configuration map, return only those keys + "Given an entire OpenVox Server configuration map, return only those keys which are required by the request handler service." [{:keys [puppetserver master]}] {:allow-header-cert-info (true? (:allow-header-cert-info master)) @@ -209,7 +209,7 @@ JRuby, so I don't think there's any way around this. * It also extracts the client DN and certificate and includes that in the map it returns, because it's needed by the ruby layer. It is - possible that the HTTPS termination has happened external to Puppet + possible that the HTTPS termination has happened external to OpenVox Server. If so, then the DN, authentication status, and, optionally, the certificate will be provided by HTTP headers." [config request] diff --git a/src/java/com/puppetlabs/puppetserver/MetricsPuppetProfiler.java b/src/java/com/puppetlabs/puppetserver/MetricsPuppetProfiler.java index 4ffd8a0db..0eff3ea47 100644 --- a/src/java/com/puppetlabs/puppetserver/MetricsPuppetProfiler.java +++ b/src/java/com/puppetlabs/puppetserver/MetricsPuppetProfiler.java @@ -165,9 +165,9 @@ private boolean shouldTime(String[] metric_id) { return false; } if ((metric_id.length > 0) && (metric_id[0].equals("http"))) { - // Puppet contains some metrics that are intended to time http requests. We have + // OpenVox contains some metrics that are intended to time http requests. We have // more comprehensive metrics for this in our ring middleware, so we skip the - // ones from Puppet. + // ones from OpenVox. return false; } return true; diff --git a/src/java/com/puppetlabs/puppetserver/PuppetProfiler.java b/src/java/com/puppetlabs/puppetserver/PuppetProfiler.java index 080cd3c02..b54ad09f9 100644 --- a/src/java/com/puppetlabs/puppetserver/PuppetProfiler.java +++ b/src/java/com/puppetlabs/puppetserver/PuppetProfiler.java @@ -3,7 +3,7 @@ /** * This interface specifies Java method signatures that map to the API of the * Ruby Puppet Profiler. JVM implementations of this interface can be wired in - * to the Puppet Server and used to provide profiling support. + * to the OpenVox Server and used to provide profiling support. */ public interface PuppetProfiler { Object start(String message, String[] metric_id); diff --git a/src/ruby/puppetserver-lib/puppet/server/auth_config.rb b/src/ruby/puppetserver-lib/puppet/server/auth_config.rb index 126dd6140..478eb72bb 100644 --- a/src/ruby/puppetserver-lib/puppet/server/auth_config.rb +++ b/src/ruby/puppetserver-lib/puppet/server/auth_config.rb @@ -1,8 +1,8 @@ -## This is a "dummy" AuthConfig that Puppet Server registers with core -## Puppet for cases where Puppet Server decides that it should be in charge of +## This is a "dummy" AuthConfig that OpenVox Server registers with core +## OpenVox for cases where OpenVox Server decides that it should be in charge of ## authorizing requests at the Clojure / Ring handler level - depending upon ## the configuration of the 'use_legacy_auth_conf' setting - and not core -## Puppet. +## OpenVox. class Puppet::Server::AuthConfig def initialize diff --git a/src/ruby/puppetserver-lib/puppet/server/auth_config_loader.rb b/src/ruby/puppetserver-lib/puppet/server/auth_config_loader.rb index f7f3a1215..2a0f88938 100644 --- a/src/ruby/puppetserver-lib/puppet/server/auth_config_loader.rb +++ b/src/ruby/puppetserver-lib/puppet/server/auth_config_loader.rb @@ -1,8 +1,8 @@ -## This is a "dummy" AuthConfigLoader that Puppet Server registers with core -## Puppet for cases where Puppet Server decides that it should be in charge of +## This is a "dummy" AuthConfigLoader that OpenVox Server registers with core +## OpenVox for cases where OpenVox Server decides that it should be in charge of ## authorizing requests at the Clojure / Ring handler level - depending upon ## the configuration of the 'use_legacy_auth_conf' setting - and not core -## Puppet. +## OpenVox. require 'puppet/server/auth_config' diff --git a/src/ruby/puppetserver-lib/puppet/server/auth_provider.rb b/src/ruby/puppetserver-lib/puppet/server/auth_provider.rb index 850ad4377..dbf2cac9a 100644 --- a/src/ruby/puppetserver-lib/puppet/server/auth_provider.rb +++ b/src/ruby/puppetserver-lib/puppet/server/auth_provider.rb @@ -1,8 +1,8 @@ -## This is a "dummy" AuthProvider that Puppet Server registers with core -## Puppet for cases where Puppet Server decides that it should be in charge of +## This is a "dummy" AuthProvider that OpenVox Server registers with core +## OpenVox for cases where OpenVox Server decides that it should be in charge of ## authorizing requests at the Clojure / Ring handler level - depending upon ## the configuration of the 'use_legacy_auth_conf' setting - and not core -## Puppet. +## OpenVox. class Puppet::Server::AuthProvider def initialize(rights) diff --git a/src/ruby/puppetserver-lib/puppet/server/config.rb b/src/ruby/puppetserver-lib/puppet/server/config.rb index 097adbaff..a9c714178 100644 --- a/src/ruby/puppetserver-lib/puppet/server/config.rb +++ b/src/ruby/puppetserver-lib/puppet/server/config.rb @@ -83,7 +83,7 @@ def self.load_puppet_and_system_ssl_context if File.exist?(PUPPET_KEYSTORE_LOCATION) associate_entries(truststore, PUPPET_KEYSTORE_LOCATION) else - Puppet.warning("Could not find Puppet-vendored keystore at '#{PUPPET_KEYSTORE_LOCATION}'") + Puppet.warning("Could not find OpenVox-vendored keystore at '#{PUPPET_KEYSTORE_LOCATION}'") end if additional_store_location = Puppet[:ssl_trust_store] diff --git a/src/ruby/puppetserver-lib/puppet/server/http_client.rb b/src/ruby/puppetserver-lib/puppet/server/http_client.rb index 40d8a1209..ef17de381 100644 --- a/src/ruby/puppetserver-lib/puppet/server/http_client.rb +++ b/src/ruby/puppetserver-lib/puppet/server/http_client.rb @@ -41,7 +41,7 @@ def self.settings end def initialize(options = {}) - # NOTE: Unlike Puppet's HTTP client implementation, the Java HttpAsyncClient + # NOTE: Unlike OpenVox's HTTP client implementation, the Java HttpAsyncClient # does not support retries in the version we are using, so the `retry_limit` # option will be ignored if passed. # diff --git a/src/ruby/puppetserver-lib/puppet/server/jvm_profiler.rb b/src/ruby/puppetserver-lib/puppet/server/jvm_profiler.rb index 4d292d081..71ac3d80f 100644 --- a/src/ruby/puppetserver-lib/puppet/server/jvm_profiler.rb +++ b/src/ruby/puppetserver-lib/puppet/server/jvm_profiler.rb @@ -1,6 +1,6 @@ require 'java' -# A wrapper class that implements Puppet's profiler API by passing calls +# A wrapper class that implements OpenVox's profiler API by passing calls # through to a Java/JVM-based implementation. module Puppet module Server diff --git a/src/ruby/puppetserver-lib/puppet/server/logger.rb b/src/ruby/puppetserver-lib/puppet/server/logger.rb index db2b7194a..e263e44d0 100644 --- a/src/ruby/puppetserver-lib/puppet/server/logger.rb +++ b/src/ruby/puppetserver-lib/puppet/server/logger.rb @@ -31,7 +31,7 @@ def self.init_logging Puppet::Util::Log.newdestination(:logback) end - # @note This must be called after Puppet settings are configured; otherwise + # @note This must be called after OpenVox settings are configured; otherwise # the default log level will overwrite this setting. def self.set_log_level_from_logback Puppet[:log_level] = level_from_logback(get_logger) diff --git a/src/ruby/puppetserver-lib/puppet/server/master.rb b/src/ruby/puppetserver-lib/puppet/server/master.rb index ad45a50da..eaddc45c9 100644 --- a/src/ruby/puppetserver-lib/puppet/server/master.rb +++ b/src/ruby/puppetserver-lib/puppet/server/master.rb @@ -43,7 +43,7 @@ def initialize(puppet_config, puppet_server_config) multithreaded = puppet_server_config.delete('multithreaded') Puppet::Server::Config.initialize_puppet_server(puppet_server_config) Puppet::Server::PuppetConfig.initialize_puppet(puppet_config: puppet_config) - # Tell Puppet's network layer which routes we are willing to handle - which is + # Tell OpenVox's network layer which routes we are willing to handle - which is # the server routes, not the CA routes. # There are SERVER variants of this constant in Puppet > 7.4, but we should # continue to use this one until Puppet 8 for backwards compatibility. diff --git a/src/ruby/puppetserver-lib/puppet/server/puppet_config.rb b/src/ruby/puppetserver-lib/puppet/server/puppet_config.rb index b9fde88aa..a512e98b1 100644 --- a/src/ruby/puppetserver-lib/puppet/server/puppet_config.rb +++ b/src/ruby/puppetserver-lib/puppet/server/puppet_config.rb @@ -13,7 +13,7 @@ class Puppet::Server::PuppetConfig # Configure the Puppet.settings object # @param puppet_config [Hash] Hash of puppet settings - # @param require_config [Boolean] controls loading of Puppet configuration files + # @param require_config [Boolean] controls loading of OpenVox configuration files # @param push_global_settings [Boolean] controls push to global context after settings object initialization # @return [void] def self.initialize_puppet_settings(puppet_config:, require_config:, push_settings_globally:) @@ -73,7 +73,7 @@ def self.initialize_puppet_settings(puppet_config:, require_config:, push_settin # This `initialize_puppet` method should only run during the initialization # of the Puppet::Server::Master class. Beyond the Puppet.settings configuration, - # it configures additional state for Puppet to begin compilations. + # it configures additional state for OpenVox to begin compilations. def self.initialize_puppet(puppet_config:) initialize_puppet_settings(puppet_config: puppet_config, require_config: true, @@ -81,7 +81,7 @@ def self.initialize_puppet(puppet_config:) Puppet::ApplicationSupport.push_application_context(Puppet::Util::RunMode[:server]) - # Puppet's https machinery expects to find an object at + # OpenVox's https machinery expects to find an object at # `Puppet.lookup(:ssl_context)` which it will then use as an input # to the Verifier, which is passed to the client. We ignore these # values when passed to our https client and manage our SSLContext @@ -96,7 +96,7 @@ def self.initialize_puppet(puppet_config:) end # We have now added support for setting "settings_catalog" to false in the puppet.conf. - # We should default to not applying the settings catalog and remove this line in Puppet 9. + # We should default to not applying the settings catalog and remove this line in OpenVox 9. Puppet.settings.use :main, :server, :ssl, :metrics if Puppet::Indirector::Indirection.method_defined?(:set_global_setting) diff --git a/test/integration/puppetlabs/puppetserver/bootstrap_testutils.clj b/test/integration/puppetlabs/puppetserver/bootstrap_testutils.clj index 898ab60ae..93a63ebc8 100644 --- a/test/integration/puppetlabs/puppetserver/bootstrap_testutils.clj +++ b/test/integration/puppetlabs/puppetserver/bootstrap_testutils.clj @@ -196,7 +196,7 @@ certname ca-map 1000 - ;; Set this artificially lower than default 4K that Puppet Server uses + ;; Set this artificially lower than default 4K that OpenVox Server uses ;; just to make it a bit faster. Key size is presumed not to matter ;; for the core functionality in any tests that use this. {:keylength 1024}))) diff --git a/test/integration/puppetlabs/services/master/master_service_test.clj b/test/integration/puppetlabs/services/master/master_service_test.clj index b45f50ce1..0c1059a2e 100644 --- a/test/integration/puppetlabs/services/master/master_service_test.clj +++ b/test/integration/puppetlabs/services/master/master_service_test.clj @@ -711,10 +711,10 @@ facts.to_json") response (http-put "/puppet/v3/facts/puppet.node.test?environment=production" facts)] - (testing "Puppet Server responds to PUT requests for /puppet/v3/facts" + (testing "OpenVox Server responds to PUT requests for /puppet/v3/facts" (is (= 200 (:status response)))) - (testing "Puppet Server saves facts to the configured facts terminus" + (testing "OpenVox Server saves facts to the configured facts terminus" ;; Ensure the test is configured properly (is (= "yaml" (.runScriptlet container "Puppet::Node::Facts.indirection.terminus_class"))) (let [stored-facts (-> (.runScriptlet container "facts = Puppet::Node::Facts.indirection.find('puppet.node.test') diff --git a/test/unit/puppetlabs/services/config/puppet_server_config_service_test.clj b/test/unit/puppetlabs/services/config/puppet_server_config_service_test.clj index def75b30c..15ddaca4e 100644 --- a/test/unit/puppetlabs/services/config/puppet_server_config_service_test.clj +++ b/test/unit/puppetlabs/services/config/puppet_server_config_service_test.clj @@ -169,7 +169,7 @@ app (service-and-deps-with-mock-jruby config) config - (is (logged? #"Not overriding webserver settings with values from core Puppet")))))) + (is (logged? #"Not overriding webserver settings with values from core OpenVox")))))) (testing "webserver settings not overridden when single webserver is provided and full ssl cert configuration is available" (let [config (assoc required-config :webserver webserver-config)] @@ -178,4 +178,4 @@ app (service-and-deps-with-mock-jruby config) config - (is (logged? #"Not overriding webserver settings with values from core Puppet")))))))) + (is (logged? #"Not overriding webserver settings with values from core OpenVox")))))))) diff --git a/test/unit/puppetlabs/services/request_handler/request_handler_core_test.clj b/test/unit/puppetlabs/services/request_handler/request_handler_core_test.clj index f4ea2423d..8292cbfa0 100644 --- a/test/unit/puppetlabs/services/request_handler/request_handler_core_test.clj +++ b/test/unit/puppetlabs/services/request_handler/request_handler_core_test.clj @@ -175,7 +175,7 @@ (deftest cert-info-in-headers (testing - "In the case where Puppet Server is running under HTTP with an upstream HTTPS + "In the case where OpenVox Server is running under HTTP with an upstream HTTPS terminator, the cert's CN, cert, and authenticated status will be provided as HTTP headers. If cert info is not provided in the headers but is available via SSL, the SSL info will be used."