[debian-lan-devel] [debian-lan] 04/08: Remove unburden-home-dir, cleanup, iceweases → firefox.
Andreas B. Mundt
andi at moszumanska.debian.org
Wed Aug 10 12:49:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
andi pushed a commit to branch master
in repository debian-lan.
commit 9a6dee49f0081d6e34359c694be3983fcda4e357
Author: Andreas B. Mundt <andi at debian.org>
Date: Tue Aug 9 09:13:13 2016 +0200
Remove unburden-home-dir, cleanup, iceweases → firefox.
---
fai/config/package_config/CLIENT_A | 1 -
fai/config/package_config/DESKTOP | 3 +--
fai/config/package_config/DISKLESS_CLIENT | 3 +--
fai/config/package_config/FR_BELGIAN | 2 +-
fai/config/package_config/GERMAN | 2 +-
fai/config/package_config/GNOME | 2 +-
fai/config/package_config/XFCE | 2 +-
fai/config/scripts/CLIENT_A/20-misc | 32 ++++++++++++++----------
fai/config/scripts/CLIENT_A/60-unburden-home-dir | 18 -------------
9 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/fai/config/package_config/CLIENT_A b/fai/config/package_config/CLIENT_A
index 94a2044..f5448d9 100644
--- a/fai/config/package_config/CLIENT_A
+++ b/fai/config/package_config/CLIENT_A
@@ -5,4 +5,3 @@ anacron
sudo-ldap
quota
unattended-upgrades
-unburden-home-dir
diff --git a/fai/config/package_config/DESKTOP b/fai/config/package_config/DESKTOP
index 48706ce..6736324 100644
--- a/fai/config/package_config/DESKTOP
+++ b/fai/config/package_config/DESKTOP
@@ -20,8 +20,7 @@ task-gnome-desktop
## other packages:
-iceweasel
-browser-plugin-gnash
+firefox-esr
icedove
enigmail
diff --git a/fai/config/package_config/DISKLESS_CLIENT b/fai/config/package_config/DISKLESS_CLIENT
index 8d4428a..6e3c6ce 100644
--- a/fai/config/package_config/DISKLESS_CLIENT
+++ b/fai/config/package_config/DISKLESS_CLIENT
@@ -22,8 +22,7 @@ task-gnome-desktop
## other packages:
-iceweasel
-browser-plugin-gnash
+firefox-esr
icedove
enigmail
diff --git a/fai/config/package_config/FR_BELGIAN b/fai/config/package_config/FR_BELGIAN
index 997f92a..0602de3 100644
--- a/fai/config/package_config/FR_BELGIAN
+++ b/fai/config/package_config/FR_BELGIAN
@@ -2,6 +2,6 @@ PACKAGES aptitude
task-french
PACKAGES aptitude DESKTOP
-iceweasel-l10n-fr
+firefox-esr-l10n-fr
icedove-l10n-fr
libreoffice-l10n-fr
diff --git a/fai/config/package_config/GERMAN b/fai/config/package_config/GERMAN
index 76c852b..f63c60b 100644
--- a/fai/config/package_config/GERMAN
+++ b/fai/config/package_config/GERMAN
@@ -2,6 +2,6 @@ PACKAGES aptitude
task-german
PACKAGES aptitude DESKTOP
-iceweasel-l10n-de
+firefox-esr-l10n-de
icedove-l10n-de
libreoffice-l10n-de
diff --git a/fai/config/package_config/GNOME b/fai/config/package_config/GNOME
index 429586e..dec0eff 100644
--- a/fai/config/package_config/GNOME
+++ b/fai/config/package_config/GNOME
@@ -1,6 +1,6 @@
PACKAGES aptitude
-iceweasel
+firefox-esr
#icedove
menu gdm3
gnome-core
diff --git a/fai/config/package_config/XFCE b/fai/config/package_config/XFCE
index a248674..40d0712 100644
--- a/fai/config/package_config/XFCE
+++ b/fai/config/package_config/XFCE
@@ -2,4 +2,4 @@ PACKAGES aptitude
xfce4 # base system
xfce4-goodies # additional tools
xdm
-iceweasel
+firefox-esr
diff --git a/fai/config/scripts/CLIENT_A/20-misc b/fai/config/scripts/CLIENT_A/20-misc
index 89b53cd..9c39cdf 100755
--- a/fai/config/scripts/CLIENT_A/20-misc
+++ b/fai/config/scripts/CLIENT_A/20-misc
@@ -12,27 +12,33 @@ fcopy -ir /root
## Fetch proxy information from wpad.dat:
WPAD=/tmp/wpad.dat
-http_proxy=""; wget --output-document=$WPAD http://wpad.intern/wpad.dat
+http_proxy="";
+if which curl ; then
+ curl --silent http://wpad.intern/wpad.dat > $WPAD
+elif which wget ; then
+ wget --output-document=$WPAD http://wpad.intern/wpad.dat
+fi
+
PROXY=`cat $WPAD | grep PROXY | sed "s/^.*PROXY //" | sed "s/;.*$//"`
ainsl /etc/environment "http_proxy=http://$PROXY/"
if [ "$PROXY" == "webcache:8080" ] ; then
- ## dansguardian is used, lock iceweasel proxy configuration:
- ainsl /etc/iceweasel/pref/iceweasel.js 'lockPref("network.proxy.type", 4);'
+ ## dansguardian is used, lock firefox proxy configuration:
+ ainsl /etc/firefox-esr/firefox-esr.js 'lockPref("network.proxy.type", 4);'
else
## default configuration to wpad.dat proxy:
- ainsl /etc/iceweasel/pref/iceweasel.js 'pref("network.proxy.type", 4);'
+ ainsl /etc/firefox-esr/firefox-esr.js 'pref("network.proxy.type", 4);'
fi
-## Allow SSO in iceweasel:
-ainsl /etc/iceweasel/pref/iceweasel.js 'pref("network.negotiate-auth.delegation-uris", "intern");'
-ainsl /etc/iceweasel/pref/iceweasel.js 'pref("network.negotiate-auth.trusted-uris", "intern");'
+## Allow SSO in firefox:
+ainsl /etc/firefox-esr/firefox-esr.js 'pref("network.negotiate-auth.delegation-uris", "intern");'
+ainsl /etc/firefox-esr/firefox-esr.js 'pref("network.negotiate-auth.trusted-uris", "intern");'
## Default Homepage:
-ainsl /etc/iceweasel/pref/iceweasel.js 'pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=http://www.intern");'
+ainsl /etc/firefox-esr/firefox-esr.js 'pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=http://www.intern");'
-## Switch off caching over the network (commented, managed by unburden-home-dir now):
-#ainsl /etc/iceweasel/pref/iceweasel.js 'pref("browser.cache.disk.enable", false);'
-ainsl /etc/iceweasel/pref/iceweasel.js 'pref("browser.cache.offline.enable", false);'
-#ainsl /etc/iceweasel/pref/iceweasel.js 'pref("browser.safebrowsing.enabled", false);'
-#ainsl /etc/iceweasel/pref/iceweasel.js 'pref("browser.safebrowsing.malware.enabled", false);'
+## Optional: Switch off caching over the network (eventually in combination with unburden-home-dir):
+#ainsl /etc/firefox-esr/firefox-esr.js 'pref("browser.cache.disk.enable", false);'
+#ainsl /etc/firefox-esr/firefox-esr.js 'pref("browser.cache.offline.enable", false);'
+#ainsl /etc/firefox-esr/firefox-esr.js 'pref("browser.safebrowsing.enabled", false);'
+#ainsl /etc/firefox-esr/firefox-esr.js 'pref("browser.safebrowsing.malware.enabled", false);'
diff --git a/fai/config/scripts/CLIENT_A/60-unburden-home-dir b/fai/config/scripts/CLIENT_A/60-unburden-home-dir
deleted file mode 100755
index c7a9047..0000000
--- a/fai/config/scripts/CLIENT_A/60-unburden-home-dir
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/sbin/cfagent -f
-
-control:
- any::
- actionsequence = ( editfiles )
- EditFileSize = ( 30000 )
-
-editfiles:
- any::
- ## Enable all:
- { ${target}/etc/unburden-home-dir.list
- SetCommentStart "#"
- UnCommentLinesMatching "#m . .*"
- }
-# { ${target}/etc/default/unburden-home-dir
-# SetCommentStart "#"
-# UnCommentLinesMatching "#UNBURDEN_HOME=true"
-# }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git
More information about the debian-lan-devel
mailing list