WEBDIENSTE/NLnetLabs-dnst
1
0
Fork 0
mirror of https://github.com/NLnetLabs/dnst.git synced 2026-09-28 20:54:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move long help comments to after help to better match ldns-signzone.

Browse Source
This commit is contained in:
Ximon Eighteen
2024-11-07 13:01:57 +01:00
parent 76df433ad7
commit 4a2bca8bd1
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/commands/signzone.rs
+10 -7
View File
@@ -34,6 +34,16 @@ const FOUR_WEEKS: u32 = 2419200;
//------------ SignZone ------------------------------------------------------
#[derive(Clone, Debug, clap::Args)]
#[clap(
after_help = "keys must be specified by their base name (usually K<name>+<alg>+<id>),
i.e. WITHOUT the .private extension.
If the public part of the key is not present in the zone, the DNSKEY RR
will be read from the file called <base name>.key. If that does not exist,
a default DNSKEY will be generated from the private key and added to the zone.
A date can be a timestamp (seconds since the epoch), or of
the form <YYYYMMdd[hhmmss]>
"
)]
pub struct SignZone {
// -----------------------------------------------------------------------
// Original ldns-signzone options in ldns-signzone -h order:
@@ -46,7 +56,6 @@ pub struct SignZone {
//#[arg(short = 'd', default_value_t = false)]
// TODO
/// Expiration date [default: 4 weeks from now]
// YYYYYYMMDD[hhmmss] or time in seconds since the epoch
// Default is not documented in ldns-signzone -h or man ldns-signzone but
// in code (see ldns/dnssec_sign.c::ldns_create_empty_rrsig()) LDNS uses
// now + 4 weeks if no expiration timestamp is specified.
@@ -56,7 +65,6 @@ pub struct SignZone {
default_value_t = Timestamp::now().into_int().add(FOUR_WEEKS).into(),
hide_default_value = true,
value_parser = ValueParser::new(SignZone::parse_timestamp),
long_help = "Expiration date [default: 4 weeks from now]\nMay be specified as either YYYYMMDD, YYYYMMDDHHmmSS or numeric Unix timestamp",
)]
expiration: Timestamp,
@@ -65,7 +73,6 @@ pub struct SignZone {
// Undocumented: Use - to output to stdout.
// out_file: Option<PathBuf>,
/// Inception date [default: now]
// YYYYYYMMDD[hhmmss] or time in seconds since the epoch
// Default is not documented in ldns-signzone -h or man ldns-signzone but
// in code (see ldns/dnssec_sign.c::ldns_create_empty_rrsig()) LDNS uses
// now if no inception timestamp is specified.
@@ -75,7 +82,6 @@ pub struct SignZone {
default_value_t = Timestamp::now(),
hide_default_value = true,
value_parser = ValueParser::new(SignZone::parse_timestamp),
long_help = "Inception date [default: now]\nMay be specified as either YYYYMMDD, YYYYMMDDHHmmSS or numeric Unix timestamp",
)]
inception: Timestamp,
@@ -179,9 +185,6 @@ pub struct SignZone {
zonefile_path: PathBuf,
/// The keys to sign the zone with
///
/// keys must be specified by their base name (usually
/// K<name>+<alg>+<id>), i.e. WITHOUT the .private extension.
#[arg(value_name = "key")]
key_paths: Vec<PathBuf>,
}