From b0ab33893e8f8dd57d4e13f77bd96d1bd156f0a3 Mon Sep 17 00:00:00 2001
From: Zsolt Ero <zsolt.ero@gmail.com>
Date: Fri, 29 Dec 2023 20:43:31 +0100
Subject: [PATCH] work

---
 init-server.py                        |  4 ++--
 ssh_lib/assets/kernel/60-ofm.conf     |  1 -
 ssh_lib/assets/kernel/limits-ofm.conf |  4 ----
 ssh_lib/kernel.py                     | 25 +++++++++++++++++++++----
 ssh_lib/nginx.py                      |  1 +
 5 files changed, 24 insertions(+), 11 deletions(-)
 delete mode 100644 ssh_lib/assets/kernel/60-ofm.conf
 delete mode 100644 ssh_lib/assets/kernel/limits-ofm.conf

diff --git a/init-server.py b/init-server.py
index 00a552f..bbfa533 100755
--- a/init-server.py
+++ b/init-server.py
@@ -7,7 +7,7 @@ from fabric import Config, Connection
 
 from ssh_lib import CONFIG_DIR, HTTP_HOST_BIN, OFM_DIR, REMOTE_CONFIG, SCRIPTS_DIR, TILE_GEN_BIN
 from ssh_lib.benchmark import c1000k
-from ssh_lib.kernel import setup_kernel_settings
+from ssh_lib.kernel import kernel_tweaks_ofm
 from ssh_lib.nginx import certbot, nginx
 from ssh_lib.pkg_base import pkg_base, pkg_upgrade
 from ssh_lib.planetiler import install_planetiler
@@ -23,7 +23,7 @@ def prepare_shared(c):
     pkg_upgrade(c)
     pkg_base(c)
 
-    setup_kernel_settings(c)
+    kernel_tweaks_ofm(c)
 
     c.sudo(f'mkdir -p {REMOTE_CONFIG}')
     c.sudo('chown ofm:ofm /data/ofm/config')
diff --git a/ssh_lib/assets/kernel/60-ofm.conf b/ssh_lib/assets/kernel/60-ofm.conf
deleted file mode 100644
index 6fdeb0c..0000000
--- a/ssh_lib/assets/kernel/60-ofm.conf
+++ /dev/null
@@ -1 +0,0 @@
-net.core.somaxconn = 65535
diff --git a/ssh_lib/assets/kernel/limits-ofm.conf b/ssh_lib/assets/kernel/limits-ofm.conf
deleted file mode 100644
index 867db5f..0000000
--- a/ssh_lib/assets/kernel/limits-ofm.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-* soft nofile 1048576
-* hard nofile 1048576
-root soft nofile 1048576
-root hard nofile 1048576
\ No newline at end of file
diff --git a/ssh_lib/kernel.py b/ssh_lib/kernel.py
index 84ae0ed..f6ed870 100644
--- a/ssh_lib/kernel.py
+++ b/ssh_lib/kernel.py
@@ -1,7 +1,24 @@
 from ssh_lib import ASSETS_DIR
-from ssh_lib.utils import put
+from ssh_lib.utils import put, put_str
 
 
-def setup_kernel_settings(c):
-    put(c, f'{ASSETS_DIR}/kernel/60-ofm.conf', '/etc/sysctl.d/')
-    put(c, f'{ASSETS_DIR}/kernel/limits-ofm.conf', '/etc/security/limits.d/')
+def kernel_somaxconn65k(c):
+    put_str(c, '/etc/sysctl.d/60-somaxconn65k.conf', 'net.core.somaxconn = 65535')
+
+
+def kernel_limits1m(c):
+    put_str(
+        c,
+        '/etc/security/limits.d/limits1m.conf',
+        """
+            * soft nofile 1048576
+            * hard nofile 1048576
+            root soft nofile 1048576
+            root hard nofile 1048576
+        """,
+    )
+
+
+def kernel_tweaks_ofm(c):
+    kernel_somaxconn65k(c)
+    kernel_limits1m(c)
diff --git a/ssh_lib/nginx.py b/ssh_lib/nginx.py
index 97fc1cf..01b82ab 100644
--- a/ssh_lib/nginx.py
+++ b/ssh_lib/nginx.py
@@ -54,6 +54,7 @@ def nginx(c):
 
 
 def mime_types(c):
+    # TODO
     pass