summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/internet-kiosk.default3
-rwxr-xr-xinternet-kiosk/bin/internet-kiosk-browser8
3 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d0c0983..27951d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ internet-kiosk (0.2.0) UNRELEASED; urgency=medium
+ Fix script name in flawed alternative removal.
* impressive-display:
- Fix launching pulseaudio.
+ - Add http/https/ftp proxy support.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 24 Mar 2016 18:51:08 +0100
diff --git a/debian/internet-kiosk.default b/debian/internet-kiosk.default
index 39f0c74..423a01a 100644
--- a/debian/internet-kiosk.default
+++ b/debian/internet-kiosk.default
@@ -10,6 +10,9 @@ MASTER_TERMINALS="$(hostname -f)"
START_URL_MASTERS="http://wiki.debian.org"
START_URL_SLAVES="http://wiki.it-zukunft-schule.de"
+# HTTP proxy URL, if needed
+#HTTP_PROXY_URL="http://webcache:3128"
+
# launch pulseaudio daemon if not already running
WITH_PULSEAUDIO="yes"
diff --git a/internet-kiosk/bin/internet-kiosk-browser b/internet-kiosk/bin/internet-kiosk-browser
index ba94824..1c0ffc0 100755
--- a/internet-kiosk/bin/internet-kiosk-browser
+++ b/internet-kiosk/bin/internet-kiosk-browser
@@ -56,6 +56,9 @@ HIDE_IDLE_POINTER="yes"
# default screensaver settings
SCREENSAVER_SETTINGS=""
+# don't use any HTTP proxy by default
+HTTP_PROXY_URL=""
+
if [ -r /etc/default/internet-kiosk-browser ]; then
. /etc/default/internet-kiosk-browser
fi
@@ -114,6 +117,11 @@ fi
# launch the web browser...
if which firefox 1>/dev/null; then
+ if [ -n "$HTTP_PROXY_URL" ]; then
+ export http_proxy="$HTTP_PROXY_URL"
+ export https_proxy="$HTTP_PROXY_URL"
+ export ftp_proxy="$HTTP_PROXY_URL"
+ fi
firefox $START_URL
fi