diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-03-24 20:50:47 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-03-24 20:50:50 +0100 |
commit | 97ac3ed9828bab95f6782213376f42de4c5abe8d (patch) | |
tree | 3bb88deb02ccd94d26df86dd4be49b64937d7abc | |
parent | da099c416cb2e74f284744023fabec195567460c (diff) | |
download | internet-kiosk-97ac3ed9828bab95f6782213376f42de4c5abe8d.tar.gz internet-kiosk-97ac3ed9828bab95f6782213376f42de4c5abe8d.tar.bz2 internet-kiosk-97ac3ed9828bab95f6782213376f42de4c5abe8d.zip |
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/internet-kiosk.default | 3 | ||||
-rwxr-xr-x | internet-kiosk/bin/internet-kiosk-browser | 8 |
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 |