install/nextcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install_nextcloud.sh: fix some minor error.

Browse Source
This commit is contained in:
Christoph 2022-06-23 19:44:56 +02:00
parent 5fd09e7e2d
commit 022cd6d8e0
1 changed files with 152 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
install_nextcloud.sh
View File

@ -1239,15 +1239,17 @@ else
done done
# - Adjust parameter unixsocket fi
# -
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').."
if ! $(grep -q -E "^\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').."
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 if $(grep -q -E "^\s*#\s*unixsocket\s+" "$redis_conf_file" 2> /dev/null ) ; then
cat <<EOF >> $log_file cat <<EOF >> $log_file
@ -1286,21 +1288,21 @@ EOF
error "For more informations see log output at '$log_file'." error "For more informations see log output at '$log_file'."
fi fi
fi fi
else else
echo_skipped echo_skipped
fi fi
# - Adjust parameter unixsocketperm # - Adjust parameter unixsocketperm
# - # -
_parameter="unixsocketperm" _parameter="unixsocketperm"
_value="770" _value="770"
echo "" >> $log_file echo "" >> $log_file
echo "# - Adjust configuration for '${_parameter}' (file: '$redis_conf_file')" >> $log_file echo "# - Adjust configuration for '${_parameter}' (file: '$redis_conf_file')" >> $log_file
echo "# -" >> $log_file echo "# -" >> $log_file
echononl "Adjust configuration for '${_parameter}' (file: '$redis_conf_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*${_parameter}\s+" "$redis_conf_file" 2> /dev/null ) ; then
if $(grep -q -E "^\s*#\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 cat <<EOF >> $log_file
@ -1339,17 +1341,17 @@ EOF
error "For more informations see log output at '$log_file'." error "For more informations see log output at '$log_file'."
fi fi
fi fi
else else
echo_skipped echo_skipped
fi fi
echo "" >> $log_file echo "" >> $log_file
echo "# - Restart redis service" >> $log_file echo "# - Restart redis service" >> $log_file
echo "# -" >> $log_file echo "# -" >> $log_file
echononl "Restart redis service.." echononl "Restart redis service.."
if $systemd_supported ; then if $systemd_supported ; then
echo "systemctl restart redis-server" >> $log_file echo "systemctl restart redis-server" >> $log_file
systemctl restart redis-server >> $log_file 2>&1 systemctl restart redis-server >> $log_file 2>&1
@ -1360,7 +1362,7 @@ EOF
echo_failed echo_failed
error "For more informations see log output at '$log_file'." error "For more informations see log output at '$log_file'."
fi fi
else else
echo "/etc/init.d/redis-server restart" >> $log_file echo "/etc/init.d/redis-server restart" >> $log_file
/etc/init.d/redis-server restart >> $log_file 2>&1 /etc/init.d/redis-server restart >> $log_file 2>&1
@ -1371,25 +1373,25 @@ EOF
echo_failed echo_failed
error "For more informations see log output at '$log_file'." error "For more informations see log output at '$log_file'."
fi fi
fi fi
REDIS_SOCKET="$(grep -E "^\s*unixsocket\s+" $redis_conf_file 2> /dev/null | awk '{print$2}' 2> /dev/null)" 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)" REDIS_GROUP="$(stat -c "%G" $REDIS_SOCKET)"
echo "" >> $log_file echo "" >> $log_file
echo "REDIS_SOCKET=$REDIS_SOCKET" >> $log_file echo "REDIS_SOCKET=$REDIS_SOCKET" >> $log_file
echo "REDIS_GROUP=$REDIS_GROUP" >> $log_file echo "REDIS_GROUP=$REDIS_GROUP" >> $log_file
echo "" >> $log_file echo "" >> $log_file
# - Add webserver user to redis group # - Add webserver user to redis group
# - # -
echo "" >> $log_file echo "" >> $log_file
echo "# - Add webserver user '${HTTP_USER}' to redis group ${REDIS_GROUP}" >> $log_file echo "# - Add webserver user '${HTTP_USER}' to redis group ${REDIS_GROUP}" >> $log_file
echo "# -" >> $log_file echo "# -" >> $log_file
echononl "Add webserver user '${HTTP_USER}' to redis group ${REDIS_GROUP}.." 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 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 usermod -a -G "$REDIS_GROUP" "$HTTP_USER" >> $log_file 2>&1
if [ "$?" = 0 ]; then if [ "$?" = 0 ]; then
echo_ok echo_ok
@ -1397,14 +1399,13 @@ EOF
echo_failed echo_failed
error "For more informations see log output at '$log_file'." error "For more informations see log output at '$log_file'."
fi fi
else else
echo_skipped echo_skipped
fi
REDIS_SERVICE_INSTALLED=true
fi fi
REDIS_SERVICE_INSTALLED=true
# ----- # -----
# - Install Install ColaboraOnline Service # - Install Install ColaboraOnline Service
@ -1427,7 +1428,7 @@ if ! $INSTALL_COLABORA_SERVICE ; then
echo "# -" >> $log_file echo "# -" >> $log_file
echo "# - ColaboraOnline Service is already installed." >> $log_file echo "# - ColaboraOnline Service is already installed." >> $log_file
info "Redis Service is already installed." info "ColaboraOnline Service is already installed."
else else