From 1015a8d54b593a5b418570baa9663b55a74c3dba Mon Sep 17 00:00:00 2001
From: Zsolt Ero <zsolt.ero@gmail.com>
Date: Wed, 27 Dec 2023 02:56:27 +0100
Subject: [PATCH] work

---
 .gitignore                                          | 2 +-
 config/.env.sample                                  | 1 +
 init-server.py                                      | 4 ++--
 scripts/tile_gen/extract_mbtiles/extract_mbtiles.py | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 config/.env.sample

diff --git a/.gitignore b/.gitignore
index b4d6cac..4c489b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 *.mbtiles
 *.pbf
 
-.env
+config/.env
 .DS_Store
 
 /venv
diff --git a/config/.env.sample b/config/.env.sample
new file mode 100644
index 0000000..412e5aa
--- /dev/null
+++ b/config/.env.sample
@@ -0,0 +1 @@
+SSH_PASSWD=x
\ No newline at end of file
diff --git a/init-server.py b/init-server.py
index 4caf6ad..37a7a59 100755
--- a/init-server.py
+++ b/init-server.py
@@ -6,7 +6,7 @@ from dotenv import dotenv_values
 from fabric import Config, Connection
 
 from ssh_lib.benchmark import benchmark, c1000k
-from ssh_lib.config import assets_dir, scripts_dir
+from ssh_lib.config import assets_dir, config_dir, scripts_dir
 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
@@ -106,7 +106,7 @@ def main(hostname, user, port, tile_gen, http_host, skip_shared, do_reboot, debu
         if not tile_gen and not http_host:
             return
 
-    ssh_passwd = dotenv_values('.env').get('SSH_PASSWD')
+    ssh_passwd = dotenv_values(f'{config_dir}/.env').get('SSH_PASSWD')
 
     if ssh_passwd:
         c = Connection(
diff --git a/scripts/tile_gen/extract_mbtiles/extract_mbtiles.py b/scripts/tile_gen/extract_mbtiles/extract_mbtiles.py
index f75eb6f..44d4cf3 100755
--- a/scripts/tile_gen/extract_mbtiles/extract_mbtiles.py
+++ b/scripts/tile_gen/extract_mbtiles/extract_mbtiles.py
@@ -5,7 +5,6 @@ import shutil
 import sqlite3
 import sys
 from pathlib import Path
-from pprint import pprint
 
 import click