Skip to content
Commits on Source (11)
Show whitespace changes
Inline Side-by-side
Makefile
View file @ e7bb6666
......@@ -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
View file @ e7bb6666
......@@ -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
View file @ e7bb6666
......@@ -11,16 +11,6 @@ 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.
debian.server.installation::
......
cf3/edu.cf
View file @ e7bb6666
......@@ -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
View file @ e7bb6666
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@arcor.de> Sat, 02 Nov 2019 12:49:30 +0100
debian-edu-config (2.11.7) unstable; urgency=medium
[ Wolfgang Schweer ]
......
debian/control
View file @ e7bb6666
......@@ -26,7 +26,6 @@ Depends: ${misc:Depends},
cfengine3,
debconf-utils,
debian-edu-artwork,
desktop-profiles,
e2fsprogs,
education-tasks,
fping,
......
debian/debian-edu-config.postinst
View file @ e7bb6666
......@@ -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/installs.ini 0 → 100644
View file @ e7bb6666
[3B6073811A6ABF12]
Default=debian-edu.default
Locked=1
share/debian-edu-config/profiles.ini.ff 0 → 100644
View file @ e7bb6666
[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
View file @ e7bb6666
......@@ -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
View file @ e7bb6666
......@@ -220,7 +220,6 @@ finalization_diskless_workstation() {
# Keep rwhod, shutdown-at-night and sitesummary-client.
disable_cronjob \
bsdmainutils \
desktop-profiles \
etckeeper \
killer \
ntp
......