Makefile

@@ -378,7 +378,9 @@ install: install-testsuite
 		share/debian-edu-config/sslCA.cnf \
 		share/debian-edu-config/v3.cnf \
 		share/debian-edu-config/v3CA.cnf \
+		share/debian-edu-config/installs.ini \
 		share/debian-edu-config/profiles.ini \
+		share/debian-edu-config/profiles.ini.ff \
 		share/debian-edu-config/debian-edu.addmachine.template \
 		share/debian-edu-config/debian-edu.ldapscripts.passwd \
 		share/debian-edu-config/passwords_stub.dat \

debian/changelog

@@ -3,6 +3,15 @@ debian-edu-config (2.10.65+deb10u2) UNRELEASED; urgency=medium
   * Adjust share/debian-edu-config/d-i/finish-install: (Closes: #941574)
     - Use 'dpkg-reconfigure -u --no-reload debian-edu-config' to add post-up
       stanza to /etc/network/interfaces eth0 entry conditionally.
+  * Cope with Firefox-ESR ini files that need to be different (as of version
+    68.2.0esr) to further allow centralized configuration: (Closes: #944013)
+    - Add share/debian-edu-config/profiles.ini.ff (Firefox-ESR profiles.ini).
+    - Add share/debian-edu-config/installs.ini (now needed in addition for users
+      that don't have a Firefox-ESR profile, i.e. new users).
+    - Adjust share/debian-edu-config/tools/gosa-create which is used to copy
+      the related Firefox-ESR ini files.
+    - Ajust Makefile.
+    - Adjust ldap-tools/ldap-debian-edu-install (fix for the first user).
 
  -- Wolfgang Schweer <wschweer@arcor.de>  Wed, 02 Oct 2019 10:53:42 +0200
 

ldap-tools/ldap-debian-edu-install

@@ -599,7 +599,8 @@ fi
 if [ -x /usr/bin/certutil ] ; then
   mkdir -p /skole/tjener/home0/"$FIRSTUSERNAME"/.mozilla/firefox/debian-edu.default
   chmod -R 700 /skole/tjener/home0/"$FIRSTUSERNAME"/.mozilla/firefox/debian-edu.default
-  cp /usr/share/debian-edu-config/profiles.ini /skole/tjener/home0/"$FIRSTUSERNAME"/.mozilla/firefox
+  cp /usr/share/debian-edu-config/profiles.ini.ff /skole/tjener/home0/"$FIRSTUSERNAME"/.mozilla/firefox/profiles.ini
+  cp /usr/share/debian-edu-config/installs.ini /skole/tjener/home0/"$FIRSTUSERNAME"/.mozilla/firefox/installs.ini
   mkdir -p /skole/tjener/home0/"$FIRSTUSERNAME"/.thunderbird/debian-edu.default
   chmod -R 700 /skole/tjener/home0/"$FIRSTUSERNAME"/.thunderbird/debian-edu.default
   cp /usr/share/debian-edu-config/profiles.ini /skole/tjener/home0/"$FIRSTUSERNAME"/.thunderbird

share/debian-edu-config/installs.ini

+[3B6073811A6ABF12]
+Default=debian-edu.default
+Locked=1
+

share/debian-edu-config/profiles.ini.ff

+[Profile0]
+Name=debian-edu
+IsRelative=1
+Path=debian-edu.default
+
+[General]
+StartWithLastProfile=1
+Version=2
+
+[Install3B6073811A6ABF12]
+Default=debian-edu.default
+Locked=1
+

share/debian-edu-config/tools/gosa-create

@@ -44,7 +44,8 @@ while read KEY VALUE ; do
             chmod -R 700 $HOMEDIR/.thunderbird/debian-edu.default
             mkdir -p $HOMEDIR/.pki/nssdb
             chmod -R 700 $HOMEDIR/.pki/nssdb
-            cp /usr/share/debian-edu-config/profiles.ini $HOMEDIR/.mozilla/firefox
+            cp /usr/share/debian-edu-config/profiles.ini.ff $HOMEDIR/.mozilla/firefox/profiles.ini
+            cp /usr/share/debian-edu-config/installs.ini $HOMEDIR/.mozilla/firefox/installs.ini
             cp /usr/share/debian-edu-config/profiles.ini $HOMEDIR/.thunderbird
             certutil  -A -d dbm:$HOMEDIR/.mozilla/firefox/debian-edu.default/ -t "CT,CT," -n "DebianEdu" -i /etc/ssl/certs/Debian-Edu_rootCA.crt
             certutil  -A -d dbm:$HOMEDIR/.thunderbird/debian-edu.default/ -t "CT,CT," -n "DebianEdu" -i /etc/ssl/certs/Debian-Edu_rootCA.crt