lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvpn: move internal script file to plugin location

Browse Source
This commit is contained in:
Franco Fichtner 2017-11-22 08:50:54 +01:00
parent aaf2178f5a
commit dc353d4860
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plist
View File

@ -40,6 +40,7 @@
/usr/local/etc/inc/plugins.inc.d/ntpd.inc
/usr/local/etc/inc/plugins.inc.d/openssh.inc
/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/tls-verify.php
/usr/local/etc/inc/plugins.inc.d/openvpn/wizard.inc
@ -922,7 +923,6 @@
/usr/local/sbin/dhclient-script.ext
/usr/local/sbin/mpd.script
/usr/local/sbin/ntpdate_sync_once.sh
/usr/local/sbin/openvpn.attributes.sh
/usr/local/sbin/opnsense-auth
/usr/local/sbin/opnsense-importer
/usr/local/sbin/opnsense-installer

18
src/etc/inc/plugins.inc.d/openvpn.inc
View File

@ -564,6 +564,7 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
}
break;
}
$conf .= "dev-node /dev/{$tunname}\n";
$conf .= "writepid /var/run/openvpn_{$mode_id}.pid\n";
$conf .= "#user nobody\n";
@ -579,14 +580,15 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
$conf .= "auth {$digest}\n";
$conf .= "up /usr/local/sbin/ovpn-linkup\n";
$conf .= "down /usr/local/sbin/ovpn-linkdown\n";
if (file_exists("/usr/local/sbin/openvpn.attributes.sh")) {
switch($settings['mode']) {
case 'server_user':
case 'server_tls_user':
$conf .= "client-connect /usr/local/sbin/openvpn.attributes.sh\n";
$conf .= "client-disconnect /usr/local/sbin/openvpn.attributes.sh\n";
break;
}
switch($settings['mode']) {
case 'server_user':
case 'server_tls_user':
$conf .= "client-connect /usr/local/etc/inc/plugins.inc.d/openvpn/attributes.sh\n";
$conf .= "client-disconnect /usr/local/etc/inc/plugins.inc.d/openvpn/attributes.sh\n";
break;
default:
break;
}
if (!empty($iface_ip)) {

0
src/sbin/openvpn.attributes.sh → src/etc/inc/plugins.inc.d/openvpn/attributes.sh
View File