diff options
| author | Daniil Baturin <daniil@baturin.org> | 2024-11-07 18:02:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-07 18:02:08 +0000 |
| commit | 196fdd7fdf6dcf751b7364c59e34278bfd0193e3 (patch) | |
| tree | cfeff0991481c8281e24cf1698b20a76854059a4 /data | |
| parent | dd9271b4304c6b1a5a2576821d1b2b8fd3aa6bf5 (diff) | |
| parent | 9b90d3cc4da72c13ef4270150e4b547ff03fc813 (diff) | |
| download | vyconf-196fdd7fdf6dcf751b7364c59e34278bfd0193e3.tar.gz vyconf-196fdd7fdf6dcf751b7364c59e34278bfd0193e3.zip | |
Merge pull request #11 from jestabro/vyconf-minimal
T6718: use the vyconf daemon for validation of set commands
Diffstat (limited to 'data')
| -rw-r--r-- | data/dune | 3 | ||||
| -rw-r--r-- | data/examples/vyconfd.conf | 1 | ||||
| -rw-r--r-- | data/vyconf.proto | 14 | ||||
| -rw-r--r-- | data/vyconfd.conf | 20 |
4 files changed, 36 insertions, 2 deletions
diff --git a/data/dune b/data/dune new file mode 100644 index 0000000..e5ffaa6 --- /dev/null +++ b/data/dune @@ -0,0 +1,3 @@ +(install + (files vyconfd.conf vyconf.proto) + (section share)) diff --git a/data/examples/vyconfd.conf b/data/examples/vyconfd.conf index db9e493..68b0531 100644 --- a/data/examples/vyconfd.conf +++ b/data/examples/vyconfd.conf @@ -9,6 +9,7 @@ config_dir = "/etc/testappliance" # paths relative to config_dir primary_config = "config.boot" fallback_config = "config.failsafe" +reference_tree = "reftree.cache" [vyconf] diff --git a/data/vyconf.proto b/data/vyconf.proto index 6bd2796..d989fb3 100644 --- a/data/vyconf.proto +++ b/data/vyconf.proto @@ -17,6 +17,15 @@ message Request { optional int32 OnBehalfOf = 2; } + message Teardown { + optional int32 OnBehalfOf = 1; + } + + message Validate { + repeated string Path = 1; + optional OutputFormat output_format = 2; + } + message Set { repeated string Path = 1; optional bool Ephemeral = 3; @@ -129,8 +138,9 @@ message Request { Confirm confirm = 18; EnterConfigurationMode configure = 19; ExitConfigurationMode exit_configure = 20; - string teardown = 21; - } + Validate validate = 21; + Teardown teardown = 22; + } } message RequestEnvelope { diff --git a/data/vyconfd.conf b/data/vyconfd.conf new file mode 100644 index 0000000..e0b16d0 --- /dev/null +++ b/data/vyconfd.conf @@ -0,0 +1,20 @@ +[appliance] + +name = "vyconfd-minimal" + +data_dir = "/usr/share/vyos/vyconf" +program_dir = "/usr/libexec/vyos" +config_dir = "/usr/libexec/vyos/vyconf/config" + +# paths relative to config_dir +primary_config = "config.boot" +fallback_config = "config.failsafe" +reference_tree = "reftree.cache" + +[vyconf] + +socket = "/var/run/vyconfd.sock" +pid_file = "/var/run/vyconfd.pid" +log_file = "/var/log/vyconfd.log" +log_template = "$(date) $(name)[$(pid)]: $(message)" +log_level = "notice" |