make sure mariadb is started and enabled

alterway · Sep 1, 2023 · 687100d · 687100d
1 parent 2288a7d
commit 687100d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/packaging/postinstall.sh b/packaging/postinstall.sh
@@ -3,7 +3,6 @@
 mkdir -p /etc/systemd/system/sshportal.service.d/
 
 if [ -f /tmp/sshportal_mariadb ]; then
-	systemctl enable --now mariadb
 	SOCKET="$(mysqladmin variables | grep ".sock " | awk '{print $4}')"
 	readonly SOCKET
 

diff --git a/packaging/preinstall.sh b/packaging/preinstall.sh
@@ -31,6 +31,7 @@ if [ "$RET" = "true" ] || [ "$SSHPORTAL_MARIADB_SETUP" = "true" ]; then
 	fi
 
 	useradd -rd /nonexistent -s /usr/sbin/nologin sshportal # can't use systemd dynamic user to access the unix socket
+	systemctl enable --now mariadb
     mariadb -e "CREATE DATABASE sshportal CHARACTER SET utf8;" || printf "${BYELLOW}%s %s${NC}\n" "WARNING: sshportal database already exists"
 	mariadb -e "GRANT ALL on sshportal.* to 'sshportal'@'localhost' identified via unix_socket;"