From 2f75f3d641be644f19f097def0ad74f67a5adc93 Mon Sep 17 00:00:00 2001
From: Nathan Woodburn <github@nathan.woodburn.au>
Date: Fri, 23 Feb 2024 14:42:15 +1100
Subject: [PATCH] fix: Errors with service and nginx

---
 README.md                                     | 19 +++++++++++++++++++
 install.sh                                    | 10 +++++-----
 ...c-monitor.service => nginx-manager.service |  6 +++---
 sites.py                                      |  6 +++---
 4 files changed, 30 insertions(+), 11 deletions(-)
 rename nginx-traffic-monitor.service => nginx-manager.service (77%)

diff --git a/README.md b/README.md
index f45ef9c..b3c3ce9 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,20 @@
 # site-manager
+
+Installation
+------------
+
+```bash
+wget https://git.woodburn.au/nathanwoodburn/site-manager/raw/branch/main/install.sh
+chmod +x install.sh
+sudo ./install.sh
+```
+
+Create account
+--------------
+Accounts can only be created by the root user
+```bash
+sudo -i
+cd /root/site-manager
+python3 account.py
+exit
+```
\ No newline at end of file
diff --git a/install.sh b/install.sh
index f012824..9e52754 100755
--- a/install.sh
+++ b/install.sh
@@ -8,15 +8,15 @@ fi
 
 # Install nginx
 sudo apt update
-sudo apt install nginx -y
+sudo apt install nginx python3-pip -y
 
 cd /root
 git clone https://git.woodburn.au/nathanwoodburn/site-manager.git
 cd site-manager
 chmod +x *.sh
-
+python3 -m pip install -r requirements.txt
 
 # Install python script as a service
-sudo cp ./nginx-traffic-monitor.service /etc/systemd/system/nginx-traffic-monitor.service
-sudo systemctl start nginx-traffic-monitor]
-sudo systemctl enable nginx-traffic-monitor
+sudo cp ./nginx-manager.service /etc/systemd/system/nginx-manager.service
+sudo systemctl start nginx-manager
+sudo systemctl enable nginx-manager
diff --git a/nginx-traffic-monitor.service b/nginx-manager.service
similarity index 77%
rename from nginx-traffic-monitor.service
rename to nginx-manager.service
index 14e5157..dbed583 100644
--- a/nginx-traffic-monitor.service
+++ b/nginx-manager.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=NGINX Traffic Monitor
+Description=NGINX Manager
 After=network.target
 
 [Service]
@@ -7,8 +7,8 @@ Type=simple
 ExecStart=/usr/bin/python3 /root/site-manager/main.py
 WorkingDirectory=/root/site-manager
 Restart=always
-User=nginx
-Group=nginx
+User=root
+Group=root
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/sites.py b/sites.py
index 24b73af..2e933fd 100644
--- a/sites.py
+++ b/sites.py
@@ -161,7 +161,7 @@ def write_nginx_conf(site):
     server {{
   listen 80;
   listen [::]:80;
-  root {location};
+  root '{location}';
   index index.html;
   server_name {domain} *.{domain};
 
@@ -197,7 +197,7 @@ def write_nginx_conf(site):
             server {{
     listen 80;
     listen [::]:80;
-    root {location};
+    root '{location}';
     index index.html;
     server_name {alt} *.{alt};
 
@@ -225,7 +225,7 @@ def write_nginx_conf(site):
     ssl_certificate_key /root/site-manager/certs/{alt}.key;
     }}
     '''
-    with open(f'/etc/nginx/sites-available/{id}.conf', 'w') as file:
+    with open(f'/etc/nginx/sites-enabled/{id}.conf', 'w') as file:
         file.write(conf)
 
     # Restart nginx