summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-05-12 13:15:54 -0700
committerTim Smith <tsmith@chef.io>2021-05-12 13:15:54 -0700
commit9704cac23a9d60b291847c009131a0bbd2f86d47 (patch)
tree8bbaaaf469570f6a4d0aeb5713e46a3ca4f4ff93
parenteba1fd197320fbb0df076b873d3bd2b7b16220b7 (diff)
downloadchef-9704cac23a9d60b291847c009131a0bbd2f86d47.tar.gz
More updates for documentation generation
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/resource/apt_update.rb4
-rw-r--r--lib/chef/resource/cron/cron_d.rb8
-rw-r--r--lib/chef/resource/homebrew_cask.rb4
-rw-r--r--lib/chef/resource/kernel_module.rb2
-rw-r--r--lib/chef/resource/openssl_dhparam.rb2
-rw-r--r--lib/chef/resource/openssl_ec_private_key.rb2
-rw-r--r--lib/chef/resource/openssl_ec_public_key.rb2
-rw-r--r--lib/chef/resource/openssl_rsa_private_key.rb2
-rw-r--r--lib/chef/resource/openssl_rsa_public_key.rb2
-rw-r--r--lib/chef/resource/openssl_x509_certificate.rb2
-rw-r--r--lib/chef/resource/openssl_x509_crl.rb2
11 files changed, 16 insertions, 16 deletions
diff --git a/lib/chef/resource/apt_update.rb b/lib/chef/resource/apt_update.rb
index db87fefc91..cfecef02cf 100644
--- a/lib/chef/resource/apt_update.rb
+++ b/lib/chef/resource/apt_update.rb
@@ -33,8 +33,8 @@ class Chef
```ruby
apt_update 'all platforms' do
- frequency 86400
- action :periodic
+ frequency 86400
+ action :periodic
end
```
diff --git a/lib/chef/resource/cron/cron_d.rb b/lib/chef/resource/cron/cron_d.rb
index 3b8e4fa06a..2806f55415 100644
--- a/lib/chef/resource/cron/cron_d.rb
+++ b/lib/chef/resource/cron/cron_d.rb
@@ -29,7 +29,7 @@ class Chef
provides :cron_d
introduced "14.4"
- description "Use the **cron_d** resource to manage cron job files in the /etc/cron.d directory. This is similar to the 'cron' resource, but it does not use the monolithic /etc/crontab file."
+ description "Use the **cron_d** resource to manage cron job files in the `/etc/cron.d` directory. This is similar to the 'cron' resource, but it does not use the monolithic /etc/crontab file."
examples <<~DOC
**Run a program on the fifth hour of the day**
@@ -116,17 +116,17 @@ class Chef
end
action :create do
- description "Add a cron definition file to /etc/cron.d."
+ description "Add a cron definition file to `/etc/cron.d`."
create_template(:create)
end
- action :create_if_missing, description: "Add a cron definition file to /etc/cron.d, but do not update an existing file." do
+ action :create_if_missing, description: "Add a cron definition file to `/etc/cron.d`, but do not update an existing file." do
create_template(:create_if_missing)
end
- action :delete, description: "Remove a cron definition file from /etc/cron.d if it exists." do
+ action :delete, description: "Remove a cron definition file from `/etc/cron.d` if it exists." do
# cleanup the legacy named job if it exists
file "legacy named cron.d file" do
diff --git a/lib/chef/resource/homebrew_cask.rb b/lib/chef/resource/homebrew_cask.rb
index 14f2ea3383..540d21a79e 100644
--- a/lib/chef/resource/homebrew_cask.rb
+++ b/lib/chef/resource/homebrew_cask.rb
@@ -53,7 +53,7 @@ class Chef
description: "The owner of the Homebrew installation.",
default: lazy { find_homebrew_username }
- action :install, description: "Install an application packaged as a Homebrew cask." do
+ action :install, description: "Install an application that is packaged as a Homebrew cask." do
homebrew_tap "homebrew/cask" if new_resource.install_cask
unless casked?
@@ -66,7 +66,7 @@ class Chef
end
end
- action :remove, description: "Remove an application packaged as a Homebrew cask." do
+ action :remove, description: "Remove an application that is packaged as a Homebrew cask." do
homebrew_tap "homebrew/cask" if new_resource.install_cask
if casked?
diff --git a/lib/chef/resource/kernel_module.rb b/lib/chef/resource/kernel_module.rb
index bba53077d1..c4a36af9eb 100644
--- a/lib/chef/resource/kernel_module.rb
+++ b/lib/chef/resource/kernel_module.rb
@@ -162,7 +162,7 @@ class Chef
action_unload
end
- action :disable, description: "Disable a kernel module." do
+ action :disable, description: "Disable a kernel module. **New in Chef Infra Client 15.2.**" do
with_run_context :root do
find_resource(:execute, "update initramfs") do
command initramfs_command
diff --git a/lib/chef/resource/openssl_dhparam.rb b/lib/chef/resource/openssl_dhparam.rb
index 84d89a6b82..a34c79df17 100644
--- a/lib/chef/resource/openssl_dhparam.rb
+++ b/lib/chef/resource/openssl_dhparam.rb
@@ -88,7 +88,7 @@ class Chef
description: "The permission mode applied to all files created by the resource.",
default: "0640"
- action :create, description: "Create the dhparam file." do
+ action :create, description: "Create the `dhparam.pem` file." do
dhparam_content = nil
unless dhparam_pem_valid?(new_resource.path)
dhparam_content = gen_dhparam(new_resource.key_length, new_resource.generator).to_pem
diff --git a/lib/chef/resource/openssl_ec_private_key.rb b/lib/chef/resource/openssl_ec_private_key.rb
index f3f88182af..5cd5b97c83 100644
--- a/lib/chef/resource/openssl_ec_private_key.rb
+++ b/lib/chef/resource/openssl_ec_private_key.rb
@@ -88,7 +88,7 @@ class Chef
description: "Force creation of the key even if the same key already exists on the node.",
default: false, desired_state: false
- action :create, description: "Generate the ec private key." do
+ action :create, description: "Generate the EC private key file." do
unless new_resource.force || priv_key_file_valid?(new_resource.path, new_resource.key_pass)
converge_by("Create an EC private key #{new_resource.path}") do
log "Generating an #{new_resource.key_curve} "\
diff --git a/lib/chef/resource/openssl_ec_public_key.rb b/lib/chef/resource/openssl_ec_public_key.rb
index 0cf81e4ee0..b66687f6e7 100644
--- a/lib/chef/resource/openssl_ec_public_key.rb
+++ b/lib/chef/resource/openssl_ec_public_key.rb
@@ -74,7 +74,7 @@ class Chef
description: "The permission mode applied to all files created by the resource.",
default: "0640"
- action :create, description: "Generate the ec public key from a private key." do
+ action :create, description: "Generate the EC public key file from a private key." do
raise ArgumentError, "You cannot specify both 'private_key_path' and 'private_key_content' properties at the same time." if new_resource.private_key_path && new_resource.private_key_content
raise ArgumentError, "You must specify the private key with either 'private_key_path' or 'private_key_content' properties." unless new_resource.private_key_path || new_resource.private_key_content
raise "#{new_resource.private_key_path} not a valid private EC key or password is invalid" unless priv_key_file_valid?((new_resource.private_key_path || new_resource.private_key_content), new_resource.private_key_pass)
diff --git a/lib/chef/resource/openssl_rsa_private_key.rb b/lib/chef/resource/openssl_rsa_private_key.rb
index 43cc131320..5f0f50f5b1 100644
--- a/lib/chef/resource/openssl_rsa_private_key.rb
+++ b/lib/chef/resource/openssl_rsa_private_key.rb
@@ -87,7 +87,7 @@ class Chef
description: "Force creation of the key even if the same key already exists on the node.",
default: false, desired_state: false
- action :create, description: "Create the RSA private key." do
+ action :create, description: "Create the RSA private key file." do
return if new_resource.force || priv_key_file_valid?(new_resource.path, new_resource.key_pass)
converge_by("create #{new_resource.key_length} bit RSA key #{new_resource.path}") do
diff --git a/lib/chef/resource/openssl_rsa_public_key.rb b/lib/chef/resource/openssl_rsa_public_key.rb
index 59e63368c1..54362b45a4 100644
--- a/lib/chef/resource/openssl_rsa_public_key.rb
+++ b/lib/chef/resource/openssl_rsa_public_key.rb
@@ -75,7 +75,7 @@ class Chef
description: "The permission mode applied to all files created by the resource.",
default: "0640"
- action :create, description: "Create the RSA public key." do
+ action :create, description: "Create the RSA public key file." do
raise ArgumentError, "You cannot specify both 'private_key_path' and 'private_key_content' properties at the same time." if new_resource.private_key_path && new_resource.private_key_content
raise ArgumentError, "You must specify the private key with either 'private_key_path' or 'private_key_content' properties." unless new_resource.private_key_path || new_resource.private_key_content
raise "#{new_resource.private_key_path} not a valid private RSA key or password is invalid" unless priv_key_file_valid?((new_resource.private_key_path || new_resource.private_key_content), new_resource.private_key_pass)
diff --git a/lib/chef/resource/openssl_x509_certificate.rb b/lib/chef/resource/openssl_x509_certificate.rb
index 8c36a18ed6..4c3441c594 100644
--- a/lib/chef/resource/openssl_x509_certificate.rb
+++ b/lib/chef/resource/openssl_x509_certificate.rb
@@ -151,7 +151,7 @@ class Chef
description: "The number of days before the expiry. The certificate will be automatically renewed when the value is reached.",
introduced: "15.7"
- action :create, description: "Generate a certificate." do
+ action :create, description: "Generate a certificate file." do
file new_resource.path do
action :create_if_missing
owner new_resource.owner unless new_resource.owner.nil?
diff --git a/lib/chef/resource/openssl_x509_crl.rb b/lib/chef/resource/openssl_x509_crl.rb
index 0b20ee7209..ecf9778f25 100644
--- a/lib/chef/resource/openssl_x509_crl.rb
+++ b/lib/chef/resource/openssl_x509_crl.rb
@@ -90,7 +90,7 @@ class Chef
property :mode, [Integer, String],
description: "The permission mode of the CRL file."
- action :create, description: "Create the CRL file." do
+ action :create, description: "Create the certificate revocation list (CRL) file." do
file new_resource.path do
owner new_resource.owner unless new_resource.owner.nil?
group new_resource.group unless new_resource.group.nil?