From 8fd68c288ac1bd4af7dfa74333d5a530d8c4bae0 Mon Sep 17 00:00:00 2001
From: Zsolt Ero <zsolt.ero@gmail.com>
Date: Fri, 29 Dec 2023 23:24:08 +0100
Subject: [PATCH] work

---
 init-server.py        | 8 ++++----
 ssh_lib/nginx.py      | 5 ++---
 ssh_lib/planetiler.py | 2 +-
 ssh_lib/rclone.py     | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/init-server.py b/init-server.py
index bbfa533..01f0375 100755
--- a/init-server.py
+++ b/init-server.py
@@ -10,8 +10,8 @@ from ssh_lib.benchmark import c1000k
 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
-from ssh_lib.rclone import install_rclone
+from ssh_lib.planetiler import planetiler
+from ssh_lib.rclone import rclone
 from ssh_lib.utils import add_user, enable_sudo, put, reboot, sudo_cmd
 
 
@@ -44,8 +44,8 @@ def prepare_venv(c):
 
 
 def prepare_tile_gen(c):
-    install_planetiler(c)
-    install_rclone(c)
+    planetiler(c)
+    rclone(c)
 
     for file in [
         'extract_btrfs.sh',
diff --git a/ssh_lib/nginx.py b/ssh_lib/nginx.py
index 01b82ab..319af4f 100644
--- a/ssh_lib/nginx.py
+++ b/ssh_lib/nginx.py
@@ -18,13 +18,12 @@ def nginx(c):
         sudo_cmd(
             c,
             'curl https://nginx.org/keys/nginx_signing.key '
-            '| gpg --dearmor '
-            '| sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null',
+            '| gpg --dearmor --yes -o /etc/apt/keyrings/nginx.gpg',
         )
         put_str(
             c,
             '/etc/apt/sources.list.d/nginx.list',
-            f'deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/mainline/ubuntu {codename} nginx',
+            f'deb [signed-by=/etc/apt/keyrings/nginx.gpg] http://nginx.org/packages/mainline/ubuntu {codename} nginx',
         )
         apt_get_update(c)
         apt_get_install(c, 'nginx')
diff --git a/ssh_lib/planetiler.py b/ssh_lib/planetiler.py
index 2ee5886..d14ad02 100644
--- a/ssh_lib/planetiler.py
+++ b/ssh_lib/planetiler.py
@@ -6,7 +6,7 @@ PLANETILER_VERSION = '0.7.0'
 PLANETILER_PATH = f'{TILE_GEN_BIN}/planetiler.jar'
 
 
-def install_planetiler(c):
+def planetiler(c):
     apt_get_update(c)
     apt_get_install(c, 'openjdk-21-jre-headless')
 
diff --git a/ssh_lib/rclone.py b/ssh_lib/rclone.py
index ef839f1..5d967fa 100644
--- a/ssh_lib/rclone.py
+++ b/ssh_lib/rclone.py
@@ -1,7 +1,7 @@
 from ssh_lib.utils import apt_get_update, exists
 
 
-def install_rclone(c):
+def rclone(c):
     if exists(c, '/usr/bin/rclone'):
         return