Merge branch 'devel' into touch-ufw

nextcloud · Aug 18, 2019 · 69396d9 · 69396d9
2 parents 7affa71 + 4a764ee
commit 69396d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh
@@ -164,6 +164,7 @@ EOF
   ncc config:system:set preview_max_x --value 2048
   ncc config:system:set preview_max_y --value 2048
   ncc config:system:set jpeg_quality --value 60
+  ncc config:app:set preview jpeg_quality --value="60"
 
   # other
   ncc config:system:set overwriteprotocol --value=https

diff --git a/etc/ncp-config.d/nc-automount.cfg b/etc/ncp-config.d/nc-automount.cfg
@@ -3,7 +3,7 @@
   "name": "Nc-automount",
   "title": "nc-automount",
   "description": "Automount USB drives by plugging them in",
-  "info": "Plugged in USB drives will be automounted under /media\non boot or at the moment of insertion.\n\nFormat your drive as ext4/btrfs in order to move NC datafolder or database\nVFAT or NTFS is not recommended for this task, as it does not suport permissions\n\nIMPORTANT: halt or umount the drive before removing",
+  "info": "Plugged in USB drives will be automounted under /media\non boot or at the moment of insertion.\n\nFormat your drive as ext4/btrfs in order to move NC datafolder or database. \n\nVFAT or NTFS is not recommended for this task, as it does not suport permissions \n\n WARNING If you want add a second drive later, make sure you have added a LABEL to the first and all other drives to be mounted when formating, as they will then be mounted at /media/LABEL instead of /media/USBdrive \n\nIMPORTANT: halt or umount the drive before removing",
   "infotitle": "Automount notes",
   "params": [
     {

diff --git a/updates/1.16.0.sh b/updates/1.16.0.sh
@@ -15,8 +15,11 @@ apt-get install -y --no-install-recommends php-smbclient exfat-fuse exfat-utils
 # install lsb-release
 apt-get install -y --no-install-recommends lsb-release
 
+# tweak previews
+ncc config:app:set preview jpeg_quality --value="60"
+
 # missed some sources
-sed -i 's/stretch/buster/g' /etc/apt/sources.list.d/* &>/dev/null
+sed -i 's/stretch/buster/g' /etc/apt/sources.list.d/* &>/dev/null || true
 
 # docker images only
 [[ -f /.docker-image ]] && {