diff options
| -rw-r--r-- | core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter | 9 | ||||
| -rw-r--r-- | core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser | 9 |
2 files changed, 0 insertions, 18 deletions
diff --git a/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter b/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter index f0555260..1287fff0 100644 --- a/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter +++ b/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter @@ -55,15 +55,6 @@ main() { local url_policy_file="/etc/chromium-browser/policies/managed/url-filter.json" if [ -z "$SLX_BROWSER_BLACKLIST" ] && [ -z "$SLX_BROWSER_WHITELIST" ]; then - # Legacy format - if [ "$SLX_BROWSER_IS_WHITELIST" -eq 1 ]; then - SLX_BROWSER_BLACKLIST="*" - SLX_BROWSER_WHITELIST="$SLX_BROWSER_URLLIST" - else - SLX_BROWSER_BLACKLIST="$SLX_BROWSER_URLLIST" - fi - fi - if [ -z "$SLX_BROWSER_BLACKLIST" ] && [ -z "$SLX_BROWSER_WHITELIST" ]; then rm -f -- "$url_policy_file" return fi diff --git a/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser b/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser index 4ec49eca..ea9d2e4c 100644 --- a/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser +++ b/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser @@ -9,15 +9,6 @@ OPTS=() [ -n "$SLX_BROWSER_INSECURE" ] && [ "$SLX_BROWSER_INSECURE" -gt 0 ] && OPTS+=("--insecure") # On inactivity, reload every X seconds [ -n "$SLX_BROWSER_RELOAD_SECS" ] && [ "$SLX_BROWSER_RELOAD_SECS" -gt 0 ] && OPTS+=("--reload-interval" "$SLX_BROWSER_RELOAD_SECS") -# If we have no black- or whitelist, see if the legacy vars exist -if [ -z "$SLX_BROWSER_BLACKLIST" ] && [ -z "$SLX_BROWSER_WHITELIST" ] && [ -n "$SLX_BROWSER_URLLIST" ]; then - # If set, is a space separated list of URLs or hosts - if [ "$SLX_BROWSER_IS_WHITELIST" -gt 0 ]; then - SLX_BROWSER_WHITELIST="$SLX_BROWSER_URLLIST" - else - SLX_BROWSER_BLACKLIST="$SLX_BROWSER_URLLIST" - fi -fi if [ -n "$SLX_BROWSER_BLACKLIST" ]; then # Turn into file with one entry per line |