diff --git a/plugins/l2tp/LICENSE b/plugins/l2tp/LICENSE
new file mode 100644
index 000000000..b89fade39
--- /dev/null
+++ b/plugins/l2tp/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Mr Chen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/plugins/l2tp/README.md b/plugins/l2tp/README.md
new file mode 100644
index 000000000..7119b07cb
--- /dev/null
+++ b/plugins/l2tp/README.md
@@ -0,0 +1,17 @@
+# mw-l2tp
+
+```
+mdserver-web项目的中用于管理vpn的插件
+```
+
+### 安装过程
+
+```
+* 先进行压缩 `cd mw-l2tp && zip l2tp.zip -r ./* `
+* 在mdserver-web点击`添加插件`
+```
+
+### 截图
+
+[](/screenshot/ss1.png)
+
diff --git a/plugins/l2tp/ico.png b/plugins/l2tp/ico.png
new file mode 100644
index 000000000..ddfd2f89b
Binary files /dev/null and b/plugins/l2tp/ico.png differ
diff --git a/plugins/l2tp/index.html b/plugins/l2tp/index.html
new file mode 100755
index 000000000..13b95bfaf
--- /dev/null
+++ b/plugins/l2tp/index.html
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/plugins/l2tp/index.py b/plugins/l2tp/index.py
new file mode 100755
index 000000000..e0b1eb576
--- /dev/null
+++ b/plugins/l2tp/index.py
@@ -0,0 +1,233 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import shutil
+
+sys.path.append(os.getcwd() + "/class/core")
+import public
+
+app_debug = False
+if public.isAppleSystem():
+ app_debug = True
+
+
+def getPluginName():
+ return 'l2tp'
+
+
+def getPluginDir():
+ return public.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+ return public.getServerDir() + '/' + getPluginName()
+
+
+def getArgs():
+ args = sys.argv[2:]
+ tmp = {}
+ args_len = len(args)
+
+ if args_len == 1:
+ t = args[0].strip('{').strip('}')
+ t = t.split(':')
+ tmp[t[0]] = t[1]
+ elif args_len > 1:
+ for i in range(len(args)):
+ t = args[i].split(':')
+ tmp[t[0]] = t[1]
+
+ return tmp
+
+
+def checkArgs(data, ck=[]):
+ for i in range(len(ck)):
+ if not ck[i] in data:
+ return (False, public.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+ return (True, public.returnJson(True, 'ok'))
+
+
+def status():
+ cmd = "ps -ef|grep xl2tpd |grep -v grep | grep -v python | awk '{print $2}'"
+ data = public.execShell(cmd)
+ if data[0] == '':
+ return 'stop'
+ return 'start'
+
+
+def initConf():
+ l2tp_cs = getServerDir() + '/chap-secrets'
+ if not os.path.exists(l2tp_cs):
+ public.execShell('cp -rf ' + getPluginDir() +
+ '/tmp/chap-secrets' + ' ' + getServerDir())
+
+ l2tp_is = getServerDir() + '/ipsec.secrets'
+ if not os.path.exists(l2tp_is):
+ public.execShell('cp -rf ' + getPluginDir() +
+ '/tmp/ipsec.secrets' + ' ' + getServerDir())
+
+
+def start():
+ initConf()
+
+ if public.isAppleSystem():
+ return "Apple Computer does not support"
+
+ data = public.execShell('service xl2tpd start')
+ if data[0] == '':
+ return 'ok'
+ return data[1]
+
+
+def stop():
+ if public.isAppleSystem():
+ return "Apple Computer does not support"
+
+ data = public.execShell('service xl2tpd stop')
+ if data[0] == '':
+ return 'ok'
+ return data[1]
+
+
+def restart():
+ if public.isAppleSystem():
+ return "Apple Computer does not support"
+
+ data = public.execShell('service xl2tpd restart')
+ if data[0] == '':
+ return 'ok'
+ return data[1]
+
+
+def reload():
+ data = public.execShell('service xl2tpd reload')
+ if data[0] == '':
+ return 'ok'
+ return data[1]
+
+
+def getPathFile():
+ if public.isAppleSystem():
+ return getServerDir() + '/chap-secrets'
+ return '/etc/ppp/chap-secrets'
+
+
+def getPathFilePsk():
+ if public.isAppleSystem():
+ return getServerDir() + '/ipsec.secrets'
+ return '/etc/ipsec.secrets'
+
+
+def getUserList():
+ import re
+ path = getPathFile()
+ if not os.path.exists(path):
+ return public.returnJson(False, '密码配置文件不存在!')
+ conf = public.readFile(path)
+
+ conf = re.sub('#(.*)\n', '', conf)
+
+ if conf.strip() == '':
+ return public.returnJson(True, 'ok', [])
+
+ ulist = conf.strip().split('\n')
+
+ user = []
+ for line in ulist:
+ line_info = {}
+ line = re.match(r'(\w*)\s*(\w*)\s*(\w*)\s*(.*)',
+ line.strip(), re.M | re.I).groups()
+ line_info['user'] = line[0]
+ line_info['pwd'] = line[2]
+ line_info['type'] = line[1]
+ line_info['ip'] = line[3]
+ user.append(line_info)
+
+ return public.returnJson(True, 'ok', user)
+
+
+def addUser():
+ if public.isAppleSystem():
+ return public.returnJson(False, "Apple Computer does not support")
+
+ args = getArgs()
+ data = checkArgs(args, ['username'])
+ if not data[0]:
+ return data[1]
+ ret = public.execShell('echo ' + args['username'] + '|l2tp -a')
+ if ret[1] == '':
+ return public.returnJson(True, '添加成功!:' + ret[0])
+ return public.returnJson(False, '添加失败:' + ret[0])
+
+
+def delUser():
+ if public.isAppleSystem():
+ return public.returnJson(False, "Apple Computer does not support")
+
+ args = getArgs()
+ data = checkArgs(args, ['username'])
+ if not data[0]:
+ return data[1]
+
+ ret = public.execShell('echo ' + args['username'] + '|l2tp -d')
+ if ret[1] == '':
+ return public.returnJson(True, '删除成功!:' + ret[0])
+ return public.returnJson(False, '删除失败:' + ret[0])
+
+
+def modUser():
+
+ args = getArgs()
+ data = checkArgs(args, ['username', 'password'])
+ if not data[0]:
+ return data[1]
+
+ path = getPathFile()
+ username = args['username']
+ password = args['password']
+
+ # sed -i "/^\<${user}\>/d" /etc/ppp/chap-secrets
+ # echo "${user} l2tpd ${pass} *" >> /etc/ppp/chap-secrets
+
+ if public.isAppleSystem():
+ public.execShell("sed -i .bak '/^\(" + username + "\)/d' " + path)
+ else:
+ public.execShell("sed -i '/^\(" + username + "\)/d' " + path)
+ # print 'echo "' + username + " l2tpd " + password + " *\" >>"
+ # + path
+ ret = public.execShell("echo \"" + username +
+ " l2tpd " + password + " *\" >>" + path)
+ if ret[1] == '':
+ return public.returnJson(True, '修改成功!')
+ return public.returnJson(False, '修改失败')
+
+
+if __name__ == "__main__":
+ func = sys.argv[1]
+ if func == 'status':
+ print status()
+ elif func == 'start':
+ print start()
+ elif func == 'stop':
+ print stop()
+ elif func == 'restart':
+ print restart()
+ elif func == 'reload':
+ print reload()
+ elif func == 'conf':
+ print getPathFile()
+ elif func == 'conf_psk':
+ print getPathFilePsk()
+ elif func == 'user_list':
+ print getUserList()
+ elif func == 'add_user':
+ print addUser()
+ elif func == 'del_user':
+ print delUser()
+ elif func == 'mod_user':
+ print modUser()
+ else:
+ print 'error'
diff --git a/plugins/l2tp/info.json b/plugins/l2tp/info.json
new file mode 100755
index 000000000..8d3ab2fb1
--- /dev/null
+++ b/plugins/l2tp/info.json
@@ -0,0 +1,14 @@
+{
+ "title":"L2TP",
+ "tip":"soft",
+ "name":"l2tp",
+ "type":"运行环境",
+ "ps":"VPN网关",
+ "versions":"1.0",
+ "shell":"install.sh",
+ "checks":"server/l2tp",
+ "author":"teddysun",
+ "home":"https://github.com/teddysun/across/blob/master/l2tp.sh",
+ "date":"2019-02-27",
+ "pid": "4"
+}
\ No newline at end of file
diff --git a/plugins/l2tp/install.sh b/plugins/l2tp/install.sh
new file mode 100755
index 000000000..2d7b767bb
--- /dev/null
+++ b/plugins/l2tp/install.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+SYSOS=`uname`
+
+Install_l2tp()
+{
+ isStart=""
+ echo '正在安装脚本文件...' > $install_tmp
+ mkdir -p $serverPath/l2tp
+ echo '1.0' > $serverPath/l2tp/version.pl
+
+ cp -rf scripts/l2tp.sh $serverPath/l2tp
+ chmod +x $serverPath/l2tp/l2tp.sh
+
+ if [ "Darwin" == "$SYSOS" ];then
+ echo 'macosx unavailable' > $install_tmp
+ exit 0
+ fi
+
+ /bin/sh $serverPath/l2tp/l2tp.sh
+
+ echo 'install complete' > $install_tmp
+}
+
+Uninstall_l2tp()
+{
+ rm -rf $serverPath/l2tp
+ echo "Uninstall completed" > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+ Install_l2tp
+else
+ Uninstall_l2tp
+fi
diff --git a/plugins/l2tp/js/l2tp.js b/plugins/l2tp/js/l2tp.js
new file mode 100755
index 000000000..12b0c4fc4
--- /dev/null
+++ b/plugins/l2tp/js/l2tp.js
@@ -0,0 +1,150 @@
+function str2Obj(str){
+ var data = {};
+ kv = str.split('&');
+ for(i in kv){
+ v = kv[i].split('=');
+ data[v[0]] = v[1];
+ }
+ return data;
+}
+
+function lpPost(method,args,callback, title){
+
+ var _args = null;
+ if (typeof(args) == 'string'){
+ _args = JSON.stringify(str2Obj(args));
+ } else {
+ _args = JSON.stringify(args);
+ }
+
+ var _title = '正在获取...';
+ if (typeof(title) != 'undefined'){
+ _title = title;
+ }
+
+ var loadT = layer.msg(_title, { icon: 16, time: 0, shade: 0.3 });
+ $.post('/plugins/run', {name:'l2tp', func:method, args:_args}, function(data) {
+ layer.close(loadT);
+ if (!data.status){
+ layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+ return;
+ }
+
+ if(typeof(callback) == 'function'){
+ callback(data);
+ }
+ },'json');
+}
+
+function lpAsyncPost(method,args){
+ var _args = null;
+ if (typeof(args) == 'string'){
+ _args = JSON.stringify(str2Obj(args));
+ } else {
+ _args = JSON.stringify(args);
+ }
+
+ var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+ return syncPost('/plugins/run', {name:'l2tp', func:method, args:_args});
+}
+
+function userList(){
+ lpPost('user_list', '' ,function(data){
+ var rdata = $.parseJSON(data['data']);
+
+ if (!rdata['status']){
+ layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+ return;
+ }
+ var list = rdata['data'];
+
+ var con = '';
+ con += '';
+ con += '';
+ con += '| 用户 | ';
+ con += '密码 | ';
+ con += '操作(添加) | ';
+ con += '
';
+
+ con += '';
+
+ for (var i = 0; i < list.length; i++) {
+ con += ''+
+ '| ' + list[i]['user']+' | ' +
+ '' + list[i]['pwd']+' | ' +
+ '改密|删除 |
';
+ }
+
+ con += '';
+ con += '