fastnetmon: T2659: move configuration files to /run

4 files changed, 28 insertions, 13 deletions

diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst
index da935bd4c..81121bfe9 100644
--- a/debian/vyos-1x.postinst
+++ b/debian/vyos-1x.postinst
@@ -88,8 +88,10 @@ fi
 
 # Remove unwanted daemon files from /etc
 # conntackd
+# pmacct
+# fastnetmon
 DELETE="/etc/logrotate.d/conntrackd.distrib /etc/init.d/conntrackd /etc/default/conntrackd
-        /etc/default/pmacctd /etc/pmacct"
+        /etc/default/pmacctd /etc/pmacct /etc/networks_list /etc/fastnetmon.conf"
 for file in $DELETE; do
     if [ -f ${file} ]; then
         rm -f ${file}
diff --git a/smoketest/scripts/cli/test_service_ids.py b/smoketest/scripts/cli/test_service_ids.py
index b4a8934e5..7366bad2a 100755
--- a/smoketest/scripts/cli/test_service_ids.py
+++ b/smoketest/scripts/cli/test_service_ids.py
@@ -24,7 +24,7 @@ from vyos.util import process_named_running
 from vyos.util import read_file
 
 PROCESS_NAME = 'fastnetmon'
-FASTNETMON_CONF = '/etc/fastnetmon.conf'
+FASTNETMON_CONF = '/run/fastnetmon/fastnetmon.conf'
 base_path = ['service', 'ids', 'ddos-protection']
 
 class TestServiceIDS(VyOSUnitTestSHIM.TestCase):
diff --git a/src/conf_mode/service_ids_fastnetmon.py b/src/conf_mode/service_ids_fastnetmon.py
index 8213d536e..615658c84 100755
--- a/src/conf_mode/service_ids_fastnetmon.py
+++ b/src/conf_mode/service_ids_fastnetmon.py
@@ -27,8 +27,8 @@ from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
 
-config_file = r'/etc/fastnetmon.conf'
-networks_list = r'/etc/networks_list'
+config_file = r'/run/fastnetmon/fastnetmon.conf'
+networks_list = r'/run/fastnetmon/networks_list'
 
 def get_config(config=None):
     if config:
@@ -36,8 +36,10 @@ def get_config(config=None):
     else:
         conf = Config()
     base = ['service', 'ids', 'ddos-protection']
-    fastnetmon = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
+    if not conf.exists(base):
+        return None
 
+    fastnetmon = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
     # We have gathered the dict representation of the CLI, but there are default
     # options which we need to update into the dictionary retrived.
     default_values = defaults(base)
@@ -65,24 +67,23 @@ def verify(fastnetmon):
 
 def generate(fastnetmon):
     if not fastnetmon:
-        if os.path.isfile(config_file):
-            os.unlink(config_file)
-        if os.path.isfile(networks_list):
-            os.unlink(networks_list)
+        for file in [config_file, networks_list]:
+            if os.path.isfile(file):
+                os.unlink(file)
 
-        return
+        return None
 
     render(config_file, 'ids/fastnetmon.j2', fastnetmon)
     render(networks_list, 'ids/fastnetmon_networks_list.j2', fastnetmon)
-
     return None
 
 def apply(fastnetmon):
+    systemd_service = 'fastnetmon.service'
     if not fastnetmon:
         # Stop fastnetmon service if removed
-        call('systemctl stop fastnetmon.service')
+        call(f'systemctl stop {systemd_service}')
     else:
-        call('systemctl restart fastnetmon.service')
+        call(f'systemctl reload-or-restart {systemd_service}')
 
     return None
 
diff --git a/src/etc/systemd/system/fastnetmon.service.d/override.conf b/src/etc/systemd/system/fastnetmon.service.d/override.conf
new file mode 100644
index 000000000..8f7f3774f
--- /dev/null
+++ b/src/etc/systemd/system/fastnetmon.service.d/override.conf
@@ -0,0 +1,12 @@
+[Unit]
+RequiresMountsFor=/run
+ConditionPathExists=/run/fastnetmon/fastnetmon.conf
+After=
+After=vyos-router.service
+
+[Service]
+Type=simple
+WorkingDirectory=/run/fastnetmon
+PIDFile=/run/fastnetmon/fastnetmon.pid
+ExecStart=
+ExecStart=/usr/sbin/fastnetmon --configuration_file /run/fastnetmon/fastnetmon.conf