Added error checking to db-make, fixed db-dump/load service

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:?};"

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