From 174d671da04c7ef3eda13fe46245cc735eaa8691 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Fri, 15 Feb 2019 04:37:44 +0100
Subject: [PATCH] Fix several errors.

---
 install_nextcloud.sh | 47 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/install_nextcloud.sh b/install_nextcloud.sh
index 5235882..21f1079 100755
--- a/install_nextcloud.sh
+++ b/install_nextcloud.sh
@@ -1243,6 +1243,37 @@ EOF
 		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)"
 
@@ -1597,8 +1628,8 @@ EOF
 
    CustomLog /var/log/apache2/ip_requests.log base_requests
 
-   CustomLog /var/log/apache2/colabora-online-access.log combined
-   ErrorLog /var/log/apache2/colabora-online-error.log
+   CustomLog /var/log/apache2/${HOSTNAME_CO}.log combined
+   ErrorLog /var/log/apache2/${HOSTNAME_CO}-error.log
 
 </VirtualHost>
 EOF
@@ -3681,8 +3712,8 @@ if [[ -d "$apache_vhost_dir" ]] ; then
 
    CustomLog /var/log/apache2/ip_requests.log base_requests
 
-   CustomLog /var/www/cloud-01.oopen.de/logs/${WEBSITE}-access.log combined
-   ErrorLog /var/www/cloud-01.oopen.de/logs/${WEBSITE}-error.log
+   CustomLog /var/log/apache2/${WEBSITE}-access.log combined
+   ErrorLog /var/log/apache2/${WEBSITE}-error.log
 
 </VirtualHost>
 
@@ -3747,14 +3778,14 @@ if [[ -d "$apache_vhost_dir" ]] ; then
 
    SSLEngine on
 
-   SSLCertificateFile /var/lib/dehydrated/certs/cloud-01.oopen.de/fullchain.pem
-   SSLCertificateKeyFile /var/lib/dehydrated/certs/cloud-01.oopen.de/privkey.pem
+   SSLCertificateFile /var/lib/dehydrated/certs/${WEBSITE}/fullchain.pem
+   SSLCertificateKeyFile /var/lib/dehydrated/certs/${WEBSITE}/privkey.pem
 
 
    CustomLog /var/log/apache2/ip_requests.log base_requests
 
-   CustomLog /var/www/cloud-01.oopen.de/logs/${WEBSITE}-access.log combined
-   ErrorLog /var/www/cloud-01.oopen.de/logs/${WEBSITE}-error.log
+   CustomLog /var/log/apache2/${WEBSITE}-access.log combined
+   ErrorLog /var/log/apache2/${WEBSITE}-error.log
 
 </VirtualHost>
 EOF