summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2025-03-18 10:09:48 -0500
committerGitHub <noreply@github.com>2025-03-18 10:09:48 -0500
commit33cc7567d909c776d43ea6698267125ea1ec2f66 (patch)
tree5ffb797cf40f6a5ccbc16560d8b9d17ebab20e3b /data
parent41cbac4d6467c8bd62eeb247d2e28efa359e4a1c (diff)
parent57f788f4dc1468807a2d78f7effbbaddcae6f36c (diff)
downloadvyconf-33cc7567d909c776d43ea6698267125ea1ec2f66.tar.gz
vyconf-33cc7567d909c776d43ea6698267125ea1ec2f66.zip
Merge pull request #15 from jestabro/commitdHEADmaster
T7121: Set up communication vyconfd to vyos-commitd
Diffstat (limited to 'data')
-rw-r--r--data/dune2
-rw-r--r--data/vycall.proto27
-rw-r--r--data/vyconfd.conf7
3 files changed, 35 insertions, 1 deletions
diff --git a/data/dune b/data/dune
index e5ffaa6..df63152 100644
--- a/data/dune
+++ b/data/dune
@@ -1,3 +1,3 @@
(install
- (files vyconfd.conf vyconf.proto)
+ (files vyconfd.conf vyconf.proto vycall.proto)
(section share))
diff --git a/data/vycall.proto b/data/vycall.proto
new file mode 100644
index 0000000..e0af67b
--- /dev/null
+++ b/data/vycall.proto
@@ -0,0 +1,27 @@
+message Status {
+ required bool success = 1;
+ required string out = 2;
+}
+
+message Call {
+ required string script_name = 1;
+ optional string tag_value = 2;
+ optional string arg_value = 3;
+ optional Status reply = 4;
+}
+
+message Commit {
+ required string session_id = 1;
+ // optional explicit load;
+ // otherwise, session configs are loaded from cached internal
+ // representation, specified by session id value
+ optional string named_active = 2;
+ optional string named_proposed = 3;
+ //
+ required bool dry_run = 4;
+ required bool atomic = 5;
+ required bool background = 6;
+
+ optional Status init = 7;
+ repeated Call calls = 8;
+}
diff --git a/data/vyconfd.conf b/data/vyconfd.conf
index bcde860..d1ae247 100644
--- a/data/vyconfd.conf
+++ b/data/vyconfd.conf
@@ -6,6 +6,7 @@ data_dir = "/usr/share/vyos/vyconf"
program_dir = "/usr/libexec/vyos"
config_dir = "/usr/libexec/vyos/vyconf/config"
reftree_dir = "/usr/libexec/vyos/vyconf/reftree"
+session_dir = "/usr/libexec/vyos/vyconf/session"
# paths relative to config_dir
primary_config = "config.boot"
@@ -14,6 +15,12 @@ fallback_config = "config.failsafe"
# paths relative to reftree_dir
reference_tree = "reftree.cache"
+# paths relative to session_dir
+running_cache = "running_cache"
+session_cache = "session_cache"
+
+commitd_socket = "/var/run/vyos-commitd.sock"
+
[vyconf]
socket = "/var/run/vyconfd.sock"