summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/control1
-rw-r--r--debian/vyos-1x.install1
-rw-r--r--debian/vyos-1x.postinst9
-rw-r--r--debian/vyos-1x.preinst1
4 files changed, 12 insertions, 0 deletions
diff --git a/debian/control b/debian/control
index 8cafd8257..7706c6523 100644
--- a/debian/control
+++ b/debian/control
@@ -130,6 +130,7 @@ Depends:
ssl-cert,
sudo,
systemd,
+ telegraf (>= 1.20),
tcpdump,
tcptraceroute,
telnet,
diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install
index 082c5a62f..38a032a63 100644
--- a/debian/vyos-1x.install
+++ b/debian/vyos-1x.install
@@ -5,6 +5,7 @@ etc/ppp
etc/rsyslog.d
etc/systemd
etc/sysctl.d
+etc/telegraf
etc/udev
etc/update-motd.d
etc/vyos
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst
index 92948de12..d54f6c5af 100644
--- a/debian/vyos-1x.postinst
+++ b/debian/vyos-1x.postinst
@@ -33,3 +33,12 @@ fi
# ensure hte proxy user has a proper shell
chsh -s /bin/sh proxy
+
+# Remove unwanted daemon files from /etc
+# conntackd
+DELETE="/etc/logrotate.d/conntrackd.distrib /etc/init.d/conntrackd /etc/default/conntrackd"
+for file in $DELETE; do
+ if [ -f ${file} ]; then
+ rm -f ${file}
+ fi
+done
diff --git a/debian/vyos-1x.preinst b/debian/vyos-1x.preinst
new file mode 100644
index 000000000..a3773d141
--- /dev/null
+++ b/debian/vyos-1x.preinst
@@ -0,0 +1 @@
+dpkg-divert --package vyos-1x --add --rename /etc/logrotate.d/conntrackd