move NC httpd logs to /var/logv0.56.7

4 files changed, 8 insertions, 12 deletions

diff --git a/changelog.md b/changelog.md
index d6baf5a7..fad0561e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,9 @@
 
-[v0.56.6](https://github.com/nextcloud/nextcloudpi/commit/e48323d) (2018-05-20) fix update httpd log location in virtual host after nc-datadir
+[v0.56.7](https://github.com/nextcloud/nextcloudpi/commit/d508710) (2018-05-22) move NC httpd logs to /var/log
 
-[v0.56.5](https://github.com/nextcloud/nextcloudpi/commit/d54b243) (2018-05-20) ncp-autoupdate: dont return 0 if no updates available
+[v0.56.6](https://github.com/nextcloud/nextcloudpi/commit/7afb720) (2018-05-20) fix update httpd log location in virtual host after nc-datadir
+
+[v0.56.5 ](https://github.com/nextcloud/nextcloudpi/commit/d54b243) (2018-05-20) ncp-autoupdate: dont return 0 if no updates available
 
 [v0.56.4 ](https://github.com/nextcloud/nextcloudpi/commit/656d2d8) (2018-05-18) nc-info: change port checker providers
 
diff --git a/etc/ncp-config.d/nc-datadir.sh b/etc/ncp-config.d/nc-datadir.sh
index b3e5a988..bd98ef8d 100644
--- a/etc/ncp-config.d/nc-datadir.sh
+++ b/etc/ncp-config.d/nc-datadir.sh
@@ -92,10 +92,6 @@ configure()
   # update fail2ban logpath
   sed -i "s|logpath  =.*nextcloud.log|logpath  = $DATADIR_/nextcloud.log|" /etc/fail2ban/jail.conf
 
-  # update httpd log location in virtual host
-  sed -i "s|CustomLog.*|CustomLog $DATADIR_/access.log combined|" /etc/apache2/sites-available/nextcloud.conf
-  sed -i "s|ErrorLog .*|ErrorLog  $DATADIR_/error.log|"           /etc/apache2/sites-available/nextcloud.conf
-
   # datadir
   sudo -u www-data php occ config:system:set datadirectory --value="$DATADIR_"
   sudo -u www-data php occ config:system:set logfile --value="$DATADIR_/nextcloud.log"
diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
index b4c0121b..ccc16dd6 100644
--- a/etc/ncp-config.d/nc-nextcloud.sh
+++ b/etc/ncp-config.d/nc-nextcloud.sh
@@ -201,8 +201,8 @@ EOF
 <IfModule mod_ssl.c>
   <VirtualHost _default_:443>
     DocumentRoot /var/www/nextcloud
-    CustomLog /var/www/nextcloud/data/access.log combined
-    ErrorLog /var/www/nextcloud/data/error.log
+    CustomLog /var/log/apache2/nc-access.log combined
+    ErrorLog  /var/log/apache2/nc-error.log
     SSLEngine on
     SSLCertificateFile      /etc/ssl/certs/ssl-cert-snakeoil.pem
     SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
diff --git a/update.sh b/update.sh
index 75651fe1..10120251 100755
--- a/update.sh
+++ b/update.sh
@@ -160,10 +160,8 @@ done
   }
 
   # fix update httpd log location in virtual host after nc-datadir
-  DATADIR="$( grep datadirectory /var/www/nextcloud/config/config.php | awk '{ print $3 }' | grep -oP "[^']*[^']" | head -1 )"
-  sed -i "s|CustomLog.*|CustomLog $DATADIR/access.log combined|" /etc/apache2/sites-available/nextcloud.conf
-  sed -i "s|ErrorLog .*|ErrorLog  $DATADIR/error.log|"           /etc/apache2/sites-available/nextcloud.conf
-
+  sed -i "s|CustomLog.*|CustomLog /var/log/apache2/nc-access.log combined|" /etc/apache2/sites-available/nextcloud.conf
+  sed -i "s|ErrorLog .*|ErrorLog  /var/log/apache2/nc-error.log|"           /etc/apache2/sites-available/nextcloud.conf
 
 } # end - only live updates