Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ configurations) based on a centralized specification.
## Documentation

As of now, OpenVox is effectively the same as the original Puppet™️ packages, aside from some minor build pipeline changes and package renaming.
This means that aside from the installation, all Puppet™️ docs and tutorials will still be completely applicable.
This means that aside from the installation, most existing Puppet™️ docs and tutorials will still be applicable.
As the OpenVox project matures, we will create more documentation, guides, and tutorials.
For the time being though, now you’ll want to hop over to [the OpenVox documentation](https://docs.openvoxproject.org/) and go from there.
Documentation is available at [the OpenVox documentation site](https://docs.openvoxproject.org/).

### HTTP API

Expand Down
5 changes: 0 additions & 5 deletions api/docs/http_api_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ The V1 and V2 APIs were removed in Puppet 4.0.0. The routes that were previously
under `/` or `/v2.0` can now be found under the [`/puppet/v3`](#puppet-v3-http-api)
API or [`/puppet-ca/v1`](#ca-v1-http-api) API.

Starting with version 2.1, the Puppet Server 2.x series provides both the
current and previous API endpoints, and can serve nodes running Puppet agent 3.x
and 4.x. However, Rack servers, WEBrick servers, and Puppet Server 2.0 cannot
serve nodes running Puppet 3.x.

Puppet and Puppet CA APIs
------------------

Expand Down
6 changes: 3 additions & 3 deletions docs/http.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ result, it's hard for clients to build higher level abstractions.

### SSL Trust Stores

OpenVox only trusts the puppet PKI when connecting to puppet infrastructure, but
OpenVox only trusts the OpenVox PKI when connecting to OpenVox infrastructure, but
needs to additionally trust the system cert store for requests like PMT and
downloading files from https sources. However, the current API doesn't allow the
caller to do that, which is why `Puppet::Util::HttpProxy#request_with_redirects`
Expand Down Expand Up @@ -270,9 +270,9 @@ end

OpenVox ruby code running in puppetserver sometimes make outbound connections
such as the [puppetdb
terminus](https://github.com/puppetlabs/puppetdb/blob/6.5.0/puppet/lib/puppet/util/puppetdb/http.rb#L138)
terminus](https://github.com/OpenVoxProject/openvoxdb/blob/main/puppet/lib/puppet/util/puppetdb/http.rb)
and ['http' report
processor](https://github.com/puppetlabs/puppet/blob/6.7.0/lib/puppet/reports/http.rb#L32).
processor](https://github.com/OpenVoxProject/openvox/blob/main/lib/puppet/reports/http.rb).
Currently, puppetserver registers its own http client class, so that it can
perform the HTTP request using Apache HttpClient.

Expand Down
2 changes: 1 addition & 1 deletion docs/rspec_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ found in the project Gemfile.

## OpenVox Continuous integration

* GitHub Actions (spec tests only): https://github.com/OpenVoxProject/openvox/actions
* GitHub Actions: https://github.com/OpenVoxProject/openvox/actions

## RSpec

Expand Down
2 changes: 1 addition & 1 deletion docs/unicode.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# UTF-8 Handling #

Now that OpenVox only supports Ruby 1.9+, developers should be aware
Developers should be aware
of how Ruby handles Strings and Regexp objects. Specifically, every
instance of these two classes will have an encoding attribute determined
in a number of ways.
Expand Down
8 changes: 4 additions & 4 deletions lib/puppet/application/agent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,9 @@ def help
OpenVox agent accepts the following signals:

* SIGHUP:
Restart the puppet agent daemon.
Restart the OpenVox agent daemon.
* SIGINT and SIGTERM:
Shut down the puppet agent daemon.
Shut down the OpenVox agent daemon.
* SIGUSR1:
Immediately retrieve and apply configurations from the OpenVox server.
* SIGUSR2:
Expand All @@ -364,8 +364,8 @@ def help

COPYRIGHT
---------
Copyright (c) 2011 Puppet Inc.
Copyright (c) 2024 Vox Pupuli
Copyright (c) 2011 Puppet Inc.;
Copyright (c) 2024 Vox Pupuli.
Licensed under the Apache 2.0 License

HELP
Expand Down
6 changes: 3 additions & 3 deletions lib/puppet/application/apply.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def help
differences. When combined with scheduling and an automated system for
pushing manifests, this can be used to implement a serverless site.

Most users should use 'puppet agent' and 'puppet server' for site-wide
Most users should use 'puppet agent' with an OpenVox server for site-wide
manifests.


Expand Down Expand Up @@ -165,8 +165,8 @@ def help

COPYRIGHT
---------
Copyright (c) 2011 Puppet Inc.
Copyright (c) 2024 Vox Pupuli
Copyright (c) 2011 Puppet Inc.;
Copyright (c) 2024 Vox Pupuli.
Licensed under the Apache 2.0 License

HELP
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/application/describe.rb
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ def help

COPYRIGHT
---------
Copyright (c) 2011 Puppet Inc.
Copyright (c) 2024 Vox Pupuli
Copyright (c) 2011 Puppet Inc.;
Copyright (c) 2024 Vox Pupuli.
Licensed under the Apache 2.0 License

HELP
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/application/doc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ module - see https://github.com/puppetlabs/puppetlabs-strings for more informati

COPYRIGHT
---------
Copyright (c) 2011 Puppet Inc.
Copyright (c) 2024 Vox Pupuli
Copyright (c) 2011 Puppet Inc.;
Copyright (c) 2024 Vox Pupuli.
Licensed under the Apache 2.0 License

HELP
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/application/filebucket.rb
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ def help

COPYRIGHT
---------
Copyright (c) 2011 Puppet Inc.
Copyright (c) 2024 Vox Pupuli
Copyright (c) 2011 Puppet Inc.;
Copyright (c) 2024 Vox Pupuli.
Licensed under the Apache 2.0 License

HELP
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/application/resource.rb
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ def help

COPYRIGHT
---------
Copyright (c) 2011 Puppet Inc.
Copyright (c) 2024 Vox Pupuli
Copyright (c) 2011 Puppet Inc.;
Copyright (c) 2024 Vox Pupuli.
Licensed under the Apache 2.0 License

HELP
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/application/ssl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ def help

COPYRIGHT
---------
Copyright (c) 2011 Puppet Inc.
Copyright (c) 2024 Vox Pupuli
Copyright (c) 2011 Puppet Inc.;
Copyright (c) 2024 Vox Pupuli.
Licensed under the Apache 2.0 License
HELP
end
Expand Down
6 changes: 3 additions & 3 deletions lib/puppet/defaults.rb
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ def self.initialize_default_settings!(settings)
:default => ! Puppet::Util::Platform.windows?,
:type => :boolean,
:desc => "Whether OpenVox should manage the owner, group, and mode of files it uses internally.
**Note**: For Windows agents, the default is `false` for versions 4.10.13 and greater, versions 5.5.6 and greater, and versions 6.0 and greater.",
**Note**: For Windows agents, the default is `false`.",
},
:onetime => {
:default => false,
Expand Down Expand Up @@ -376,7 +376,7 @@ def self.initialize_default_settings!(settings)
:default => "production",
:desc => "The environment in which OpenVox is running. For clients,
such as `puppet agent`, this determines the environment itself, which
OpenVox uses to find modules and much more. For servers, such as `puppet server`,
OpenVox uses to find modules and much more. For servers, such as OpenVox Server,
this provides the default environment for nodes that OpenVox knows nothing about.

When defining an environment in the `[agent]` section, this refers to the
Expand Down Expand Up @@ -1635,7 +1635,7 @@ def self.initialize_default_settings!(settings)
:type => :server_list,
:desc => "The list of primary OpenVox servers to which the OpenVox agent should connect,
in the order that they will be tried. Each value should be a fully qualified domain name, followed by an optional ':' and port number.
If a port is omitted, OpenVox uses masterport for that host. This setting takes precedence over `server`.",
If a port is omitted, OpenVox uses the `serverport` setting for that host. This setting takes precedence over `server`.",
},
:use_srv_records => {
:default => false,
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/help/man.erb
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,5 @@ AUTHOR
<% end -%>
COPYRIGHT AND LICENSE
---------------------
<%= face.copyright %>
<%= face.copyright %>.
<%= face.license %>
6 changes: 3 additions & 3 deletions lib/puppet/pops/loader/module_loaders.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ def self.cached_loader_from(parent_loader, loaders)

def self.system_loader_from(parent_loader, loaders)
# OpenVox may be installed in a fixed location via RPM, installed as a Gem, via source etc.
# The only way to find this across the different ways OpenVox can be installed is
# to search up the path from this source file's __FILE__ location until it finds the base of
# puppet.
# The only way to find the OpenVox code across these different installation methods is
# to search up the path from this source file's __FILE__ location until it finds the root
# of the OpenVox codebase.
#
puppet_lib = File.realpath(File.join(File.dirname(__FILE__), '../../..'))
LibRootedFileBased.new(parent_loader,
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/pops/resource/resource_type_impl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def attrclass(name)
# * meta parameters
#
def allattrs
raise NotImplementedError, "allattrs() - return all attribute names in order - probably not used server side"
raise NotImplementedError, "allattrs() - return all attribute names in order - probably not used on the server side"
# key_attributes | (parameters & [:provider]) | properties.collect { |property| property.name } | parameters | metaparams
end

Expand Down
4 changes: 1 addition & 3 deletions lib/puppet/type/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ def change_to_s(currentvalue, newvalue)
hashes. You can use OpenVox's built-in `sha1` function to generate a salted SHA1
hash from a password.
* Mac OS X 10.7 (Lion), and many recent Linux distributions, use salted SHA512
hashes. The puppetlabs [stdlib][] module contains a `str2saltedsha512` function
hashes. The puppetlabs [stdlib](https://forge.puppet.com/modules/puppetlabs/stdlib) module contains a `str2saltedsha512` function
which can generate password hashes for these operating systems.
* OS X 10.8 and higher use salted SHA512 PBKDF2 hashes. When managing passwords
on these systems, the `salt` and `iterations` attributes need to be specified as
Expand All @@ -237,8 +237,6 @@ def change_to_s(currentvalue, newvalue)
* Windows passwords can be managed only in cleartext, because there is no Windows
API for setting the password hash.

[stdlib]: https://github.com/puppetlabs/puppetlabs-stdlib/

Enclose any value that includes a dollar sign ($) in single quotes (') to avoid
accidental variable interpolation.

Expand Down
6 changes: 3 additions & 3 deletions locales/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ gettext:
# This is used in comments in the .pot and .po files to indicate what
# project the files belong to and should be a little more descriptive than
# <project_name>
package_name: Puppet automation framework
package_name: OpenVox automation framework
# The locale that the default messages in the .pot file are in
default_locale: en
# The address for sending bug reports.
bugs_address: https://tickets.puppetlabs.com
bugs_address: https://github.com/OpenVoxProject/openvox/issues
# The holder of the copyright.
copyright_holder: Puppet, Inc.
copyright_holder: Vox Pupuli; portions Copyright (C) 2024 Puppet, Inc.
# Patterns for +Dir.glob+ used to find all files that might contain
# translatable content, relative to the project root directory
source_files:
Expand Down
Loading