From 76e8dbba4649949196101af22a9cbf932553236b Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Tue, 17 May 2022 11:58:19 +0200
Subject: [PATCH] Fix running server_setup

---
 advlabdb/scripts/setup/logged_server_setup.py |  9 +++++++--
 advlabdb/scripts/setup/server_setup.py        | 10 ++++++++--
 advlabdb/scripts/setup/shared.py              |  6 +++++-
 advlabdb/scripts/terminal_utils.py            |  2 ++
 docs/user_docs/server_setup.adoc              | 20 ++++++++++++++-----
 5 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/advlabdb/scripts/setup/logged_server_setup.py b/advlabdb/scripts/setup/logged_server_setup.py
index a4e5b1e..1769119 100644
--- a/advlabdb/scripts/setup/logged_server_setup.py
+++ b/advlabdb/scripts/setup/logged_server_setup.py
@@ -1,7 +1,12 @@
+# No relative imports allowed in this file to be able to run server_setup.py without packages
+
+import sys
 from pathlib import Path
 
-from ..terminal_utils import run, step
-from .shared import LOCAL_BIN, LOGS_DIR, install_latest_pipx, poetry_update
+from shared import LOCAL_BIN, LOGS_DIR, install_latest_pipx, poetry_update
+
+sys.path.insert(0, "..")
+from terminal_utils import run, step
 
 
 def main():
diff --git a/advlabdb/scripts/setup/server_setup.py b/advlabdb/scripts/setup/server_setup.py
index 8e87dcd..40e9f0b 100644
--- a/advlabdb/scripts/setup/server_setup.py
+++ b/advlabdb/scripts/setup/server_setup.py
@@ -1,5 +1,11 @@
-from ..terminal_utils import run
-from .shared import LOGS_DIR, REPO_DIR
+# No relative imports allowed in this file to be able to run server_setup.py without packages
+
+import sys
+
+from shared import LOGS_DIR, REPO_DIR
+
+sys.path.insert(0, "..")
+from terminal_utils import run
 
 
 def main():
diff --git a/advlabdb/scripts/setup/shared.py b/advlabdb/scripts/setup/shared.py
index 6d2e46c..2036342 100644
--- a/advlabdb/scripts/setup/shared.py
+++ b/advlabdb/scripts/setup/shared.py
@@ -1,6 +1,10 @@
+# No relative imports allowed in this file to be able to run server_setup.py without packages
+
+import sys
 from pathlib import Path
 
-from ..terminal_utils import run
+sys.path.insert(0, "..")
+from terminal_utils import run
 
 LOCAL_BIN = Path("/home/admin/.local/bin/")
 LOGS_DIR = Path("/var/log/advlabdb")
diff --git a/advlabdb/scripts/terminal_utils.py b/advlabdb/scripts/terminal_utils.py
index d094b61..e497370 100644
--- a/advlabdb/scripts/terminal_utils.py
+++ b/advlabdb/scripts/terminal_utils.py
@@ -1,3 +1,5 @@
+# No relative imports allowed in this file to be able to run server_setup.py without packages
+
 import subprocess
 from getpass import getpass
 
diff --git a/docs/user_docs/server_setup.adoc b/docs/user_docs/server_setup.adoc
index a51bae8..e45c60c 100644
--- a/docs/user_docs/server_setup.adoc
+++ b/docs/user_docs/server_setup.adoc
@@ -15,7 +15,7 @@ Run the following (as root):
 ----
 # Install needed packages
 apt update
-apt install sudo python3 -y
+apt install sudo python3 git -y
 
 # Add a sudo user with the name 'admin'
 sudo useradd admin
@@ -29,8 +29,6 @@ sudo passwd admin
 exit
 ----
 
-Copy the repository to the server into `/home/admin/advlabdb`.
-
 `ssh` again with the new user `admin` and password:
 
 [source,bash]
@@ -38,16 +36,28 @@ Copy the repository to the server into `/home/admin/advlabdb`.
 ssh admin@SERVER_NAME
 ----
 
+Clone the repository with `git clone` into `/home/admin/advlabdb`. Then `cd` into the new cloned repository:
+
+[source,bash]
+----
+cd ~/advlabdb
+----
+
+Change server_name in `advlabdb/scripts/setup/advlabdb.conf` to your SERVER_NAME.
+
 Run the following:
 
 [source,bash]
 ----
 # Run server setup script
 cd ~/advlabdb
-python3 -m advlabdb.scripts.setup.init_db
+python3 advlabdb/scripts/setup/server_setup.py
 ----
 
-Change server_name in advlabdb.conf
+[source,bash]
+----
+python3 -m advlabdb.scripts.setup.init_database
+----
 
 == Stop ssh to root
 // TODO: Add blocking password access