From 022cd6d8e05fc0b74871c4cce4097c833ca373d6 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Thu, 23 Jun 2022 19:44:56 +0200
Subject: [PATCH] install_nextcloud.sh: fix some minor error.

---
 install_nextcloud.sh | 303 ++++++++++++++++++++++---------------------
 1 file changed, 152 insertions(+), 151 deletions(-)

diff --git a/install_nextcloud.sh b/install_nextcloud.sh
index 445fab0..a5f0095 100755
--- a/install_nextcloud.sh
+++ b/install_nextcloud.sh
@@ -1239,173 +1239,174 @@ else
 
 	done
 
-	# - Adjust parameter unixsocket
-	# -
-	redis_conf_file="/etc/redis/redis.conf"
-	echo "" >> $log_file
-	echo "# - Adjust configuration for 'unixsocket' (file: '$redis_conf_file')" >> $log_file
-	echo "# -" >> $log_file
-	echononl "Adjust configuration for 'unixsocket' (file: '$redis_conf_file').."
+fi
 
-	if ! $(grep -q -E "^\s*unixsocket\s+" "$redis_conf_file" 2> /dev/null ) ; then
-		if $(grep -q -E "^\s*#\s*unixsocket\s+" "$redis_conf_file" 2> /dev/null ) ; then
+# - Adjust parameter unixsocket
+# -
+redis_conf_file="/etc/redis/redis.conf"
+echo "" >> $log_file
+echo "# - Adjust configuration for 'unixsocket' (file: '$redis_conf_file')" >> $log_file
+echo "# -" >> $log_file
+echononl "Adjust configuration for 'unixsocket' (file: '$redis_conf_file').."
 
-			cat <<EOF >> $log_file
+if ! $(grep -q -E "^\s*unixsocket\s+" "$redis_conf_file" 2> /dev/null ) ; then
+   if $(grep -q -E "^\s*#\s*unixsocket\s+" "$redis_conf_file" 2> /dev/null ) ; then
+
+      cat <<EOF >> $log_file
 perl -i.ORIG -n -p -e "s/^(\s*#\s*unixsocket\s+(.*))/\1\nunixsocket \2/g" "$redis_conf_file"
 EOF
-			perl -i.ORIG -n -p -e "s/^(\s*#\s*unixsocket\s+(.*))/\1\nunixsocket \2/g" "$redis_conf_file"  >> $log_file 2>&1
+      perl -i.ORIG -n -p -e "s/^(\s*#\s*unixsocket\s+(.*))/\1\nunixsocket \2/g" "$redis_conf_file"  >> $log_file 2>&1
 
-			if [ "$?" = 0 ]; then
-				echo_ok
-			else
-				echo_failed
-				error "For more informations see log output at '$log_file'."
-			fi
-
-		else
-
-			cat <<END >> $log_file
-cat <<EOF >> $redis_conf_file
-
-# Changed by $script_name at $backup_date
-# 
-unixsocket /var/run/redis/redis.sock
-EOF
-END
-			cat <<EOF >> $redis_conf_file
-
-# Changed by $script_name at $backup_date
-# 
-unixsocket /var/run/redis/redis.sock
-EOF
-
-			if [ "$?" = 0 ]; then
-				echo_ok
-			else
-				echo_failed
-				error "For more informations see log output at '$log_file'."
-			fi
-		fi
-	else
-		echo_skipped
-	fi
-
-
-	# - Adjust parameter unixsocketperm
-	# -
-	_parameter="unixsocketperm"
-	_value="770"
-	echo "" >> $log_file
-	echo "# - Adjust configuration for '${_parameter}' (file: '$redis_conf_file')" >> $log_file
-	echo "# -" >> $log_file
-	echononl "Adjust configuration for '${_parameter}' (file: '$redis_conf_file').."
-
-	if ! $(grep -q -E "^\s*${_parameter}\s+" "$redis_conf_file" 2> /dev/null ) ; then
-		if $(grep -q -E "^\s*#\s*${_parameter}\s+" "$redis_conf_file" 2> /dev/null ) ; then
-
-			cat <<EOF >> $log_file
-perl -i.ORIG -n -p -e "s/^(\s*#\s*${_parameter}\s+.*)/\1\n${_parameter} ${_value}/g" "$redis_conf_file"
-EOF
-			perl -i.ORIG -n -p -e "s/^(\s*#\s*${_parameter}\s+(.*))/\1\n${_parameter} ${_value}/g" "$redis_conf_file"  >> $log_file 2>&1
-
-			if [ "$?" = 0 ]; then
-				echo_ok
-			else
-				echo_failed
-				error "For more informations see log output at '$log_file'."
-			fi
-
-		else
-
-			cat <<END >> $log_file
-cat <<EOF >> $redis_conf_file
-
-# Changed by $script_name at $backup_date
-# 
-${_parameter} 770
-EOF
-END
-			cat <<EOF >> $redis_conf_file
-
-# Changed by $script_name at $backup_date
-# 
-${_parameter} 770
-EOF
-
-			if [ "$?" = 0 ]; then
-				echo_ok
-			else
-				echo_failed
-				error "For more informations see log output at '$log_file'."
-			fi
-		fi
-	else
-		echo_skipped
-	fi
-
-
-   echo "" >> $log_file
-   echo "# - Restart redis service" >> $log_file
-   echo "# -" >> $log_file
-   echononl "Restart redis service.."
-
-   if $systemd_supported ; then
-
-      echo "systemctl restart redis-server" >> $log_file
-      systemctl restart redis-server >> $log_file 2>&1
-
-      if [[ $? -eq 0 ]]; then
-         echo_ok
-      else
-         echo_failed
-         error "For more informations see log output at '$log_file'."
-      fi
-   else
-
-      echo "/etc/init.d/redis-server restart" >> $log_file
-      /etc/init.d/redis-server restart >> $log_file 2>&1
-
-      if [[ $? -eq 0 ]]; then
-         echo_ok
-      else
-         echo_failed
-         error "For more informations see log output at '$log_file'."
-      fi
-   fi
-
-
-   REDIS_SOCKET="$(grep -E "^\s*unixsocket\s+" $redis_conf_file 2> /dev/null | awk '{print$2}' 2> /dev/null)"
-   REDIS_GROUP="$(stat -c "%G" $REDIS_SOCKET)"
-
-   echo "" >> $log_file
-   echo "REDIS_SOCKET=$REDIS_SOCKET" >> $log_file
-   echo "REDIS_GROUP=$REDIS_GROUP" >> $log_file
-   echo "" >> $log_file
-
-	# - Add webserver user to redis group
-	# -
-	echo "" >> $log_file
-	echo "# - Add webserver user '${HTTP_USER}' to redis group ${REDIS_GROUP}" >> $log_file
-	echo "# -" >> $log_file
-	echononl "Add webserver user '${HTTP_USER}' to redis group ${REDIS_GROUP}.."
-
-	if ! $(grep -E "^redis:" /etc/group 2> /dev/null | grep -q "$HTTP_USER" 2> /dev/null) ; then
-		usermod -a -G "$REDIS_GROUP" "$HTTP_USER" >> $log_file 2>&1
       if [ "$?" = 0 ]; then
          echo_ok
       else
          echo_failed
          error "For more informations see log output at '$log_file'."
       fi
+
    else
-      echo_skipped
-	fi
 
-	REDIS_SERVICE_INSTALLED=true
+      cat <<END >> $log_file
+cat <<EOF >> $redis_conf_file
 
+# Changed by $script_name at $backup_date
+# 
+unixsocket /var/run/redis/redis.sock
+EOF
+END
+      cat <<EOF >> $redis_conf_file
+
+# Changed by $script_name at $backup_date
+# 
+unixsocket /var/run/redis/redis.sock
+EOF
+
+      if [ "$?" = 0 ]; then
+         echo_ok
+      else
+         echo_failed
+         error "For more informations see log output at '$log_file'."
+      fi
+   fi
+else
+   echo_skipped
 fi
 
 
+# - Adjust parameter unixsocketperm
+# -
+_parameter="unixsocketperm"
+_value="770"
+echo "" >> $log_file
+echo "# - Adjust configuration for '${_parameter}' (file: '$redis_conf_file')" >> $log_file
+echo "# -" >> $log_file
+echononl "Adjust configuration for '${_parameter}' (file: '$redis_conf_file').."
+
+if ! $(grep -q -E "^\s*${_parameter}\s+" "$redis_conf_file" 2> /dev/null ) ; then
+   if $(grep -q -E "^\s*#\s*${_parameter}\s+" "$redis_conf_file" 2> /dev/null ) ; then
+
+      cat <<EOF >> $log_file
+perl -i.ORIG -n -p -e "s/^(\s*#\s*${_parameter}\s+.*)/\1\n${_parameter} ${_value}/g" "$redis_conf_file"
+EOF
+      perl -i.ORIG -n -p -e "s/^(\s*#\s*${_parameter}\s+(.*))/\1\n${_parameter} ${_value}/g" "$redis_conf_file"  >> $log_file 2>&1
+
+      if [ "$?" = 0 ]; then
+         echo_ok
+      else
+         echo_failed
+         error "For more informations see log output at '$log_file'."
+      fi
+
+   else
+
+      cat <<END >> $log_file
+cat <<EOF >> $redis_conf_file
+
+# Changed by $script_name at $backup_date
+# 
+${_parameter} 770
+EOF
+END
+      cat <<EOF >> $redis_conf_file
+
+# Changed by $script_name at $backup_date
+# 
+${_parameter} 770
+EOF
+
+      if [ "$?" = 0 ]; then
+         echo_ok
+      else
+         echo_failed
+         error "For more informations see log output at '$log_file'."
+      fi
+   fi
+else
+   echo_skipped
+fi
+
+
+echo "" >> $log_file
+echo "# - Restart redis service" >> $log_file
+echo "# -" >> $log_file
+echononl "Restart redis service.."
+
+if $systemd_supported ; then
+
+   echo "systemctl restart redis-server" >> $log_file
+   systemctl restart redis-server >> $log_file 2>&1
+
+   if [[ $? -eq 0 ]]; then
+      echo_ok
+   else
+      echo_failed
+      error "For more informations see log output at '$log_file'."
+   fi
+else
+
+   echo "/etc/init.d/redis-server restart" >> $log_file
+   /etc/init.d/redis-server restart >> $log_file 2>&1
+
+   if [[ $? -eq 0 ]]; then
+      echo_ok
+   else
+      echo_failed
+      error "For more informations see log output at '$log_file'."
+   fi
+fi
+
+
+REDIS_SOCKET="$(grep -E "^\s*unixsocket\s+" $redis_conf_file 2> /dev/null | awk '{print$2}' 2> /dev/null)"
+REDIS_GROUP="$(stat -c "%G" $REDIS_SOCKET)"
+
+echo "" >> $log_file
+echo "REDIS_SOCKET=$REDIS_SOCKET" >> $log_file
+echo "REDIS_GROUP=$REDIS_GROUP" >> $log_file
+echo "" >> $log_file
+
+# - Add webserver user to redis group
+# -
+echo "" >> $log_file
+echo "# - Add webserver user '${HTTP_USER}' to redis group ${REDIS_GROUP}" >> $log_file
+echo "# -" >> $log_file
+echononl "Add webserver user '${HTTP_USER}' to redis group ${REDIS_GROUP}.."
+
+if ! $(grep -E "^redis:" /etc/group 2> /dev/null | grep -q "$HTTP_USER" 2> /dev/null) ; then
+   usermod -a -G "$REDIS_GROUP" "$HTTP_USER" >> $log_file 2>&1
+   if [ "$?" = 0 ]; then
+      echo_ok
+   else
+      echo_failed
+      error "For more informations see log output at '$log_file'."
+   fi
+else
+   echo_skipped
+fi
+
+REDIS_SERVICE_INSTALLED=true
+
+
+
 # -----
 # - Install Install ColaboraOnline Service
 # -----
@@ -1427,7 +1428,7 @@ if ! $INSTALL_COLABORA_SERVICE ; then
       echo "# -" >> $log_file
       echo "# - ColaboraOnline Service is already installed." >> $log_file
 
-		info "Redis Service is already installed."
+		info "ColaboraOnline Service is already installed."
 
 	else