Merge pull request #1417 from firewalla/master

sync gold 1.980 staging
firewalla · Dec 9, 2024 · 9e1c9f5 · 9e1c9f5
2 parents 83124df + 9ad0f66
commit 9e1c9f5
Show file tree

Hide file tree

Showing 26 changed files with 1,140 additions and 243 deletions.
diff --git a/config/config.json b/config/config.json
@@ -146,6 +146,30 @@
       "config_path": "docker",
       "category": "docker",
       "init_seq": 9
+    },
+    {
+      "file_path": "./profile/profile_plugin.js",
+      "config_path": "profile",
+      "category": "profile",
+      "init_seq": 10
+    },
+    {
+      "file_path": "./assets/assets_template_plugin.js",
+      "config_path": "assets_template",
+      "category": "assets_template",
+      "init_seq": 11
+    },
+    {
+      "file_path": "./assets/assets_plugin.js",
+      "config_path": "assets",
+      "category": "assets",
+      "init_seq": 12
+    },
+    {
+      "file_path": "./apc/apc_plugin.js",
+      "config_path": "apc",
+      "category": "apc",
+      "init_seq": 12
     }
   ],
   "sensors": [

diff --git a/core/Message.js b/core/Message.js
@@ -17,6 +17,7 @@
 
 const MSG_FR_CHANGE_APPLIED = "firerouter.change_applied";
 const MSG_FR_IFACE_CHANGE_APPLIED = "firerouter.iface_change_applied";
+const MSG_FR_APC_CHANGE_APPLIED = "firerouter.apc_change_applied";
 const MSG_FR_WAN_CONN_CHANGED = "firerouter.wan_conn_changed";
 const MSG_FR_WAN_STATE_CHANGED = "firerouter.wan_state_changed";
 const MSG_FR_WAN_CONN_ANY_UP = "firerouter.wan_conn_any_up";
@@ -26,6 +27,7 @@ const MSG_FIRERESET_BLUETOOTH_CONTROL = "firereset.ble.control";
 module.exports = {
   MSG_FR_CHANGE_APPLIED,
   MSG_FR_IFACE_CHANGE_APPLIED,
+  MSG_FR_APC_CHANGE_APPLIED,
   MSG_FR_WAN_CONN_CHANGED,
   MSG_FR_WAN_STATE_CHANGED,
   MSG_FR_WAN_CONN_ALL_DOWN,