4 files changed, 30 insertions, 0 deletions
diff --git a/debian/control b/debian/control
index 851152d95..ab3b46ba1 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,7 @@ Depends:
   bmon,
   bsdmainutils,
   conntrack,
+  conntrackd,
   conserver-client,
   conserver-server,
   console-data,
@@ -67,7 +68,12 @@ Depends:
   lcdproc,
   libatomic1,
   libndp-tools,
+  libnetfilter-conntrack3,
+  libnfnetlink0,
   libpam-radius-auth (>= 1.5.0),
+  libstrongswan-standard-plugins (>=5.8),
+  libstrongswan-extra-plugins (>=5.8),
+  libcharon-extra-plugins (>=5.8),
   libvyosconfig0,
   lldpd,
   lm-sensors,
@@ -80,7 +86,9 @@ Depends:
   nginx-light,
   ntp,
   ntpdate,
+  nvme-cli,
   ocserv,
+  opennhrp,
   openssh-server,
   openssl,
   openvpn,
@@ -94,6 +102,7 @@ Depends:
   procps,
   python3,
   python3-certbot-nginx,
+  python3-crypto,
   ${python3:Depends},
   python3-flask,
   python3-hurry.filesize,
@@ -116,12 +125,15 @@ Depends:
   qrencode,
   radvd,
   salt-minion,
+  smartmontools,
   snmp,
   snmpd,
   squid,
   squidclient,
   squidguard,
   ssl-cert,
+  strongswan (>= 5.8),
+  strongswan-swanctl (>= 5.8),
   systemd,
   tcpdump,
   tcptraceroute,
@@ -132,6 +144,7 @@ Depends:
   udp-broadcast-relay,
   usb-modeswitch,
   usbutils,
+  vyatta-cfg,
   vyos-http-api-tools,
   vyos-utils,
   wide-dhcpv6-client,
diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install
index bfc30f7e6..0c6c226ee 100644
--- a/debian/vyos-1x.install
+++ b/debian/vyos-1x.install
@@ -1,5 +1,7 @@
 etc/dhcp
+etc/ipsec.d
 etc/netplug
+etc/opennhrp
 etc/ppp
 etc/rsyslog.d
 etc/systemd
@@ -22,4 +24,5 @@ usr/libexec/vyos/services
 usr/libexec/vyos/system
 usr/libexec/vyos/validators
 usr/libexec/vyos/*.py
+usr/libexec/vyos/*.sh
 usr/share
diff --git a/debian/vyos-1x.links b/debian/vyos-1x.links
new file mode 100644
index 000000000..ea4e4e7da
--- /dev/null
+++ b/debian/vyos-1x.links
@@ -0,0 +1 @@
+/usr/share/vyos/mibs /usr/share/snmp/mibs
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst
index 8acc87cc8..136d025d4 100644
--- a/debian/vyos-1x.postinst
+++ b/debian/vyos-1x.postinst
@@ -66,3 +66,16 @@ fi
 
 # ensure hte proxy user has a proper shell
 chsh -s /bin/sh proxy
+
+# vyatta-cfg-vpn migration
+for init in openswan ipsec setkey; do
+  update-rc.d -f ${init} remove >/dev/null
+done
+
+# remove keys
+rm -f /etc/ipsec.secrets
+touch /etc/ipsec.secrets
+chown root:root /etc/ipsec.secrets
+chmod 600 /etc/ipsec.secrets
+rm -f /etc/ipsec.d/private/localhost.localdomainKey.pem
+rm -f /etc/ipsec.d/certs/localhost.localdomainCert.pem
+\ No newline at end of file