From 4635ac7b98bb8dc717234b6cbf9495248ebb81ba Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 19 Feb 2016 19:18:15 +0100
Subject: [PATCH] l2tp: make it shine (as a service)

---
 src/etc/inc/plugins.inc.d/vpn.inc | 10 +++++++++-
 src/www/diag_logs_l2tp.php        |  3 +++
 src/www/vpn_l2tp.php              |  5 ++++-
 src/www/vpn_l2tp_users.php        |  3 +++
 src/www/vpn_l2tp_users_edit.php   |  9 +++++----
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/vpn.inc b/src/etc/inc/plugins.inc.d/vpn.inc
index 841600b31..cb61169f9 100644
--- a/src/etc/inc/plugins.inc.d/vpn.inc
+++ b/src/etc/inc/plugins.inc.d/vpn.inc
@@ -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;
 }
 
diff --git a/src/www/diag_logs_l2tp.php b/src/www/diag_logs_l2tp.php
index 5bea2fe32..f3a0f17c9 100644
--- a/src/www/diag_logs_l2tp.php
+++ b/src/www/diag_logs_l2tp.php
@@ -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';
diff --git a/src/www/vpn_l2tp.php b/src/www/vpn_l2tp.php
index 3c3a76305..0bbf88c44 100644
--- a/src/www/vpn_l2tp.php
+++ b/src/www/vpn_l2tp.php
@@ -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");
 ?>
 
diff --git a/src/www/vpn_l2tp_users.php b/src/www/vpn_l2tp_users.php
index 7829611cc..5fdfb8d1f 100644
--- a/src/www/vpn_l2tp_users.php
+++ b/src/www/vpn_l2tp_users.php
@@ -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");
 
 
diff --git a/src/www/vpn_l2tp_users_edit.php b/src/www/vpn_l2tp_users_edit.php
index 6fe45f4d7..3f3768300 100644
--- a/src/www/vpn_l2tp_users_edit.php
+++ b/src/www/vpn_l2tp_users_edit.php
@@ -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");
 ?>