[debian-edu-commits] [Git][debian-edu/debian-edu-config][buster] 5 commits: Add share/debian-edu-config/profiles.ini.ff as Firefox-ESR profiles.ini file.

[WolfgangSchweer]

WolfgangSchweer pushed to branch buster at Debian Edu / debian-edu-config


Commits:
43aa04ad by Wolfgang Schweer at 2019-11-04T15:02:29Z
Add share/debian-edu-config/profiles.ini.ff as Firefox-ESR profiles.ini file.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
bddb0c59 by Wolfgang Schweer at 2019-11-04T15:03:46Z
Add share/debian-edu-config/installs.ini

This file is now needed for users that don't have a Firefox-ESR profile.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
1fdae7d9 by Wolfgang Schweer at 2019-11-04T15:05:11Z
Ajust share/debian-edu-config/tools/gosa-create and Makefile for firefox profile
related changes.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
59e7ebb4 by Wolfgang Schweer at 2019-11-04T15:09:35Z
Adjust ldap-tools/ldap-debian-edu-install to fix #944013 for the first user.

This change is needed for new installations (both Buster and Bullseye).

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
6e3ebc22 by Wolfgang Schweer at 2019-11-04T16:10:37Z
Add changelog entries for Firefox-ESR related commits.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


6 changed files:

- Makefile
- debian/changelog
- ldap-tools/ldap-debian-edu-install
- + share/debian-edu-config/installs.ini
- + share/debian-edu-config/profiles.ini.ff
- share/debian-edu-config/tools/gosa-create


Changes:

=====================================
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 at 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
=====================================
@@ -0,0 +1,4 @@
+[3B6073811A6ABF12]
+Default=debian-edu.default
+Locked=1
+


=====================================
share/debian-edu-config/profiles.ini.ff
=====================================
@@ -0,0 +1,13 @@
+[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



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/7108fc8de4fe9b605c54a507ca1b744861309634...6e3ebc22bb516ca79fb39f0bc0d5006599305795

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/7108fc8de4fe9b605c54a507ca1b744861309634...6e3ebc22bb516ca79fb39f0bc0d5006599305795
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20191104/e8b80b37/attachment-0001.html>