From 4bdbf933ed0b809466e2f9e8b2552c40293d1ecd Mon Sep 17 00:00:00 2001
From: nacho <nacho.nunez@aoifes.com>
Date: Fri, 16 Feb 2018 20:11:57 +0100
Subject: [PATCH] remove redundant configuration from unattended upgrades

---
 changelog.md | 10 +++++++++-
 update.sh    |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index d4584428f..1409e96ff 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,13 @@
 
-[v0.46.12](https://github.com/nextcloud/nextcloudpi/commit/2eda867) (2018-02-15) lamp: protect apache fingerprinting
+[v0.46.16](https://github.com/nextcloud/nextcloudpi/commit/93d58f2) (2018-02-16) remove redundant configuration from unattended upgrades
+
+[v0.46.15](https://github.com/nextcloud/nextcloudpi/commit/45c5608) (2018-02-16) lamp: enhance SSL security (chacha cypher), and OCSP stapling
+
+[v0.46.14](https://github.com/nextcloud/nextcloudpi/commit/90dc944) (2018-02-16) log all NCP actions to /var/log/ncp.log
+
+[v0.46.13](https://github.com/nextcloud/nextcloudpi/commit/19b0609) (2018-02-16) update: accept github branch as an argument to ncp-update to test development branch
+
+[v0.46.12](https://github.com/nextcloud/nextcloudpi/commit/629ba33) (2018-02-15) lamp: protect apache fingerprinting
 
 [v0.46.11](https://github.com/nextcloud/nextcloudpi/commit/04ebdea) (2018-02-15) SSH: dont create user if it doesnt exist
 
diff --git a/update.sh b/update.sh
index caefabf45..007c42a67 100755
--- a/update.sh
+++ b/update.sh
@@ -249,6 +249,10 @@ EOF
   sed -i 's|^ServerSignature .*|ServerSignature Off|' /etc/apache2/conf-enabled/security.conf
   sed -i 's|^ServerTokens .*|ServerTokens Prod|'      /etc/apache2/conf-enabled/security.conf
 
+  # remove redundant configuration from unattended upgrades
+  [[ "$( ls -l /etc/php/7.0/fpm/conf.d/*-opcache.ini |  wc -l )" -gt 1 ]] && rm "$( ls /etc/php/7.0/fpm/conf.d/*-opcache.ini | tail -1 )"
+  [[ "$( ls -l /etc/php/7.0/cli/conf.d/*-opcache.ini |  wc -l )" -gt 1 ]] && rm "$( ls /etc/php/7.0/cli/conf.d/*-opcache.ini | tail -1 )"
+
   # upgrade launcher after logging improvements
   cat > /home/www/ncp-launcher.sh <<'EOF'
 #!/bin/bash