From 3bdcc4473a96c8b54ccef830b25bf038748a3ebd Mon Sep 17 00:00:00 2001
From: Miguel Gagliardo <migag9@gmail.com>
Date: Wed, 10 Apr 2024 02:28:31 +0100
Subject: [PATCH] Moving files around

---
 {matrix/config => config}/element/element-config.json | 0
 {matrix/config => config}/turnserver.conf             | 0
 matrix/coturn.service => coturn.service               | 0
 matrix/docker-compose.yaml => docker-compose.yaml     | 0
 matrix/homeserver.yaml.db => homeserver.yaml.db       | 0
 matrix/install.sh => install.sh                       | 4 ++--
 matrix/matrix.service => matrix.service               | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename {matrix/config => config}/element/element-config.json (100%)
 rename {matrix/config => config}/turnserver.conf (100%)
 rename matrix/coturn.service => coturn.service (100%)
 rename matrix/docker-compose.yaml => docker-compose.yaml (100%)
 rename matrix/homeserver.yaml.db => homeserver.yaml.db (100%)
 rename matrix/install.sh => install.sh (98%)
 rename matrix/matrix.service => matrix.service (100%)

diff --git a/matrix/config/element/element-config.json b/config/element/element-config.json
similarity index 100%
rename from matrix/config/element/element-config.json
rename to config/element/element-config.json
diff --git a/matrix/config/turnserver.conf b/config/turnserver.conf
similarity index 100%
rename from matrix/config/turnserver.conf
rename to config/turnserver.conf
diff --git a/matrix/coturn.service b/coturn.service
similarity index 100%
rename from matrix/coturn.service
rename to coturn.service
diff --git a/matrix/docker-compose.yaml b/docker-compose.yaml
similarity index 100%
rename from matrix/docker-compose.yaml
rename to docker-compose.yaml
diff --git a/matrix/homeserver.yaml.db b/homeserver.yaml.db
similarity index 100%
rename from matrix/homeserver.yaml.db
rename to homeserver.yaml.db
diff --git a/matrix/install.sh b/install.sh
similarity index 98%
rename from matrix/install.sh
rename to install.sh
index 40edaa2..9cb357f 100755
--- a/matrix/install.sh
+++ b/install.sh
@@ -11,7 +11,7 @@ fi
 BASE_DIR=/opt/matrix
 
 # Create directory and copy configs + docker-compose YAML
-mkdir -p ${BASE_DIR}
+mkdir -p ${BASE_DIR}/db
 cp -R . ${BASE_DIR}
 cd ${BASE_DIR}
 
@@ -116,7 +116,7 @@ EOF
 PG_PASS=$(pwgen -s 28 -1)
 
 # Replace Password in homeserver.yaml
-sed -i "s|PG_PASS|\"${PG_PASS}\"|g" "${BASE_DIR}/config/synapse/homeserver.yaml"
+sed -i "s|PG_PASS|${PG_PASS}|g" "${BASE_DIR}/config/synapse/homeserver.yaml"
 
 # Replace PG_PASS Password and DOMAIN in docker compose YAML
 sed -i "s|DOMAIN|${DOMAIN}|g" "${BASE_DIR}/docker-compose.yaml"
diff --git a/matrix/matrix.service b/matrix.service
similarity index 100%
rename from matrix/matrix.service
rename to matrix.service