summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorKim <kim.sidney@gmail.com>2019-03-14 16:25:08 +0100
committerUnicronNL <kim.sidney@gmail.com>2019-03-14 16:28:30 +0100
commitbcdf0dead416fdc8e390ee3ba56fc5e7c6490e72 (patch)
tree95739272d866079199ee32fe2bb2e2d244f41d12 /Makefile.am
parent9900fb602e29b52e940ba7ee6eae3886b764fbfe (diff)
downloadvyatta-cfg-vpn-bcdf0dead416fdc8e390ee3ba56fc5e7c6490e72.tar.gz
vyatta-cfg-vpn-bcdf0dead416fdc8e390ee3ba56fc5e7c6490e72.zip
Fixes T1298 use vti tunnel with ipsec and dhcp.
* make dhcp interface work for vti interfaces * clean up code, loger timeout use python api * change vti tunnel ip on new dhcp lease * only change ip on up and do not get non dhcp ip * fix error in function, include up-host and down-host
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 1dc45b1..2da9b18 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ etcudevdir = /etc/udev
initddir = /etc/init.d
logrotatedir = /etc/logrotate.d
curverdir = $(sysconfdir)/config-migrate/current
-bin_sudo_usersdir = $(bindir)/sudo-users
+bin_sudo_usersdir = /usr/libexec/vyos/system
sbin_SCRIPTS =
@@ -14,7 +14,7 @@ sbin_SCRIPTS += scripts/dmvpn-config.pl
sbin_SCRIPTS += scripts/vyatta-vpn-ppp-updown.pl
sbin_SCRIPTS += scripts/vyatta-vti-config.pl
-bin_sudo_users_SCRIPTS = scripts/vyatta-ipsec-dhcp.pl
+bin_sudo_users_SCRIPTS = scripts/vyatta-ipsec-dhcp.py
share_perl5_DATA = lib/Vyatta/VPN/Util.pm
share_perl5_DATA += lib/Vyatta/VPN/vtiIntf.pm