From fd6628196d0ba8c31c72ea6a2a90306325ccc08e Mon Sep 17 00:00:00 2001
From: Martin Winkler <efelon@winklerfamilie.eu>
Date: Sun, 6 Sep 2020 22:27:18 +0000
Subject: [PATCH] Updates after first successful installation

---
 seqs/matrix.sh | 58 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 17 deletions(-)

diff --git a/seqs/matrix.sh b/seqs/matrix.sh
index 2e1dc9e..72564a6 100755
--- a/seqs/matrix.sh
+++ b/seqs/matrix.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
 toolName=synapse
-toolDeps="build-essential python3-dev libffi-dev python3-pip python3-setuptools postgresql libssl-dev virtualenv libjpeg-dev libxslt1-dev libpq5"
+toolDeps="build-essential python3-dev libffi-dev python3-pip python3-setuptools postgresql libssl-dev virtualenv libjpeg-dev libxslt1-dev libpq5 libpq-dev"
 toolDir="/opt/synapse"
 toolConfig="${toolDir}/homeserver.yaml"
 toolUser="synapse"
 toolGroup="synapse"
+toolDomain="matrix.winklerfamilie.eu"
+toolUrl="https://$toolDomain"
 
 # Needed for different steps
 postgresDb=""
@@ -52,13 +54,19 @@ step_2() {
   readDatabaseInfos
  
   exe cd ~postgres 
-  exe sudo -u postgres psql -c "CREATE USER ${postgresUser} WITH ENCRYPTED password '${postgresPass}';"
-  exe sudo -u postgres psql -c "CREATE DATABASE ${postgresDb} ENCODING "UTF8" LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER ${postgresUser};"
-  exe sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE \"${postgresDb}\" to ${postgresUser};"
+  exe su -c "psql -c \"CREATE USER ${postgresUser} WITH ENCRYPTED password '${postgresPass}';\"" - postgres
+  exe su -c "psql -c \"CREATE DATABASE ${postgresDb} ENCODING \"UTF8\" LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER ${postgresUser};\"" - postgres
+  exe su -c "psql -c \"GRANT ALL PRIVILEGES ON DATABASE \"${postgresDb}\" to ${postgresUser};\"" - postgres
 }
 
-step_3_info() { echo "Install $toolName"; }
+step_3_info() { echo "Create $toolName user and group"; }
 step_3() {
+  exe addgroup "$toolGroup"
+  exe adduser --system --home ${toolDir}/ --no-create-home --disabled-password --shell /bin/nologin --ingroup "$toolGroup" "$toolUser"
+}
+
+step_4_info() { echo "Install $toolName"; }
+step_4() {
   exe mkdir -p "$toolDir"
   exe virtualenv -p python3 "${toolDir}/env"
   exe cd "$toolDir"
@@ -68,32 +76,33 @@ step_3() {
   exe pip install matrix-synapse[postgres]
   
   # Create default configuration
-  exe python3 -m synapse.app.homeserver --server-name matrix.mydomain.com --config-path homeserver.yaml --generate-config --report-stats=no
+  exe python3 -m synapse.app.homeserver --server-name "$toolDomain" --config-path homeserver.yaml --generate-config --report-stats=no
   exe deactivate
 
   # Create media directories
-  exe mkdir ${toolDir}/media_store ${toolDir}/uploads
+  exe mkdir -p ${toolDir}/media_store ${toolDir}/uploads
   exe chmod 770 "${toolDir}/media_store" "${toolDir}/uploads"
   # Allow matrix to write its logs in /opt/synapse
   exe chmod 755 "${toolDir}"
   exe chown ${toolUser}:${toolGroup} "${toolDir}" "${toolDir}/media_store" "${toolDir}/uploads"
 }
 
-step_4_info() { echo "Configure $toolName"; }
-step_4() {
+step_5_info() { echo "Configure $toolName"; }
+step_5() {
   exe vi "$toolConfig"
 }
 
-step_5_info() { echo "Create $toolName systemd service"; }
-step_5() {
-  exe addgroup "$toolGroup"
-  exe adduser --system --home ${toolDir}/ --no-create-home --disabled-password --shell /bin/nologin --ingroup "$toolGroup" "$toolUser"
+step_6_info() { echo "Create $toolName systemd service"; }
+step_6() {
   addConf -c "$toolService" "$toolServiceLoc"
+  exe systemctl daemon-reload
+  exe systemctl enable matrix-synapse.service
+  exe service matrix-synapse.service start
 }
-toolServiceLoc="/etc/systemd/system/system/matrix-synapse.service"
+toolServiceLoc="/etc/systemd/system/matrix-synapse.service"
 toolService="[Unit]
 Description=Matrix Synapse service
-After=network.target
+After=network.target postgresql.service
 
 [Service]
 Type=forking
@@ -111,6 +120,21 @@ SyslogIdentifier=synapse
 [Install]
 WantedBy=multi-user.target"
 
+step_15_info() { echo "Create new user"; }
+step_15_alias() { ALIAS="newuser"; }
+step_15() {
+  exe /opt/synapse/env/bin/register_new_matrix_user -c "$toolDir/homeserver.yaml" $toolUrl
+}
+
+step_18_info() { echo "Drop postgres database for $toolName"; }
+step_18_alias() { ALIAS="dropdb"; }
+step_18() {
+  readDatabaseInfos
+ 
+  exe cd ~postgres 
+  exe su -c "psql -c \"DROP DATABASE ${postgresDb};\"" - postgres
+}
+
 step_20_info() { echo "Backup postgres database"; }
 step_20_alias() { ALIAS="backupdb"; }
 step_20() {
@@ -138,9 +162,9 @@ step_22() {
   echo "   pg_restore -h localhost -p 5432 -U synapse -d new_db -v \"10.70.0.61.backup\""
   echo
   echo "Available postgresql databases:"
-  exe cd ~postgres && sudo -u postgres psql -c '\l'
+  exe cd ~postgres && su -c "psql -c '\l'" - postgres
   echo "Available postgresql user:"
-  exe cd ~postgres && sudo -u postgres psql -c '\du'
+  exe cd ~postgres && su -c "psql -c '\du'" - postgres
 }
 
 # Read postgres database information dbname/user/pass if empty