From 22d2bdff7ea417a24653641a9107171f716314c0 Mon Sep 17 00:00:00 2001
From: Marco Ochse <t3chn0m4g3@users.noreply.github.com>
Date: Fri, 23 Feb 2024 20:41:58 +0100
Subject: [PATCH] update .env

---
 .env | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/.env b/.env
index 7117094e..a10ba731 100644
--- a/.env
+++ b/.env
@@ -6,25 +6,23 @@
 
 # Set Web usernames and passwords here. This section will be used to create / update the Nginx password file nginxpasswd.
 #  <empty>: This is the default
-#  <'htpasswd encoded usernames / passwords'>:
-#   Use 'htpasswd -n <username>' to create the WEB_USER if you want to manually deploy T-Pot
-#   Example: 'htpasswd -n tsec' will print tsec:$apr1$TdJGdsss$6yLsxPmOcXb2kaEZ7lKva0
-#   Copy the string and replace WEB_USER='tsec:$apr1$TdJGdsss$6yLsxPmOcXb2kaEZ7lKva0'
-#   Multiple users are possible, example (notice the quotes!):
-#   WEB_USER='user1:$apr1$TdJGdsss$6yLsxPmOcXb2kaEZ7lKva0
-#   user2:$apr1$TdJGdsss$6yLsxPmOcXb2kaEZ7lKva0'
+#  <base64 encoded htpasswd usernames / passwords>:
+#   Use 'htpasswd -n -b "username" "password" | base64 -w0' to create the WEB_USER if you want to manually deploy T-Pot
+#   Example: 'htpasswd -n -b "tsec" "tsec" | base64 -w0' will print dHNlYzokYXByMSRYUnE2SC5rbiRVRjZQM1VVQmJVNWJUQmNmSGRuUFQxCgo=
+#   Copy the string and replace WEB_USER=dHNlYzokYXByMSRYUnE2SC5rbiRVRjZQM1VVQmJVNWJUQmNmSGRuUFQxCgo=
+#   Multiple users are possible:
+#   WEB_USER=dHNlYzokYXByMSRYUnE2SC5rbiRVRjZQM1VVQmJVNWJUQmNmSGRuUFQxCgo= dHNlYzokYXByMSR6VUFHVWdmOCRROXI3a09CTjFjY3lCeU1DTloyanEvCgo=
 WEB_USER=
 
 # Set Logstash Web usernames and passwords here. This section will be used to create / update the Nginx password file lswebpasswd.
 # The Lostsash Web usernames are used for T-Pot log ingestion via Logstash, each sensor should have its own user.
 #  <empty>: This is empty by default.
 #  <'htpasswd encoded usernames / passwords'>:
-#   Use 'htpasswd -n <username>' to create the LS_WEB_USER if you want to manually deploy T-Pot
-#   Example: 'htpasswd -n tsec' will print tsec:$apr1$TdJGdsss$6yLsxPmOcXb2kaEZ7lKva0
-#   Copy the string and replace / add LS_WEB_USER='tsec:$apr1$TdJGdsss$6yLsxPmOcXb2kaEZ7lKva0'
-#   Multiple users are possible, example (notice the quotes!):
-#   LS_WEB_USER='sensor1:$apr1$TdJGdsss$6yLsxPmOcXb2kaEZ7lKva0
-#   sensor2:$apr1$TdJGdsss$6yLsxPmOcXb2kaEZ7lKva0'
+#   Use 'htpasswd -n -b "username" "password" | base64 -w0' to create the LS_WEB_USER if you want to manually deploy the sensor.
+#   Example: 'htpasswd -n -b "sensor" "sensor" | base64 -w0' will print c2Vuc29yOiRhcHIxJGVpMHdzUmdYJHNyWHF4UG53ZzZqWUc3aEFaUWxrWDEKCg==
+#   Copy the string and replace / add LS_WEB_USER=c2Vuc29yOiRhcHIxJGVpMHdzUmdYJHNyWHF4UG53ZzZqWUc3aEFaUWxrWDEKCg==
+#   Multiple users are possible:
+#   LS_WEB_USER=c2Vuc29yMTokYXByMSQ5aXhNRk5yMCR6d3F2dGFwQ2x0cFBhU1pqMm9ZemYxCgo= c2Vuc29yMjokYXByMSRtYTlOS1J2NCQvU3dsVVBMeW5RaVIyM3pyWVAzOUkwCgo=
 LS_WEB_USER=
 
 # T-Pot Blackhole
@@ -52,12 +50,12 @@ TPOT_PERSISTENCE=on
 #          3. On HIVE: Create a web user per SENSOR on HIVE and provide credentials below
 #             Create credentials with 'htpasswd ~/tpotce/data/nginx/conf/lswebpasswd <username>'
 #          4. On SENSOR: Provide username / password from (3) for TPOT_HIVE_USER as base64 encoded string:
-#                        "echo -n 'username:password' | base64"
+#                        "echo -n 'username:password' | base64 -w0"
 TPOT_TYPE=HIVE
 
 # T-Pot Hive User (only relevant for SENSOR deployment)
 #  <empty>: This is empty by default.
-#  <base64 encoded string>: Provide a base64 encoded string "echo -n 'username:password' | base64"
+#  <base64 encoded string>: Provide a base64 encoded string "echo -n 'username:password' | base64 -w0"
 #                           i.e. TPOT_HIVE_USER='dXNlcm5hbWU6cGFzc3dvcmQ='
 TPOT_HIVE_USER=