diff --git a/plist b/plist index c836bcf04..f755581dc 100644 --- a/plist +++ b/plist @@ -685,6 +685,10 @@ /usr/local/opnsense/scripts/interfaces/list_interfaces.php /usr/local/opnsense/scripts/interfaces/list_macdb.py /usr/local/opnsense/scripts/interfaces/list_ndp.py +/usr/local/opnsense/scripts/interfaces/ppp-linkdown.sh +/usr/local/opnsense/scripts/interfaces/ppp-linkup.sh +/usr/local/opnsense/scripts/interfaces/ppp-log-uptime.sh +/usr/local/opnsense/scripts/interfaces/ppp-uptime.sh /usr/local/opnsense/scripts/ipsec/connect.py /usr/local/opnsense/scripts/ipsec/disconnect.py /usr/local/opnsense/scripts/ipsec/list_leases.py @@ -1570,10 +1574,6 @@ /usr/local/sbin/opnsense-version /usr/local/sbin/ping_hosts.sh /usr/local/sbin/pluginctl -/usr/local/sbin/ppp-linkdown -/usr/local/sbin/ppp-linkup -/usr/local/sbin/ppp-log-uptime.sh -/usr/local/sbin/ppp-uptime.sh /usr/local/share/man/man8/opnsense-importer.8.gz /usr/local/share/man/man8/opnsense-installer.8.gz /usr/local/share/man/man8/opnsense-shell.8.gz diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index bcfc6d673..0c106fa75 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -1304,8 +1304,8 @@ EOD; $mpdconf .= " set iface enable tcpmssfix\n"; } - $mpdconf .= " set iface up-script /usr/local/sbin/ppp-linkup\n"; - $mpdconf .= " set iface down-script /usr/local/sbin/ppp-linkdown\n"; + $mpdconf .= " set iface up-script /usr/local/opnsense/scripts/interfaces/ppp-linkup.sh\n"; + $mpdconf .= " set iface down-script /usr/local/opnsense/scripts/interfaces/ppp-linkdown.sh\n"; if ($ppp['type'] == "ppp") { if (is_ipaddr($ppp['localip'])) { $localip = $ppp['localip']; @@ -4308,7 +4308,7 @@ function get_interfaces_info() } if (file_exists("/var/run/{$link_type}_{$ifdescr}.pid")) { - $sec = trim(`/usr/local/sbin/ppp-uptime.sh {$ifinfo['if']}`); + $sec = trim(`/usr/local/opnsense/scripts/interfaces/ppp-uptime.sh {$ifinfo['if']}`); $ifinfo['ppp_uptime'] = convert_seconds_to_hms($sec); } diff --git a/src/sbin/ppp-linkdown b/src/opnsense/scripts/interfaces/ppp-linkdown.sh similarity index 95% rename from src/sbin/ppp-linkdown rename to src/opnsense/scripts/interfaces/ppp-linkdown.sh index 35a01e462..e3211f881 100755 --- a/src/sbin/ppp-linkdown +++ b/src/opnsense/scripts/interfaces/ppp-linkdown.sh @@ -14,7 +14,7 @@ ngctl shutdown ${IF}: if [ "${AF}" = "inet" ]; then if [ -f /tmp/${IF}up ] && [ -f /conf/${IF}.log ]; then seconds=$((`date -j +%s` - `/usr/bin/stat -f %m /tmp/${IF}up`)) - /usr/local/sbin/ppp-log-uptime.sh $seconds ${IF} & + /usr/local/opnsense/scripts/interfaces/ppp-log-uptime.sh $seconds ${IF} & fi if [ -s "/tmp/${IF}_defaultgw" ]; then diff --git a/src/sbin/ppp-linkup b/src/opnsense/scripts/interfaces/ppp-linkup.sh similarity index 100% rename from src/sbin/ppp-linkup rename to src/opnsense/scripts/interfaces/ppp-linkup.sh diff --git a/src/sbin/ppp-log-uptime.sh b/src/opnsense/scripts/interfaces/ppp-log-uptime.sh similarity index 100% rename from src/sbin/ppp-log-uptime.sh rename to src/opnsense/scripts/interfaces/ppp-log-uptime.sh diff --git a/src/sbin/ppp-uptime.sh b/src/opnsense/scripts/interfaces/ppp-uptime.sh similarity index 100% rename from src/sbin/ppp-uptime.sh rename to src/opnsense/scripts/interfaces/ppp-uptime.sh