[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 11 commits: Drop workaround for bug #930125 now that firefox-esr 68.x is available.

WolfgangSchweer gitlab at salsa.debian.org
Sat Nov 2 18:11:10 GMT 2019 


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


Commits:
0fa0af06 by Wolfgang Schweer at 2019-11-02T10:32:24Z
Drop workaround for bug #930125 now that firefox-esr 68.x is available.

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

- - - - -
7093d95a by Wolfgang Schweer at 2019-11-02T11:32:59Z
d/control: Drop Depends on desktop-profiles.

Now only XDG tools are used for education menu re-structuring.

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

- - - - -
f2bde5a2 by Wolfgang Schweer at 2019-11-02T11:39:33Z
Adjust cf3/edu.cf now that the desktop-profiles package isn't used any longer.

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

- - - - -
a6ff5622 by Wolfgang Schweer at 2019-11-02T11:40:11Z
Adjust cf3/cf.finalize now that the desktop-profiles package isn't used any longer.

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

- - - - -
3e0cd4c2 by Wolfgang Schweer at 2019-11-02T11:41:47Z
Adjust share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs

The desktop-profiles package isn't used any longer.

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

- - - - -
30869c9b by Wolfgang Schweer at 2019-11-02T11:43:52Z
Adjust debian/debian-edu-config.postinst now that the desktop-profiles package isn't used any longer.

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

- - - - -
658ebcf3 by Wolfgang Schweer at 2019-11-02T12:09:12Z
Add changelog entries for last commits.

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

- - - - -
a220b4dc by Wolfgang Schweer at 2019-11-02T17:11:10Z
Add share/debian-edu-config/profiles.ini.ff as Firefox-ESR profiles.ini file.

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

- - - - -
7a3ba611 by Wolfgang Schweer at 2019-11-02T17:13:59Z
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>

- - - - -
5dffbabe by Wolfgang Schweer at 2019-11-02T17:18:07Z
Ajust share/debian-edu-config/tools/gosa-create and Makefile for firefox profile
related changes.

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

- - - - -
e7bb6666 by Wolfgang Schweer at 2019-11-02T17:32:03Z
Add changelog entries for Firefox-ESR profile related commits.

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

- - - - -


12 changed files:

- Makefile
- cf3/cf.finalize
- cf3/cf.workarounds
- cf3/edu.cf
- debian/changelog
- debian/control
- debian/debian-edu-config.postinst
- − share/debian-edu-config/edu-firefox-nfs
- + share/debian-edu-config/installs.ini
- + share/debian-edu-config/profiles.ini.ff
- share/debian-edu-config/tools/gosa-create
- share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs


Changes:

=====================================
Makefile
=====================================
@@ -376,7 +376,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 \
@@ -384,7 +386,6 @@ install: install-testsuite
 		share/debian-edu-config/udisks2.patch \
 		share/debian-edu-config/lightdm-gtk-greeter.conf \
 		share/debian-edu-config/sudo-ldap.conf \
-		share/debian-edu-config/edu-firefox-nfs \
 		share/pam-configs/edu-group \
 		share/pam-configs/edu-umask \
 		share/perl5/Debian/Edu.pm \


=====================================
cf3/cf.finalize
=====================================
@@ -19,16 +19,13 @@ files:
     link_from => ln_s("/usr/share/debian-edu-config/lightdm-gtk-greeter.conf"),
     move_obstructions => "true";
 
-  # Make sure desktop-profiles are disabled, use XDG instead for all DEs. This
+  # Use XDG to restructure education menus (cascading category style). This
   # more general approach is needed because otherwise the user is prompted to
   # set up the LXQt session manually (x-window-manager, panel config) now that
   # lxqt depends on the 'lxqt-branding-debian' package.
 
   debian.installation::
 
-    "/etc/default/desktop-profiles"
-    edit_line => profile;
-
     "/etc/xdg/menus/applications-merged"
     link_from => ln_s("/usr/share/debian-edu/menu/menus/applications-merged"),
     move_obstructions => "true";
@@ -151,16 +148,6 @@ commands:
       contain => in_shell;
 }
 
-bundle edit_line profile
-{
-
-replace_patterns:
-
-  "PERSONALITY=polite" replace_with => value("PERSONALITY=sheep");
-  # Needed if upgrading from 10+edu~a0
-  "PERSONALITY=rude" replace_with => value("PERSONALITY=sheep");
-}
-
 bundle agent editline_finalize
 {
 


=====================================
cf3/cf.workarounds
=====================================
@@ -11,17 +11,7 @@ files:
       link_from => ln_s("/usr/share/debian-edu-config/squid.resolvconf"),
       move_obstructions => "true";
 
-  debian.workstation.installation::
-  # Fix black frame issue for mozilla profile on NFS share (workaround for #930125).
-  # FIXME: check if this is still needed with firefox-esr 68.x
-    "/etc/X11/Xsession.d/99edu-firefox-nfs"
-      link_from => ln_s("/usr/share/debian-edu-config/edu-firefox-nfs"),
-      move_obstructions => "true";
-    "/etc/profile.d/edu-firefox-nfs.sh"
-      link_from => ln_s("/usr/share/debian-edu-config/edu-firefox-nfs"),
-      move_obstructions => "true";
-
-  # Provide Debian Edu RootCA pub key file for download.
+   # Provide Debian Edu RootCA pub key file for download.
 
   debian.server.installation::
     "/etc/debian-edu/www/Debian-Edu_rootCA.crt"


=====================================
cf3/edu.cf
=====================================
@@ -18,7 +18,7 @@ bundle common edu
 
     "server"	     expression => returnszero("/bin/grep 'Main-Server' /etc/debian-edu/config","noshell");
     "ltspserver"     expression => fileexists("/usr/sbin/ltsp-build-client");
-    "workstation"    and => { fileexists("/etc/desktop-profiles/debian-edu-menus.listing"), fileexists("/usr/bin/ntpq") };
+    "workstation"    and => { returnszero("/bin/grep 'Workstation' /etc/debian-edu/config","noshell"), fileexists("/usr/bin/ntpq") };
     "roaming"	     expression => returnszero("/bin/grep  'Roaming-Workstation' /etc/debian-edu/config","noshell");
     "standalone"     expression => not( fileexists("/usr/bin/ntpq") );
     "minimal"	     expression => returnszero("/bin/grep 'Minimal' /etc/debian-edu/config","noshell");


=====================================
debian/changelog
=====================================
@@ -1,3 +1,26 @@
+debian-edu-config (2.11.8) UNRELEASED; urgency=medium
+
+  * Drop workaround for NFS related bug #930125 (fixed in firefox-esr 68.2.x):
+    - Remove share/debian-edu-config/edu-firefox-nfs.
+    - Adjust cf3/cf.workarounds and Makefile.
+  * Adjustments for changed education menu re-structuring:
+    - d/control: Drop Depends on desktop-profiles.
+    - cf3/edu.cf: Re-define class 'Workstation' condition.
+    - cf3/cf.finalize: Remove desktop-profiles related editing.
+    - share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs and
+    - debian/debian-edu-config.postinst:
+      Drop desktop-profiles related code.
+  * Cope with Firefox-ESR ini files that need to be different (as of version
+    68.2.0esr) to further allow central configuration management:
+    - 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).
+    - Ajust share/debian-edu-config/tools/gosa-create which is used to copy the
+      related Firefox-ESR ini files.
+    - Ajust Makefile.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sat, 02 Nov 2019 12:49:30 +0100
+
 debian-edu-config (2.11.7) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/control
=====================================
@@ -26,7 +26,6 @@ Depends: ${misc:Depends},
          cfengine3,
          debconf-utils,
          debian-edu-artwork,
-         desktop-profiles,
          e2fsprogs,
          education-tasks,
          fping,


=====================================
debian/debian-edu-config.postinst
=====================================
@@ -209,10 +209,4 @@ if which etckeeper > /dev/null ; then
     etckeeper commit "end of debian-edu-config postinst" || true
 fi
 
-# Regenerate desktop-profiles cache, as we've installed new .listing files 
-if(  ( test "$1" = "configure" ) &&
-     ( test -x "$(which update-profile-cache 2>/dev/null)" ) ); then
-    update-profile-cache;
-fi;
-
 exit 0


=====================================
share/debian-edu-config/edu-firefox-nfs deleted
=====================================
@@ -1 +0,0 @@
-export NSS_SDB_USE_CACHE="yes"


=====================================
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


=====================================
share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
=====================================
@@ -220,7 +220,6 @@ finalization_diskless_workstation() {
     # Keep rwhod, shutdown-at-night and sitesummary-client.
     disable_cronjob \
         bsdmainutils \
-        desktop-profiles \
         etckeeper \
         killer \
         ntp



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/0b4579447c218dd144444f2dd43a95ded4301389...e7bb66668526d29e759047cd8225ef4da3ba9ac5

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/0b4579447c218dd144444f2dd43a95ded4301389...e7bb66668526d29e759047cd8225ef4da3ba9ac5
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/20191102/f49b96ec/attachment-0001.html>

More information about the debian-edu-commits mailing list