Skip to content

Commit

Permalink
Merge pull request puppetlabs#9447 from joshcooper/doc_updates2
Browse files Browse the repository at this point in the history
Update docs
  • Loading branch information
joshcooper authored Aug 14, 2024
2 parents 19bc0de + ef22dc8 commit b8ac6f4
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 10 deletions.
10 changes: 6 additions & 4 deletions lib/puppet/application/filebucket.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,11 @@ def help
use your local file bucket by specifying '--local', or by specifying
'--bucket' with a local path.
> **Note**: Enabling and using the backup option, and by extension the
filebucket resource, requires appropriate planning and management to ensure
that sufficient disk space is available for the file backups. Generally, you
can implement this using one of the following two options:
**Note**: Enabling and using the backup option, and by extension the
filebucket resource, requires appropriate planning and management to ensure
that sufficient disk space is available for the file backups. Generally, you
can implement this using one of the following two options:
- Use a `find` command and `crontab` entry to retain only the last X days
of file backups. For example:
Expand Down Expand Up @@ -187,6 +188,7 @@ def help
$ puppet filebucket -l -t "2015-05-11 09:30:00" list
d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
## Manage files in a specific local filebucket
$ puppet filebucket -b /tmp/TestBucket backup /tmp/TestFile2
/tmp/TestFile2: d41d8cd98f00b204e9800998ecf8427e
Expand Down
2 changes: 2 additions & 0 deletions lib/puppet/defaults.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2126,10 +2126,12 @@ def self.initialize_default_settings!(settings)
can produce node information. The command must:
* Take the name of a node as a command-line argument.
* Return a YAML hash with up to three keys:
* `classes` --- A list of classes, as an array or hash.
* `environment` --- A string.
* `parameters` --- A list of top-scope variables to set, as a hash.
* For unknown nodes, exit with a non-zero exit code.
Generally, an ENC script makes requests to an external data source.
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/face/catalog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
deactivate_action(:destroy)
deactivate_action(:search)
action(:find) do
summary _("Retrieve the catalog for the node from which the comamand is run.")
summary _("Retrieve the catalog for the node from which the command is run.")
arguments "<certname>, <facts>"
option("--facts_for_catalog") do
summary _("Not yet implemented for the CLI; facts will be collected internally.")
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/reference/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,5 @@
[confguide]: https://puppet.com/docs/puppet/latest/config_about_settings.html
* * *
EOT
1 change: 0 additions & 1 deletion lib/puppet/util/reference.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ def text
def to_markdown(withcontents = true)
# First the header
text = markdown_header(@title, 1)
text << _("\n\n**This page is autogenerated; any changes will get overwritten**\n\n")

text << @header

Expand Down
2 changes: 1 addition & 1 deletion man/man5/puppet.conf.5
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
.TH "PUPPETCONF" "5" "August 2024" "Puppet, Inc." "Puppet manual"
\fBThis page is autogenerated; any changes will get overwritten\fR
.
.SH "Configuration settings"
.
Expand Down Expand Up @@ -690,6 +689,7 @@ This setting\'s value must be the path to an executable command that can produce
Take the name of a node as a command\-line argument\.
.
.IP "\(bu" 4
Return a YAML hash with up to three keys:
.
.IP "\(bu" 4
\fBclasses\fR \-\-\- A list of classes, as an array or hash\.
Expand Down
4 changes: 2 additions & 2 deletions man/man8/puppet-catalog.8
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Nothing\.
When used from the Ruby API, this action has a side effect of leaving Puppet::Resource::Catalog\.indirection\.terminus_class set to yaml\. The terminus must be explicitly re\-set for subsequent catalog actions\.
.
.TP
\fBfind\fR \- Retrieve the catalog for the node from which the comamand is run\.
\fBfind\fR \- Retrieve the catalog for the node from which the command is run\.
\fBSYNOPSIS\fR
.
.IP
Expand All @@ -119,7 +119,7 @@ puppet catalog find [\-\-terminus _TERMINUS] [\-\-facts_for_catalog] \fIcertname
\fBDESCRIPTION\fR
.
.IP
Retrieve the catalog for the node from which the comamand is run\.
Retrieve the catalog for the node from which the command is run\.
.
.IP
\fBOPTIONS\fR \fI\-\-facts_for_catalog\fR \- Not yet implemented for the CLI; facts will be collected internally\.
Expand Down
9 changes: 9 additions & 0 deletions man/man8/puppet-filebucket.8
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ This is a stand\-alone filebucket client for sending files to a local or central
.P
Note that \'filebucket\' defaults to using a network\-based filebucket available on the server named \'puppet\'\. To use this, you\'ll have to be running as a user with valid Puppet certificates\. Alternatively, you can use your local file bucket by specifying \'\-\-local\', or by specifying \'\-\-bucket\' with a local path\.
.
.P
\fBNote\fR: Enabling and using the backup option, and by extension the filebucket resource, requires appropriate planning and management to ensure that sufficient disk space is available for the file backups\. Generally, you can implement this using one of the following two options:
.
.IP "\(bu" 4
Use a \fBfind\fR command and \fBcrontab\fR entry to retain only the last X days of file backups\. For example:
.
.IP "" 0
.
.IP "" 4
.
.nf
Expand Down Expand Up @@ -146,6 +154,7 @@ $ puppet filebucket \-l \-f "2015\-05\-11 09:30:00" list

$ puppet filebucket \-l \-t "2015\-05\-11 09:30:00" list
d43a6ecaa892a1962398ac9170ea9bf2 2015\-05\-11 09:27:56 /tmp/TestFile

## Manage files in a specific local filebucket
$ puppet filebucket \-b /tmp/TestBucket backup /tmp/TestFile2
/tmp/TestFile2: d41d8cd98f00b204e9800998ecf8427e
Expand Down

0 comments on commit b8ac6f4

Please sign in to comment.