From 0c5e6029c2468f5f58e2f8bc86b7f26ab4e656c6 Mon Sep 17 00:00:00 2001
From: Zsolt Ero <zsolt.ero@gmail.com>
Date: Fri, 29 Dec 2023 16:02:54 +0100
Subject: [PATCH] work

---
 .gitignore        |  1 +
 init-server.py    |  3 +--
 ssh_lib/config.py |  6 ++----
 ssh_lib/kernel.py | 16 +---------------
 ssh_lib/utils.py  |  2 +-
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index ecbdef4..65ae180 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ node_modules
 tmp
 temp
 
+harden*
 
 /.idea
 venv
diff --git a/init-server.py b/init-server.py
index c56b632..202195c 100755
--- a/init-server.py
+++ b/init-server.py
@@ -14,7 +14,7 @@ from ssh_lib.config import (
     SCRIPTS_DIR,
     TILE_GEN_BIN,
 )
-from ssh_lib.kernel import set_cpu_governor, setup_kernel_settings
+from ssh_lib.kernel import setup_kernel_settings
 from ssh_lib.nginx import certbot, nginx
 from ssh_lib.pkg_base import pkg_base, pkg_upgrade
 from ssh_lib.planetiler import install_planetiler
@@ -31,7 +31,6 @@ def prepare_shared(c):
     pkg_base(c)
 
     setup_kernel_settings(c)
-    set_cpu_governor(c)
 
     c.sudo(f'mkdir -p {REMOTE_CONFIG}')
     c.sudo('chown ofm:ofm /data/ofm/config')
diff --git a/ssh_lib/config.py b/ssh_lib/config.py
index cd84eee..8510d71 100644
--- a/ssh_lib/config.py
+++ b/ssh_lib/config.py
@@ -1,10 +1,8 @@
 from pathlib import Path
 
 
-base = Path(__file__).parent.parent
-
-CONFIG_DIR = base / 'config'
-SCRIPTS_DIR = base / 'scripts'
+CONFIG_DIR = Path(__file__).parent.parent / 'config'
+SCRIPTS_DIR = Path(__file__).parent.parent / 'scripts'
 ASSETS_DIR = Path(__file__).parent / 'assets'
 
 
diff --git a/ssh_lib/kernel.py b/ssh_lib/kernel.py
index 499903c..c7a1e58 100644
--- a/ssh_lib/kernel.py
+++ b/ssh_lib/kernel.py
@@ -1,21 +1,7 @@
 from ssh_lib.config import ASSETS_DIR
-from ssh_lib.utils import apt_get_install, apt_get_purge, put, put_str
+from ssh_lib.utils import put
 
 
 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 set_cpu_governor(c):
-    apt_get_install(c, 'cpufrequtils')
-    apt_get_purge(c, 'linux-tools-*')
-
-    put_str(
-        c,
-        '/etc/default/cpufrequtils',
-        'GOVERNOR="performance"',
-    )
-
-    # check after reboot
-    # cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
diff --git a/ssh_lib/utils.py b/ssh_lib/utils.py
index 18ade7a..7ba5922 100644
--- a/ssh_lib/utils.py
+++ b/ssh_lib/utils.py
@@ -113,7 +113,7 @@ def get_username(c):
 def add_user(c, username, passwd=None, uid=None):
     uid_str = f'--uid={uid}' if uid else ''
 
-    # --disabled-password - ssh-key login only
+    # --disabled-password -> ssh-key login only
     c.sudo(f'adduser --disabled-password --gecos "" {uid_str} {username}', warn=True)
     if passwd:
         sudo_cmd(c, f'echo "{username}:{passwd}" | chpasswd')