mvc: move existing JsonKeyValueStoreField caches to configd (ref opns…

…ense#7515)
marcushoff · Jun 6, 2024 · 9e42330 · 9e42330
1 parent a39add8
commit 9e42330
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 8 deletions.
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Hasync.xml b/src/opnsense/mvc/app/models/OPNsense/Core/Hasync.xml
@@ -41,8 +41,6 @@
         <syncitems type="JsonKeyValueStoreField">
             <Multiple>Y</Multiple>
             <ConfigdPopulateAct>system ha options</ConfigdPopulateAct>
-            <SourceFile>/tmp/ha_options.json</SourceFile>
-            <ConfigdPopulateTTL>60</ConfigdPopulateTTL>
             <SortByValue>Y</SortByValue>
             <ValidationMessage>Specify valid list of applications to sync.</ValidationMessage>
         </syncitems>

diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml b/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
@@ -86,8 +86,6 @@
                 </destination_port>
                 <gateway type="JsonKeyValueStoreField">
                     <ConfigdPopulateAct>interface gateways list</ConfigdPopulateAct>
-                    <SourceFile>/tmp/gateway_list.json</SourceFile>
-                    <ConfigdPopulateTTL>20</ConfigdPopulateTTL>
                     <ValidationMessage>Specify a valid gateway from the list matching the networks ip protocol.</ValidationMessage>
                 </gateway>
                 <log type="BooleanField">

diff --git a/src/opnsense/mvc/app/models/OPNsense/Routes/Route.xml b/src/opnsense/mvc/app/models/OPNsense/Routes/Route.xml
@@ -11,8 +11,6 @@
           <gateway type="JsonKeyValueStoreField">
             <Required>Y</Required>
             <ConfigdPopulateAct>interface gateways list</ConfigdPopulateAct>
-            <SourceFile>/tmp/gateway_list.json</SourceFile>
-            <ConfigdPopulateTTL>20</ConfigdPopulateTTL>
             <ValidationMessage>Specify a valid gateway from the list matching the networks ip protocol.</ValidationMessage>
           </gateway>
           <descr type="DescriptionField"/>

diff --git a/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml b/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml
@@ -38,8 +38,6 @@
                 <program type="JsonKeyValueStoreField">
                   <Multiple>Y</Multiple>
                   <ConfigdPopulateAct>syslog list applications</ConfigdPopulateAct>
-                  <SourceFile>/tmp/syslog_applications.json</SourceFile>
-                  <ConfigdPopulateTTL>20</ConfigdPopulateTTL>
                   <SortByValue>Y</SortByValue>
                   <ValidationMessage>Specify valid source applications.</ValidationMessage>
                 </program>

diff --git a/src/opnsense/service/conf/actions.d/actions_interface.conf b/src/opnsense/service/conf/actions.d/actions_interface.conf
@@ -147,6 +147,7 @@ type: script_output
 command:/usr/local/opnsense/scripts/routes/gateways.php
 type:script_output
 message:list gateways
+cache_ttl=20
 
 [gateways.status]
 command:/usr/local/opnsense/scripts/routes/gateway_status.php

diff --git a/src/opnsense/service/conf/actions.d/actions_syslog.conf b/src/opnsense/service/conf/actions.d/actions_syslog.conf
@@ -3,6 +3,7 @@ command:/usr/local/opnsense/scripts/syslog/list_applications.php
 parameters:
 type:script_output
 message:List syslog applications
+cache_ttl=20
 
 [start]
 command:/usr/local/sbin/pluginctl -s syslog-ng restart

diff --git a/src/opnsense/service/conf/actions.d/actions_system.conf b/src/opnsense/service/conf/actions.d/actions_system.conf
@@ -90,6 +90,7 @@ command:pluginctl -x
 parameters:
 type:script_output
 message: Return ha sync options
+cache_ttl=60
 
 [list.nameservers]
 command:/usr/local/opnsense/scripts/system/nameservers.php