From fd2dd0d0cba3cd83840b4b2ee5b81a48d79d6e61 Mon Sep 17 00:00:00 2001
From: root <derek@federated.company>
Date: Mon, 12 Jun 2023 11:55:13 +0000
Subject: [PATCH] Added matrix fixes and backuptool

---
 lib/functions.sh | 15 ++++++++++++---
 lib/matrix.sh    | 12 ++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/functions.sh b/lib/functions.sh
index 0f49228..f1ce577 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -31,9 +31,18 @@ spin() {
   done
 }
 add_cron() {
-        (crontab -l 2>/dev/null; echo "30 23 * * * date >> /federated/logs/backup.log && /federated/bin/backuptool -b all >> /federated/logs/backup.log 2>&1") | sort -u | crontab -
-        (crontab -l 2>/dev/null; echo "0 2 * * * date >> /federated/logs/upgrade.log && /federated/bin/upgrade >> /federated/logs/upgrade.log 2>&1") | sort -u | crontab -
-        (crontab -l 2>/dev/null; echo "0 3 * * * date >> /federated/logs/dumpcerts.log && /federated/bin/dumpcerts >> /federated/logs/dumpcerts.log 2>&1") | sort -u | crontab -
+cat > /etc/logrotate.d/federated <<EOF
+/federated/logs/*.log {
+  rotate 12
+  monthly
+  compress
+  missingok
+  notifempty
+}
+EOF
+  (crontab -l 2>/dev/null; echo "30 23 * * * date >> /federated/logs/backup.log && /federated/bin/backuptool -b all >> /federated/logs/backup.log 2>&1") | sort -u | crontab -
+  (crontab -l 2>/dev/null; echo "0 2 * * * date >> /federated/logs/upgrade.log && /federated/bin/upgrade >> /federated/logs/upgrade.log 2>&1") | sort -u | crontab -
+  (crontab -l 2>/dev/null; echo "0 3 * * * date >> /federated/logs/dumpcerts.log && /federated/bin/dumpcerts >> /federated/logs/dumpcerts.log 2>&1") | sort -u | crontab -
 }
 install_federated() {
   [ -d "/federated" ] && fail "Directory /federated already exists. Already installed?"
diff --git a/lib/matrix.sh b/lib/matrix.sh
index d8d99cf..8dafcfd 100644
--- a/lib/matrix.sh
+++ b/lib/matrix.sh
@@ -63,6 +63,7 @@ sed -i 's!args:!!g' /federated/apps/matrix/data/matrix/homeserver.yaml
 # Insert our Postgres and LDAP config
 cat >> /federated/apps/matrix/data/matrix/homeserver.yaml <<EOF
 
+serve_server_wellknown: true
 database:
     name: psycopg2
     args:
@@ -72,6 +73,17 @@ database:
         database: matrix
         cp_min: 5
         cp_max: 10
+email:
+  smtp_host: "mail.$DOMAIN"
+  smtp_port: 587
+  smtp_user: "admin"
+  smtp_pass: "$ADMINPASS"
+  force_tls: true
+  #  require_transport_security: true
+  enable_tls: true
+  notif_from: "Your Friendly %(app)s homeserver <matrix@matrix.$DOMAIN>"
+  app_name: $COMPANY Matrix Server
+
 modules:
   - module: "ldap_auth_provider.LdapAuthProviderModule"
     config: