From fa02cac38491b08b4775a4b90fce9a03bcf268e1 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 7 Dec 2023 21:44:08 +0100 Subject: [PATCH] work --- init-server.py | 5 ++++- setup.py | 2 +- ssh_lib/utils.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/init-server.py b/init-server.py index 6d47abc..5a67634 100755 --- a/init-server.py +++ b/init-server.py @@ -8,7 +8,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_clean, pkg_upgrade from ssh_lib.planetiler import install_planetiler -from ssh_lib.utils import reboot, setup_time +from ssh_lib.utils import add_user, enable_sudo, reboot, setup_time def prepare_server(c): @@ -23,6 +23,9 @@ def prepare_server(c): nginx(c) certbot(c) + add_user(c, 'ofm', OFM_USER_PASSWD) + enable_sudo(c, 'ofm') + install_planetiler(c) diff --git a/setup.py b/setup.py index a5d0da4..4d68e98 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ requirements = [ ] setup( - name='openfreemaps', + name='openfreemap', python_requires='>=3.10', install_requires=requirements, packages=['ssh_lib'], diff --git a/ssh_lib/utils.py b/ssh_lib/utils.py index 0e79fa8..9ae24c1 100644 --- a/ssh_lib/utils.py +++ b/ssh_lib/utils.py @@ -108,7 +108,7 @@ def add_user(c, username, passwd=None): # ssh-key login only c.sudo(f'adduser --disabled-password --gecos "" {username}', warn=True) if passwd: - c.sudo(f'echo "{username}:{passwd}" | chpasswd') + sudo_cmd(c, f'echo "{username}:{passwd}" | chpasswd') def remove_user(c, username):