From f0bb07631198e38327f24fc29d5d35f4da9b3f13 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin@philipp.info>
Date: Sat, 4 Jan 2020 23:11:24 +0100
Subject: [PATCH] Fixing issues - wrong call for upstream wait-for-connection -
 missing variables for SSMTP

---
 docker-cron.sh       |  2 +-
 docker-entrypoint.sh | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docker-cron.sh b/docker-cron.sh
index 7fe7dd6..b57adab 100755
--- a/docker-cron.sh
+++ b/docker-cron.sh
@@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
 done
 
 echo "Waiting for MySQL $MYSQL_HOST initialization..."
-if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
+if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then
   exec php /var/www/html/bin/daemon.php -f start
 else
   echo "[ERROR] Waited 300 seconds, no response" >&2
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 0eb5c75..2b72298 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -17,14 +17,15 @@ version_greater() {
 }
 
 setup_ssmtp() {
-	if [ -n "${FRIENDICA_SITENAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
-		echo "Setup SSMTP for '$FRIENDICA_SITENAME' with '$SMTP' ..."
+	if [ -n "${HOSTNAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
+		SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
+		echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
 
 		smtp_from=${SMTP_FROM:-no-reply}
 
 		# Setup SSMTP
-		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
-		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
+		usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
+		usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
 
 		# add possible mail-senders
 		{
@@ -117,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 			if [ "$install" = true ]; then
 				echo "Waiting for MySQL $MYSQL_HOST initialization..."
-				if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
+				if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306}" 300; then
 
 					echo "Starting Friendica installation ..."
 					run_as "php /var/www/html/bin/console.php autoinstall $install_options"