From b5e2d82aff33e537c7ef6bd536e043b2e4dd8c19 Mon Sep 17 00:00:00 2001
From: root <root@sovereignreset.com>
Date: Mon, 15 May 2023 17:45:06 +0000
Subject: [PATCH] Added re-directs where they need to be

---
 bin/install-federated | 4 +++-
 lib/functions.sh      | 2 +-
 lib/mail.sh           | 4 ++--
 lib/pdns.sh           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/install-federated b/bin/install-federated
index 0d34ec8..0c81244 100755
--- a/bin/install-federated
+++ b/bin/install-federated
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 #
 # Federated installation script
 
@@ -69,7 +69,9 @@ get_config() {
   fi
 
   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 4700dcb..54013db 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -210,7 +210,7 @@ https://documentation.federated.computer/users.
 EOF
 
 # Send out e-mail from mail container with details
-docker exec -it mail bash -c "mail -r admin@$DOMAIN -s \"Welcome to Federated\" admin@$DOMAIN, derek@federated.computer < /root/certs/mailfile"
+docker exec -it mail bash -c "mail -r admin@$DOMAIN -s \"Welcome to Federated\" admin@$DOMAIN < /root/certs/mailfile"
 cat /federated/apps/mail/data/root/certs/mailfile
 rm /federated/apps/mail/data/root/certs/mailfile
 }
diff --git a/lib/mail.sh b/lib/mail.sh
index 3358959..b097593 100644
--- a/lib/mail.sh
+++ b/lib/mail.sh
@@ -106,7 +106,7 @@ smtpd_recipient_restrictions = permit_sasl_authenticated, permit_mynetworks, rej
 smtpd_sender_login_maps = ldap:/etc/postfix/ldap-aliases.cf
 EOF
 
-cat /federated/apps/mail/data/tmp/docker-mailserver/fail2ban-jail.cf <<'EOF'
+cat > /federated/apps/mail/data/tmp/docker-mailserver/fail2ban-jail.cf <<'EOF'
 [DEFAULT]
 
 # "bantime" is the number of seconds that a host is banned.
@@ -163,7 +163,7 @@ start_mail() {
   # Insert the DKIM DNS TXT entry into /federated/apps/pdns container
   DKIM_RECORD_STRIP=`cat /federated/apps/mail/data/tmp/docker-mailserver/opendkim/keys/$DOMAIN/mail.txt | sed 's/.*(//'`
   DKIM_RECORD=`echo $DKIM_RECORD_STRIP | sed 's/).*//'`
-  docker exec -it pdns pdnsutil add-record $DOMAIN mail._domainkey TXT 86400 "$DKIM_RECORD"
+  docker exec -it pdns pdnsutil add-record $DOMAIN mail._domainkey TXT 86400 "$DKIM_RECORD" &> /dev/null
   [ $? -ne 0 ] && fail "Couldn't insert DKIM record into /federated/apps/pdns container"
 
   # Insert the DMARC DNS TXT entry into /federated/apps/dns container
diff --git a/lib/pdns.sh b/lib/pdns.sh
index 46ce462..6481b40 100644
--- a/lib/pdns.sh
+++ b/lib/pdns.sh
@@ -104,7 +104,7 @@ start_pdns() {
   start_service "pdns" "nc -z ${SERVICE_IP} 8081 &> /dev/null"
 
   # Run createrecords.sh inside baserow container
-  docker exec -it pdns /root/createrecords.sh
+  docker exec -it pdns /root/createrecords.sh &> /dev/null
   [ $? -ne 0 ] && fail "Couldn't run createrecords.sh in /federated/apps/pdns container"
 
   kill -9 $SPINPID &> /dev/null