From 4d7788ae7ecf86fbd85a96fc0241e9adddbfda36 Mon Sep 17 00:00:00 2001 From: Andrew Hayes Date: Fri, 9 Feb 2024 16:06:10 -0800 Subject: [PATCH] disable kiosk printing for all but mark --- run-scripts/run-kiosk-browser.sh | 30 +++++++++++++++++++----------- vxsuite | 2 +- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/run-scripts/run-kiosk-browser.sh b/run-scripts/run-kiosk-browser.sh index c69df6b9..dd60bb0e 100755 --- a/run-scripts/run-kiosk-browser.sh +++ b/run-scripts/run-kiosk-browser.sh @@ -3,16 +3,24 @@ set -euo pipefail URL=${1:-http://localhost:3000} -: "${VX_CONFIG_ROOT:="./config"}" -: "${VX_METADATA_ROOT:="./"}" - -OS=$(lsb_release -cs) PRINTER_FILE='./printing/debian-printer-autoconfigure.json' -kiosk-browser \ - --add-file-perm o=http://localhost:3000,p=/media/**/*,rw \ - --add-file-perm o=http://localhost:3000,p=/var/log,ro \ - --add-file-perm o=http://localhost:3000,p=/var/log/*,ro \ - --autoconfigure-print-config ${PRINTER_FILE} \ - --url ${URL} || true - +case "${VX_MACHINE_TYPE:-}" in + scan|admin|central-scan) + # for these apps, kiosk browser does not need to or should not configure printers + kiosk-browser \ + --add-file-perm o=http://localhost:3000,p=/media/**/*,rw \ + --add-file-perm o=http://localhost:3000,p=/var/log,ro \ + --add-file-perm o=http://localhost:3000,p=/var/log/*,ro \ + --url ${URL} || true + ;; + *) + # by default, for mark and development, kiosk browser handles configuring printers + kiosk-browser \ + --add-file-perm o=http://localhost:3000,p=/media/**/*,rw \ + --add-file-perm o=http://localhost:3000,p=/var/log,ro \ + --add-file-perm o=http://localhost:3000,p=/var/log/*,ro \ + --autoconfigure-print-config ${PRINTER_FILE} \ + --url ${URL} || true + ;; +esac \ No newline at end of file diff --git a/vxsuite b/vxsuite index 0edfc88c..7a0f9bb3 160000 --- a/vxsuite +++ b/vxsuite @@ -1 +1 @@ -Subproject commit 0edfc88cec062b13b729991f788601d6c98aefed +Subproject commit 7a0f9bb3764e4783c8a9f8fca489c7ea1c0c4001