From cdf9fb1cf266de162a93a759e61055647d88d7ea Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 30 Dec 2016 17:34:30 +0000
Subject: [PATCH] Remove unused files

---
 src/freedombone-app-matrix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 105e8559..500e2f31 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -40,10 +40,11 @@ MATRIX_PORT=8448
 MATRIX_REPO="https://github.com/matrix-org/synapse"
 MATRIX_COMMIT='f5a4001bb116c468cc5e8e0ae04a1c570e2cb171'
 REPORT_STATS="no"
+MATRIX_SECRET=
 
 matrix_variables=(ONION_ONLY
                   MY_USERNAME
-                  MATRIX_PASSWORD
+                  MATRIX_SECRET
                   DEFAULT_DOMAIN_NAME)
 
 function matrix_generate_synapse_file {
@@ -122,8 +123,8 @@ function add_user_matrix {
 
     ${PROJECT_NAME}-pass -u $new_username -a matrix -p "$new_user_password"
 
-    cd /etc/matrix/scripts
-    register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml https://localhost:${MATRIX_PORT} -u "${new_username}" -p "${new_user_password}" -a
+    read_config_param 'MATRIX_SECRET'
+    register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml https://localhost:${MATRIX_PORT} -u "${new_username}" -p "${new_user_password}" -k "${MATRIX_SECRET}" -a
     if [ ! "$?" = "0" ]; then
         echo '1'
     else
@@ -324,6 +325,7 @@ function install_matrix {
 
     function_check install_turn
     install_turn
+    MATRIX_SECRET="${turnkey}"
 
     function_check matrix_generate
     matrix_generate
@@ -359,6 +361,13 @@ function install_matrix {
         fi
     fi
 
+    rm -rf ${MATRIX_DATA_DIR}/Maildir
+    rm -rf ${MATRIX_DATA_DIR}/.mutt
+    rm -f ${MATRIX_DATA_DIR}/.muttrc
+    rm -f ${MATRIX_DATA_DIR}/.mutt-alias
+    rm -f ${MATRIX_DATA_DIR}/.procmailrc
+    rm -f ${MATRIX_DATA_DIR}/.emacs-mutt
+
     if [[ $(add_user_matrix "${MY_USERNAME}" "${MATRIX_PASSWORD}") != "0" ]]; then
         echo $'Failed to add matrix admin user';
         exit 879352