referrer policy already in .htaccess in NC14.0.4v0.67.1

3 files changed, 12 insertions, 8 deletions

diff --git a/changelog.md b/changelog.md
index b82757a7..0c18ef56 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,9 @@
 
-[v0.67.0](https://github.com/nextcloud/nextcloudpi/commit/56ef7da) (2018-11-22) upgrade to NC14.0.4
+[v0.67.1](https://github.com/nextcloud/nextcloudpi/commit/f04770e) (2018-11-23) referrer policy already in .htaccess in NC14.0.4
 
-[v0.66.6](https://github.com/nextcloud/nextcloudpi/commit/5aeb83c) (2018-11-18) nc-static-IP: clarify usage
+[v0.67.0](https://github.com/nextcloud/nextcloudpi/commit/bcac4bc) (2018-11-22) upgrade to NC14.0.4
+
+[v0.66.6 ](https://github.com/nextcloud/nextcloudpi/commit/5aeb83c) (2018-11-18) nc-static-IP: clarify usage
 
 [v0.66.4](https://github.com/nextcloud/nextcloudpi/commit/f3666d6) (2018-11-11) build: package php7.2-imagick now available
 
diff --git a/lamp.sh b/lamp.sh
index bad8d66d..d384cc6a 100644
--- a/lamp.sh
+++ b/lamp.sh
@@ -89,7 +89,6 @@ EOF
     cat >> /etc/apache2/apache2.conf <<EOF
 <IfModule mod_headers.c>
   Header always set Strict-Transport-Security "max-age=15768000; includeSubDomains; preload"
-  Header always set Referrer-Policy "no-referrer"
 </IfModule>
 EOF
 
diff --git a/update.sh b/update.sh
index 30f53c14..25faeb8c 100755
--- a/update.sh
+++ b/update.sh
@@ -183,11 +183,6 @@ EOF
 }
 EOF
 
-  # remove redundant opcache configuration. Leave until update bug is fixed -> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815968
-  # Bug #416 reappeared after we moved to php7.2 and debian buster packages.
-  [[ "$( ls -l /etc/php/7.2/fpm/conf.d/*-opcache.ini |  wc -l )" -gt 1 ]] && rm "$( ls /etc/php/7.2/fpm/conf.d/*-opcache.ini | tail -1 )"
-  [[ "$( ls -l /etc/php/7.2/cli/conf.d/*-opcache.ini |  wc -l )" -gt 1 ]] && rm "$( ls /etc/php/7.2/cli/conf.d/*-opcache.ini | tail -1 )"
-
   # update launcher
   cat > /home/www/ncp-launcher.sh <<'EOF'
 #!/bin/bash
@@ -230,6 +225,14 @@ EOF
     cd -          &>/dev/null
   }
 
+  # remove redundant opcache configuration. Leave until update bug is fixed -> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815968
+  # Bug #416 reappeared after we moved to php7.2 and debian buster packages. (keep last)
+  [[ "$( ls -l /etc/php/7.2/fpm/conf.d/*-opcache.ini |  wc -l )" -gt 1 ]] && rm "$( ls /etc/php/7.2/fpm/conf.d/*-opcache.ini | tail -1 )"
+  [[ "$( ls -l /etc/php/7.2/cli/conf.d/*-opcache.ini |  wc -l )" -gt 1 ]] && rm "$( ls /etc/php/7.2/cli/conf.d/*-opcache.ini | tail -1 )"
+
+  # in NC14.0.4 the referrer policy is included in .htaccess
+  grep -q Referrer-Policy /var/www/nextcloud/.htaccess && sed -i /Referrer-Policy/d /etc/apache2/apache2.conf
+
 } # end - only live updates
 
 exit 0