From 41bb56f9a69001100c5a003f3a0abb03afd3bae2 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Tue, 14 Jan 2025 12:32:46 -0600
Subject: T7046: move reftree.cache to unique directory

This will simplify updates of the reference_tree in case of supplemental
contributions, say, addon packages.
---
 src/vyconf_config.ml  | 3 +++
 src/vyconf_config.mli | 1 +
 src/vyconfd.ml        | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/vyconf_config.ml b/src/vyconf_config.ml
index 2640c9b..bef607f 100644
--- a/src/vyconf_config.ml
+++ b/src/vyconf_config.ml
@@ -5,6 +5,7 @@ type t = {
     data_dir: string;
     program_dir: string;
     config_dir: string;
+    reftree_dir: string;
     primary_config: string;
     fallback_config: string;
     reference_tree: string;
@@ -22,6 +23,7 @@ let empty_config = {
     data_dir = "";
     program_dir = "";
     config_dir = "";
+    reftree_dir = "";
     primary_config = "";
     fallback_config = "";
     reference_tree = "";
@@ -60,6 +62,7 @@ let load filename =
             let conf = {conf with app_name = mandatory_field conf_toml "appliance" "name"} in
             let conf = {conf with data_dir = mandatory_field conf_toml "appliance" "data_dir"} in
             let conf = {conf with config_dir = mandatory_field conf_toml "appliance" "config_dir"} in
+            let conf = {conf with reftree_dir = mandatory_field conf_toml "appliance" "reftree_dir"} in
             let conf = {conf with program_dir = mandatory_field conf_toml "appliance" "program_dir"} in
             let conf = {conf with primary_config = mandatory_field conf_toml "appliance" "primary_config"} in
             let conf = {conf with fallback_config = mandatory_field conf_toml "appliance" "fallback_config"} in
diff --git a/src/vyconf_config.mli b/src/vyconf_config.mli
index 1cfeffa..dad574c 100644
--- a/src/vyconf_config.mli
+++ b/src/vyconf_config.mli
@@ -3,6 +3,7 @@ type t = {
     data_dir: string;
     program_dir: string;
     config_dir: string;
+    reftree_dir: string;
     primary_config: string;
     fallback_config: string;
     reference_tree: string;
diff --git a/src/vyconfd.ml b/src/vyconfd.ml
index 7c4caeb..4e8708d 100644
--- a/src/vyconfd.ml
+++ b/src/vyconfd.ml
@@ -220,7 +220,7 @@ let read_reference_tree file =
 let make_world config dirs =
     let open Session in
     (* the reference_tree json file is generated at vyos-1x build time *)
-    let reftree = read_reference_tree (FP.concat config.config_dir config.reference_tree) in
+    let reftree = read_reference_tree (FP.concat config.reftree_dir config.reference_tree) in
     let running_config = CT.make "" in
     {running_config=running_config; reference_tree=reftree; vyconf_config=config; dirs=dirs}
 
-- 
cgit v1.2.3