Rebrand Puppet Server -> OpenVox Server in docs and comments

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.

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"
 }
 

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.

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/.

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.

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

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]

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

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)