diff options
-rw-r--r-- | changelog.md | 4 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/unattended-upgrades.sh | 4 | ||||
-rwxr-xr-x | update.sh | 9 |
3 files changed, 16 insertions, 1 deletions
diff --git a/changelog.md b/changelog.md index 48cb6d6b..b678f6d6 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v0.46.2](https://github.com/nextcloud/nextcloudpi/commit/3fbc8be) (2018-02-07) modsecurity: turn off logging, its too spammy for ramlogs +[v0.46.3](https://github.com/nextcloud/nextcloudpi/commit/865d622) (2018-02-07) unattended upgrades: fix unattended upgrades not working because of modified files + +[v0.46.2 ](https://github.com/nextcloud/nextcloudpi/commit/1615589) (2018-02-07) modsecurity: turn off logging, its too spammy for ramlogs [v0.46.1, master](https://github.com/nextcloud/nextcloudpi/commit/fe57d03) (2018-02-07) ping to 4.4.4.2 because google is blocked in china diff --git a/etc/nextcloudpi-config.d/unattended-upgrades.sh b/etc/nextcloudpi-config.d/unattended-upgrades.sh index 6348289c..92c3249e 100644 --- a/etc/nextcloudpi-config.d/unattended-upgrades.sh +++ b/etc/nextcloudpi-config.d/unattended-upgrades.sh @@ -41,6 +41,10 @@ Unattended-Upgrade::Automatic-Reboot-Time "04:00"; Unattended-Upgrade::Origins-Pattern { o=Raspbian,n=stretch,l=Raspbian; } +Dpkg::Options { + "--force-confdef"; + "--force-confold"; +}; EOF echo "Unattended upgrades active: $ACTIVE_ (autoreboot $AUTOREBOOT_)" } @@ -231,6 +231,15 @@ EOF # turn modsecurity logs off, too spammy sed -i 's|SecAuditEngine .*|SecAuditEngine Off|' /etc/modsecurity/modsecurity.conf + # fix unattended upgrades failing on modified files + grep -q Dpkg::Options /etc/apt/apt.conf.d/20nextcloudpi-upgrades || \ + cat >> /etc/apt/apt.conf.d/20nextcloudpi-upgrades <<EOF +Dpkg::Options { + "--force-confdef"; + "--force-confold"; +}; +EOF + } # end - only live updates exit 0 |