From dacaad5abaeca771bc4560658dd769dd3449e978 Mon Sep 17 00:00:00 2001
From: DeathByDenim <jarno@jarno.ca>
Date: Sun, 13 Feb 2022 15:10:59 -0500
Subject: [PATCH] Fix setting password for admin panel

---
 deploy.sh                   | 2 +-
 scripts/deploy_lix.sh       | 0
 scripts/deploy_webserver.sh | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 scripts/deploy_lix.sh

diff --git a/deploy.sh b/deploy.sh
index 8dbb703..9936797 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -40,7 +40,7 @@ apt install --assume-yes \
   fuse g++ gcc curl firewalld automake autoconf libtool \
   libcurl3-dev libc-ares-dev zlib1g-dev libncurses-dev make python3-aiohttp \
   nginx-core certbot python3-certbot-nginx sudo python3-psutil \
-  ldc dub libenet-dev
+  ldc dub libenet-dev python3-bcrypt
 
 # Create the user for running the game servers
 if ! getent passwd ${systemuser}; then
diff --git a/scripts/deploy_lix.sh b/scripts/deploy_lix.sh
old mode 100644
new mode 100755
diff --git a/scripts/deploy_webserver.sh b/scripts/deploy_webserver.sh
index 418661f..c63d808 100755
--- a/scripts/deploy_webserver.sh
+++ b/scripts/deploy_webserver.sh
@@ -43,7 +43,7 @@ patch --ignore-whitespace /etc/nginx/sites-available/default <<EOF
         }
 
 +        location ^~ /admin {
-+                auth_basic “Restricted”;
++                auth_basic "Restricted";
 +                auth_basic_user_file /etc/nginx/htpasswd;
 +        }
 +
@@ -82,6 +82,6 @@ EOF
 
 # Store password
 echo -n "${systemuser}:" > /etc/nginx/htpasswd
-echo "bcrypt.hashpw('${systempassword}'.encode('utf8'),bcrypt.gensalt(rounds=10))" | python3 >> /etc/nginx/htpasswd
+echo -e "import bcrypt\nprint(bcrypt.hashpw('${systempassword}'.encode('utf8'),bcrypt.gensalt(rounds=10)).decode('utf8'))" | python3 >> /etc/nginx/htpasswd
 
 systemctl restart nginx