mirror/nlnetlabs-routinator
1
0
Fork 0
mirror of https://github.com/NLnetLabs/routinator.git synced 2024-05-19 06:50:04 +00:00
Code Issues Releases Activity

Add disable-rsync option.

Browse Source
This commit is contained in:
Martin Hoffmann
2019-10-09 10:36:43 +02:00
parent d6f314945b
commit b4ce760076
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
doc/routinator.1
View File

@ -24,6 +24,7 @@
.IR exceptions-file
[...]]]
.RB [ \-\-strict ]
.RB [ --disable-rsync ]
.RB [ \-\-rsync\-command=\fIcommand\fR]
.RB [ \-\-rsync\-args=\fIargs\fR]
.RB [ \-\-rsync-timeout=\fIseconds\fR]
@ -182,6 +183,10 @@ See
.B RELAXED VALIDATION
below for more information.
.TP
.B --disable-rsync
If this option is present, rsync is disabled and only RRDP will be used.
.TP
.BI \-\-rsync\-command= command
Provides the command to run for rsync. This is only the command itself.
@ -203,6 +208,7 @@ enough except for very slow networks.
.TP
.B --disable-rrdp
If this option is present, RRDP is disabled and only rsync will be used.
.TP
.BI --rrdp-timeout= seconds
Sets the timeout in seconds for any RRDP-related network operation, i.e.,
@ -653,6 +659,11 @@ If missing, no local exception files are used.
.B strict
A boolean specifying whether strict validation should be employed. If missing,
strict validation will not be used.
.TP
.B disable-rsync
A boolean value that, if present and true, turns off the use of rsync.
.TP
.B rsync-command
A string specifying the command to use for running rsync. The default is

12
src/config.rs
View File

@ -239,6 +239,10 @@ impl Config {
.long("strict")
.help("Parse RPKI data in strict mode")
)
.arg(Arg::with_name("disable-rsync")
.long("disable-rsync")
.help("Disable rsync and only use RRDP")
)
.arg(Arg::with_name("rsync-command")
.long("rsync-command")
.value_name("COMMAND")
@ -495,6 +499,11 @@ impl Config {
self.strict = true
}
// disable_rsync
if matches.is_present("disable-rsync") {
self.disable_rsync = true
}
// rsync_command
if let Some(value) = matches.value_of("rsync-command") {
self.rsync_command = value.into()
@ -903,7 +912,7 @@ impl Config {
file.take_path_array("exceptions")?.unwrap_or_else(Vec::new)
},
strict: file.take_bool("strict")?.unwrap_or(false),
disable_rsync: false,
disable_rsync: file.take_bool("disable-rsync")?.unwrap_or(false),
rsync_command: {
file.take_string("rsync-command")?
.unwrap_or_else(|| "rsync".into())
@ -1218,6 +1227,7 @@ impl Config {
)
);
res.insert("strict".into(), self.strict.into());
res.insert("disable-rsync".into(), self.disable_rsync.into());
res.insert("rsync-command".into(), self.rsync_command.clone().into());
if let Some(ref args) = self.rsync_args {
res.insert(