openvpn: more relocations for private scripts

This commit is contained in:
Franco Fichtner 2017-11-22 08:56:26 +01:00
parent dc353d4860
commit 95215828a7
5 changed files with 7 additions and 7 deletions

6
plist
View File

@ -42,6 +42,9 @@
/usr/local/etc/inc/plugins.inc.d/openvpn.inc
/usr/local/etc/inc/plugins.inc.d/openvpn/attributes.sh
/usr/local/etc/inc/plugins.inc.d/openvpn/auth-user.php
/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn-linkdown
/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn-linkup
/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn_auth_verify
/usr/local/etc/inc/plugins.inc.d/openvpn/tls-verify.php
/usr/local/etc/inc/plugins.inc.d/openvpn/wizard.inc
/usr/local/etc/inc/plugins.inc.d/pf.inc
@ -926,9 +929,6 @@
/usr/local/sbin/opnsense-auth
/usr/local/sbin/opnsense-importer
/usr/local/sbin/opnsense-installer
/usr/local/sbin/ovpn-linkdown
/usr/local/sbin/ovpn-linkup
/usr/local/sbin/ovpn_auth_verify
/usr/local/sbin/ping_hosts.sh
/usr/local/sbin/pluginctl
/usr/local/sbin/ppp-linkdown

View File

@ -578,8 +578,8 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
$conf .= "proto {$proto}\n";
$conf .= "cipher {$cipher}\n";
$conf .= "auth {$digest}\n";
$conf .= "up /usr/local/sbin/ovpn-linkup\n";
$conf .= "down /usr/local/sbin/ovpn-linkdown\n";
$conf .= "up /usr/local/etc/inc/plugins.inc.d/openvpn/ovpn-linkup\n";
$conf .= "down /usr/local/etc/inc/plugins.inc.d/openvpn/ovpn-linkdown\n";
switch($settings['mode']) {
case 'server_user':
@ -688,7 +688,7 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
if ($settings['strictusercn']) {
$strictusercn = "true";
}
$conf .= "auth-user-pass-verify \"/usr/local/sbin/ovpn_auth_verify user '{$settings['authmode']}' '{$strictusercn}' '{$mode_id}'\" via-env\n";
$conf .= "auth-user-pass-verify \"/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn_auth_verify user '{$settings['authmode']}' '{$strictusercn}' '{$mode_id}'\" via-env\n";
}
break;
}
@ -702,7 +702,7 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
$cert = lookup_cert($settings['certref']);
/* XXX: Seems not used at all! */
$servercn = urlencode(cert_get_cn($cert['crt']));
$conf .= "tls-verify \"/usr/local/sbin/ovpn_auth_verify tls '{$servercn}' {$settings['cert_depth']}\"\n";
$conf .= "tls-verify \"/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn_auth_verify tls '{$servercn}' {$settings['cert_depth']}\"\n";
}
}