From f0ac3989e17025091e95f724d1bf2a61e73be263 Mon Sep 17 00:00:00 2001
From: root <root@customer1.federatedcomputer.cloud>
Date: Fri, 16 Jun 2023 16:06:44 +0000
Subject: [PATCH] Added ADMINPASS and LISTMONKPASS

---
 .gitignore            | 1 -
 bin/.env              | 6 ++++++
 bin/install-federated | 8 ++++----
 lib/functions.sh      | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index f608e01..a362f90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 bin/.adminpass
 bin/.b2init
 bin/.gpg.backblaze
-bin/.env
 logs/
 certs/
 apps/
diff --git a/bin/.env b/bin/.env
index ff1299f..4ff44f7 100644
--- a/bin/.env
+++ b/bin/.env
@@ -10,6 +10,12 @@ COUNTRY="US"
 # Where to send welcome e-mail
 EMAIL="test@test.org"
 
+# Admin password
+ADMINPASS="password123"
+
+# Listmonk password
+LISTMONKPASS="password123"
+
 # Backblaze KeyID (Master Key) for backups
 B2_APPLICATION_KEY_ID="3239c6765fdc"
 
diff --git a/bin/install-federated b/bin/install-federated
index fd87ca2..3954995 100755
--- a/bin/install-federated
+++ b/bin/install-federated
@@ -68,10 +68,10 @@ get_config() {
     failcheck "$DOMAIN is not a valid domain.com or sub.domain.com"
   fi
 
-  ADMINPASS=$(create_password);
-  echo "$ADMINPASS" > /federated/bin/.adminpass
-  LISTMONKPASS=$(create_password);
-  echo "$LISTMONKPASS" >> /federated/bin/.adminpass
+#  ADMINPASS=$(create_password);
+#  echo "$ADMINPASS" > /federated/bin/.adminpass
+#  LISTMONKPASS=$(create_password);
+#  echo "$LISTMONKPASS" >> /federated/bin/.adminpass
 }
 
 while getopts d OPTION; do
diff --git a/lib/functions.sh b/lib/functions.sh
index 3805312..b03e9d5 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -333,7 +333,7 @@ https://documentation.federated.computer/docs/core_applications/baserow.
 
 User administration is done in Baserow, but you set up users using the admin user given above.
 
-Vaultwaden: https://vaultwarden.$DOMAIN
+Vaultwarden: https://vaultwarden.$DOMAIN
 
 Vaultwarden is a password manager. The user authentication for Vaultwarden is separate from Federated
 Core. To set up the service, create an account as your "admin@$DOMAIN" user with the