From d26e31b3777b2fcf55209c902d2a6ff5f7c72f6e Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 21 Dec 2023 13:34:56 +0100 Subject: [PATCH] cleanup --- config/{sysctl => kernel}/60-ofm.conf | 2 -- config/{limits => kernel}/limits-ofm.conf | 0 init-server.py | 3 +-- ssh_lib/benchmark.py | 16 ------------- ssh_lib/dns.py | 29 ----------------------- ssh_lib/kernel.py | 5 ++-- ssh_lib/utils.py | 26 -------------------- 7 files changed, 3 insertions(+), 78 deletions(-) rename config/{sysctl => kernel}/60-ofm.conf (58%) rename config/{limits => kernel}/limits-ofm.conf (100%) delete mode 100644 ssh_lib/dns.py diff --git a/config/sysctl/60-ofm.conf b/config/kernel/60-ofm.conf similarity index 58% rename from config/sysctl/60-ofm.conf rename to config/kernel/60-ofm.conf index 6bc7203..6fdeb0c 100644 --- a/config/sysctl/60-ofm.conf +++ b/config/kernel/60-ofm.conf @@ -1,3 +1 @@ -vm.swappiness = 1 - net.core.somaxconn = 65535 diff --git a/config/limits/limits-ofm.conf b/config/kernel/limits-ofm.conf similarity index 100% rename from config/limits/limits-ofm.conf rename to config/kernel/limits-ofm.conf diff --git a/init-server.py b/init-server.py index 2d52bb4..6a0fd9e 100755 --- a/init-server.py +++ b/init-server.py @@ -11,7 +11,7 @@ from ssh_lib.kernel import set_cpu_governor, 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 TILE_GEN_BIN, install_planetiler -from ssh_lib.utils import add_user, enable_sudo, put, reboot, setup_time, sudo_cmd +from ssh_lib.utils import add_user, enable_sudo, put, reboot, sudo_cmd def prepare_shared(c): @@ -22,7 +22,6 @@ def prepare_shared(c): pkg_upgrade(c) pkg_base(c) - setup_time(c) setup_kernel_settings(c) set_cpu_governor(c) diff --git a/ssh_lib/benchmark.py b/ssh_lib/benchmark.py index 2a0b812..2bb21a3 100644 --- a/ssh_lib/benchmark.py +++ b/ssh_lib/benchmark.py @@ -2,22 +2,6 @@ from ssh_lib.config import scripts from ssh_lib.utils import apt_get_install, apt_get_update, put, put_str, sudo_cmd -def k6(c): - sudo_cmd( - c, - 'curl https://dl.k6.io/key.gpg ' - '| gpg --dearmor ' - '| tee /usr/share/keyrings/k6-archive-keyring.gpg >/dev/null', - ) - put_str( - c, - '/e' 'tc/apt/sources.list.d/k6.list', - 'deb [signed-by=/usr/share/keyrings/k6-archive-keyring.gpg] https://dl.k6.io/deb stable main', - ) - apt_get_update(c) - apt_get_install(c, 'k6') - - def c1000k(c): c.run('wget https://github.com/ideawu/c1000k/archive/master.zip -O tmp.zip') c.run('unzip -o tmp.zip') diff --git a/ssh_lib/dns.py b/ssh_lib/dns.py deleted file mode 100644 index fa55c4b..0000000 --- a/ssh_lib/dns.py +++ /dev/null @@ -1,29 +0,0 @@ -import time - -from ssh_lib.utils import apt_get_purge, exists, put_str - - -def setup_dns(c): - if exists(c, '/etc/network/interfaces'): - c.sudo("sed -i '/dns-nameservers/d' /etc/network/interfaces") - - apt_get_purge(c, 'resolvconf') - c.sudo('rm -rf /etc/resolvconf') - - c.sudo('systemctl stop systemd-resolved') - c.sudo('systemctl disable systemd-resolved') - - print('chattr -i') - c.sudo('chattr -i /etc/resolv.conf', warn=True) - c.sudo('rm -f /etc/resolv.conf') - put_str( - c, - '/etc/resolv.conf', - 'nameserver 1.1.1.1\nnameserver 1.0.0.1\nnameserver 2606:4700:4700::1111\nnameserver 2606:4700:4700::1001', - ) - time.sleep(1) - print('chattr +i') - c.sudo('chattr +i /etc/resolv.conf') - - apt_get_purge(c, 'bind9*') - c.sudo('rm -rf /var/cache/bind') diff --git a/ssh_lib/kernel.py b/ssh_lib/kernel.py index 803c246..882640a 100644 --- a/ssh_lib/kernel.py +++ b/ssh_lib/kernel.py @@ -3,14 +3,13 @@ from ssh_lib.utils import apt_get_install, apt_get_purge, put, put_str def setup_kernel_settings(c): - put(c, f'{config}/sysctl/60-ofm.conf', '/etc/sysctl.d/') - put(c, f'{config}/limits/limits-ofm.conf', '/etc/security/limits.d/') + put(c, f'{config}/kernel/60-ofm.conf', '/etc/sysctl.d/') + put(c, f'{config}/kernel/limits-ofm.conf', '/etc/security/limits.d/') def set_cpu_governor(c): apt_get_install(c, 'cpufrequtils') apt_get_purge(c, 'linux-tools-*') - # c.run('systemctl disable ondemand') # not working on 22 put_str( c, diff --git a/ssh_lib/utils.py b/ssh_lib/utils.py index d8340ac..18ade7a 100644 --- a/ssh_lib/utils.py +++ b/ssh_lib/utils.py @@ -130,29 +130,3 @@ def enable_sudo(c, username, nopasswd=False): put_str(c, '/etc/sudoers.d/tmp.', f'{username} ALL=(ALL) NOPASSWD:ALL') set_permission(c, '/etc/sudoers.d/tmp.', permissions='440', owner='root') c.sudo(f'mv /etc/sudoers.d/tmp. /etc/sudoers.d/{username}') - - -def ssh_copy_id(c, username, key_file_path): - with open(key_file_path) as fp: - public_key_str = fp.read() - - if username == 'root': - home_dir = '/root' - else: - home_dir = f'/home/{username}' - - ssh_dir = f'{home_dir}/.ssh' - - c.sudo(f'mkdir -p {ssh_dir}') - c.sudo(f'chown {username}:{username} {ssh_dir}') - - put_str(c, f'{ssh_dir}/authorized_keys', public_key_str) - set_permission(c, f'{ssh_dir}/authorized_keys', permissions='400', owner=username) - - -def setup_time(c): - apt_get_install(c, 'dbus') - - c.sudo('timedatectl set-local-rtc 0') - c.sudo('timedatectl set-ntp 1') - c.sudo('timedatectl set-timezone UTC')