From 6fe7e455f64b34d7f7c964a8134f649c90839af0 Mon Sep 17 00:00:00 2001
From: Mar Alegre <mar@mar.alemor.org>
Date: Sat, 1 Jan 2022 11:55:12 -0500
Subject: [PATCH] Added error checking to db-make, fixed db-dump/load service

---
 nextcloud/assets/bin/db-make          | 10 +++++-----
 nextcloud/assets/nextcloud-db.service |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nextcloud/assets/bin/db-make b/nextcloud/assets/bin/db-make
index 6491b52..7a230d6 100755
--- a/nextcloud/assets/bin/db-make
+++ b/nextcloud/assets/bin/db-make
@@ -5,8 +5,8 @@ cmd() {
 }
 
 cd /var/lib/postgresql
-cmd "DROP DATABASE IF EXISTS $DBNAME;"
-cmd "DROP USER IF EXISTS $DBUSER;"
-cmd "CREATE USER $DBUSER;"
-cmd "CREATE DATABASE $DBNAME;"
-cmd "GRANT ALL PRIVILEGES ON DATABASE $DBNAME TO $DBUSER;"
+cmd "DROP DATABASE IF EXISTS ${DBNAME:?};"
+cmd "DROP USER IF EXISTS ${DBUSER:?};"
+cmd "CREATE USER ${DBUSER:?};"
+cmd "CREATE DATABASE ${DBNAME:?};"
+cmd "GRANT ALL PRIVILEGES ON DATABASE ${DBNAME:?} TO ${DBUSER:?};"
diff --git a/nextcloud/assets/nextcloud-db.service b/nextcloud/assets/nextcloud-db.service
index 345dd12..b64183d 100644
--- a/nextcloud/assets/nextcloud-db.service
+++ b/nextcloud/assets/nextcloud-db.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=Load/Dump database on start/stop
-After=syslog.target
-After=network.target
+After=postgresql.service
 Requires=postgresql.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/bin/bash -c ". /etc/environment && /usr/local/bin/db-load /vol/data/sql/$DBNAME-updown.sql"
-ExecStop=/bin/bash -c ". /etc/environment && /usr/local/bin/db-dump /vol/data/sql/$DBNAME-updown.sql"
+EnvironmentFile=/etc/environment
+ExecStart=/usr/local/bin/db-load /vol/data/sql/nextcloud-updown.sql
+ExecStop=/usr/local/bin/db-dump /vol/data/sql/nextcloud-updown.sql
 
 [Install]
 WantedBy=multi-user.target