l2tp: make it shine (as a service)

This commit is contained in:
Franco Fichtner 2016-02-19 19:18:15 +01:00
parent 40516e542e
commit 4635ac7b98
5 changed files with 24 additions and 6 deletions

View File

@ -44,7 +44,7 @@ function vpn_services()
$services = array();
if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == 'server') {
if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] != 'off') {
$pconfig = array();
$pconfig['name'] = 'pptpd';
$pconfig['description'] = gettext('PPTP Server');
@ -52,6 +52,14 @@ function vpn_services()
$services[] = $pconfig;
}
if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] != 'off') {
$pconfig = array();
$pconfig['name'] = 'l2tpd';
$pconfig['description'] = gettext('L2TP Server');
$pconfig['pidfile'] = '/var/run/l2tp-vpn.pid';
$services[] = $pconfig;
}
return $services;
}

View File

@ -19,4 +19,7 @@ $tab_array = array();
$tab_array[] = array(gettext("L2TP Logins"), $mode != "raw", "/diag_logs_l2tp.php");
$tab_array[] = array(gettext("L2TP Raw"), $mode == "raw", "/diag_logs_l2tp.php?mode=raw");
require_once 'services.inc';
$service_hook = 'l2tpd';
require_once 'diag_logs_vpn.inc';

View File

@ -28,9 +28,10 @@
*/
require_once("guiconfig.inc");
require_once("plugins.inc.d/vpn.inc");
require_once("pfsense-utils.inc");
require_once("interfaces.inc");
require_once("services.inc");
require_once("plugins.inc.d/vpn.inc");
if (!isset($config['l2tp']['radius']) || !is_array($config['l2tp']['radius'])) {
$config['l2tp']['radius'] = array();
@ -164,6 +165,8 @@ if ($_POST) {
}
}
$service_hook = 'l2tpd';
include("head.inc");
?>

View File

@ -28,6 +28,7 @@
*/
require_once("guiconfig.inc");
require_once("services.inc");
require_once("plugins.inc.d/vpn.inc");
if (!isset($config['l2tp']['user'])) {
@ -62,6 +63,8 @@ if ($_GET['act'] == "del") {
}
}
$service_hook = 'l2tpd';
include("head.inc");

View File

@ -44,6 +44,7 @@ function l2tp_users_sort()
}
require_once("guiconfig.inc");
require_once("services.inc");
require_once("plugins.inc.d/vpn.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/vpn_l2tp_users.php');
@ -122,18 +123,18 @@ if ($_POST) {
} else {
$a_secret[] = $secretent;
}
l2tp_users_sort();
write_config();
$retval = vpn_l2tp_configure();
vpn_l2tp_configure();
header("Location: vpn_l2tp_users.php");
exit;
}
}
$service_hook = 'l2tpd';
include("head.inc");
?>