From a5638df3e71581b1117565ae76c55f744b243be2 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Thu, 12 Nov 2020 15:44:56 +0600
Subject: [PATCH] 1.modify  sapp, tfe, certstore memory limit 2.add sapp.toml
 l2tp

---
 NurSultan_install_config/hosts       | 8 --------
 roles/certstore/files/memory.conf    | 3 ++-
 roles/sapp/files/memory.conf         | 3 ++-
 roles/sapp/templates/conflist.inf.j2 | 1 +
 roles/tfe/files/memory.conf          | 3 ++-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/NurSultan_install_config/hosts b/NurSultan_install_config/hosts
index 2d6f89e..c877c9e 100644
--- a/NurSultan_install_config/hosts
+++ b/NurSultan_install_config/hosts
@@ -37,20 +37,12 @@
 [adc_mxn]
 10.4.55.[1:78]
 [adc_mcn0]
-#10.4.51.22
-#10.4.51.[53:54]
 10.4.51.[1:78]
 [adc_mcn1]
-#10.4.52.22
-#10.4.52.[53:54]
 10.4.52.[1:78]
 [adc_mcn2]
-#10.4.53.22
-#10.4.53.[53:54]
 10.4.53.[1:78]
 [adc_mcn3]
-#10.4.54.22
-#10.4.54.[53:54]
 10.4.54.[1:78]
 [packet_dump_server]
 10.4.61.3
diff --git a/roles/certstore/files/memory.conf b/roles/certstore/files/memory.conf
index b6613bd..3d34ac1 100644
--- a/roles/certstore/files/memory.conf
+++ b/roles/certstore/files/memory.conf
@@ -1,2 +1,3 @@
 [Service]
-MemoryMax=10G
\ No newline at end of file
+MemoryLimit=16G
+ExecStartPost=/bin/bash -c "echo 16G > /sys/fs/cgroup/memory/system.slice/certstore.service/memory.memsw.limit_in_bytes"
diff --git a/roles/sapp/files/memory.conf b/roles/sapp/files/memory.conf
index 5de1253..64fc64a 100644
--- a/roles/sapp/files/memory.conf
+++ b/roles/sapp/files/memory.conf
@@ -1,2 +1,3 @@
 [Service]
-MemoryMax=100G
\ No newline at end of file
+MemoryLimit=100G
+ExecStartPost=/bin/bash -c "echo 100G > /sys/fs/cgroup/memory/system.slice/sapp.service/memory.memsw.limit_in_bytes"
diff --git a/roles/sapp/templates/conflist.inf.j2 b/roles/sapp/templates/conflist.inf.j2
index 870644f..809bb37 100644
--- a/roles/sapp/templates/conflist.inf.j2
+++ b/roles/sapp/templates/conflist.inf.j2
@@ -19,6 +19,7 @@
 ./plug/protocol/mail/mail.inf
 ./plug/protocol/ftp/ftp.inf
 ./plug/protocol/quic/quic.inf
+./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
 
 [business]
 ./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
diff --git a/roles/tfe/files/memory.conf b/roles/tfe/files/memory.conf
index 5de1253..b203960 100644
--- a/roles/tfe/files/memory.conf
+++ b/roles/tfe/files/memory.conf
@@ -1,2 +1,3 @@
 [Service]
-MemoryMax=100G
\ No newline at end of file
+MemoryLimit=80G
+ExecStartPost=/bin/bash -c "echo 80G > /sys/fs/cgroup/memory/system.slice/tfe.service/memory.memsw.limit_in_bytes"