summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.disklserver2
-rw-r--r--README.faiserver13
-rw-r--r--README.roamingworkstation7
-rwxr-xr-xbin/itzks-filter-whitelist-sslmitm-ca58
-rwxr-xr-xbin/itzks-goodbye-user-session46
-rwxr-xr-xbin/itzks-hosts43
-rwxr-xr-xbin/itzks-puppet-list-known-hosts21
-rw-r--r--debian/changelog974
-rw-r--r--debian/compat1
-rw-r--r--debian/control534
-rw-r--r--debian/copyright153
-rw-r--r--debian/itzks-systems-backup.install1
-rw-r--r--debian/itzks-systems-backup.links1
-rw-r--r--debian/itzks-systems-common.install2
-rw-r--r--debian/itzks-systems-common.lintian-overrides2
-rw-r--r--debian/itzks-systems-common.maintscript7
-rwxr-xr-xdebian/itzks-systems-common.postinst23
l---------debian/itzks-systems-diskless.fetch-filter-cert.init1
-rw-r--r--debian/itzks-systems-diskless.install2
-rw-r--r--debian/itzks-systems-diskless.maintscript1
-rwxr-xr-xdebian/itzks-systems-diskless.postinst1
-rwxr-xr-xdebian/itzks-systems-diskless.postrm1
-rwxr-xr-xdebian/itzks-systems-diskless.preinst39
-rw-r--r--debian/itzks-systems-disklserver.examples2
-rw-r--r--debian/itzks-systems-disklserver.install2
-rw-r--r--debian/itzks-systems-displayserver.examples2
-rw-r--r--debian/itzks-systems-displayserver.install1
-rw-r--r--debian/itzks-systems-faiserver.docs1
-rw-r--r--debian/itzks-systems-faiserver.install2
-rw-r--r--debian/itzks-systems-faiserver.links1
-rw-r--r--debian/itzks-systems-faiserver.lintian-overrides3
-rwxr-xr-xdebian/itzks-systems-faiserver.postinst45
-rw-r--r--debian/itzks-systems-filter.install3
-rw-r--r--debian/itzks-systems-filter.links1
-rw-r--r--debian/itzks-systems-filter.manpages2
-rw-r--r--debian/itzks-systems-mainserver.examples2
-rw-r--r--debian/itzks-systems-mainserver.install8
-rw-r--r--debian/itzks-systems-mainserver.lintian-overrides12
-rwxr-xr-xdebian/itzks-systems-mainserver.postinst52
-rwxr-xr-xdebian/itzks-systems-mainserver.postrm44
-rw-r--r--debian/itzks-systems-puppetserver.install4
-rw-r--r--debian/itzks-systems-roamingworkstation.install9
-rw-r--r--debian/itzks-systems-roamingworkstation.lintian-overrides6
-rw-r--r--debian/itzks-systems-smartboard.links1
-rw-r--r--debian/itzks-systems-tablet.install7
-rw-r--r--debian/itzks-systems-tablet.links1
-rw-r--r--debian/itzks-systems-tablet.lintian-overrides6
l---------debian/itzks-systems-terminalserver.fetch-filter-cert.init1
-rw-r--r--debian/itzks-systems-terminalserver.install1
-rw-r--r--debian/itzks-systems-terminalserver.maintscript1
-rwxr-xr-xdebian/itzks-systems-terminalserver.preinst39
-rw-r--r--debian/itzks-systems-virtman.install1
-rw-r--r--debian/itzks-systems-virtman.links1
l---------debian/itzks-systems-workstation.fetch-filter-cert.init1
-rw-r--r--debian/itzks-systems-workstation.install3
-rw-r--r--debian/itzks-systems-workstation.maintscript8
-rwxr-xr-xdebian/itzks-systems-workstation.postinst13
-rwxr-xr-xdebian/itzks-systems-workstation.preinst39
-rwxr-xr-xdebian/rules5
-rw-r--r--debian/source/lintian-overrides3
-rw-r--r--debian/templates2
-rw-r--r--etc/apt/sources.list.d/arctica.list4
-rw-r--r--etc/apt/sources.list.d/backports.list2
-rw-r--r--etc/apt/sources.list.d/itzks.list5
-rw-r--r--etc/apt/sources.list.d/multimedia.list2
-rw-r--r--etc/apt/sources.list.d/x2go.list2
-rw-r--r--etc/chromium/policies/recommended/itzks-systems_search_provider.json9
-rw-r--r--etc/cron.d/itzks-systems-common7
-rw-r--r--etc/cron.d/itzks-systems-filter4
-rw-r--r--etc/cron.d/itzks-systems-mainserver5
-rw-r--r--etc/cron.d/itzks-systems-puppetserver5
-rwxr-xr-xetc/cron.daily/itzks-systems-workstation8
-rw-r--r--etc/default/epoptes-client.d/90_itzks-systems-diskless1
-rw-r--r--etc/default/epoptes-client.d/90_itzks-systems-workstation1
-rw-r--r--etc/firefox-esr/itzks_caching.js2
-rwxr-xr-xetc/init.d/fetch-filter-cert80
-rw-r--r--etc/ltsp/image-local.excludes16
-rw-r--r--etc/ltsp/image-local.omit-excludes2
-rw-r--r--etc/ltsp/ltsp.conf.itzks-systems-disklserver.in87
-rwxr-xr-xetc/mklocaluser.d/60-itzks-systems-roamingworkstation_disable-welcome-page48
-rwxr-xr-xetc/mklocaluser.d/60-itzks-systems-roamingworkstation_gvfs-symlink14
-rwxr-xr-xetc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox39
-rwxr-xr-xetc/mklocaluser.d/60-itzks-systems-roamingworkstation_smb-bookmarks82
-rwxr-xr-xetc/mklocaluser.d/60-itzks-systems-tablet_add-to-local-groups14
-rw-r--r--etc/modprobe.d/itzks-systems-common_dsp-fix.conf5
-rwxr-xr-xetc/network/if-up.d/itzks-autofs7
-rwxr-xr-xetc/network/if-up.d/itzks-cups9
-rw-r--r--etc/skel/.debian-edu/welcome-page-shown0
-rw-r--r--etc/skel/.mozilla/firefox/debian-edu.default/pkcs11.txt1
-rw-r--r--etc/skel/.pki/nssdb/pkcs11.txt1
-rw-r--r--etc/squid-deb-proxy/mirror-dstdomain.acl.d/90-itzks-systems-faiserver17
-rw-r--r--etc/squid/conf.d/itzks-systems-mainserver.conf1
-rw-r--r--etc/standardskriver.cfg23
-rw-r--r--examples/backup/dirvish/contentserver.intern/contentserver.intern_boot/dirvish/default.conf8
-rw-r--r--examples/backup/dirvish/contentserver.intern/contentserver.intern_usr/dirvish/default.conf10
-rw-r--r--examples/backup/dirvish/contentserver.intern/contentserver.intern_var/dirvish/default.conf11
-rw-r--r--examples/backup/dirvish/disklserver.intern/disklserver.intern_boot/dirvish/default.conf8
-rw-r--r--examples/backup/dirvish/disklserver.intern/disklserver.intern_usr/dirvish/default.conf10
-rw-r--r--examples/backup/dirvish/disklserver.intern/disklserver.intern_var/dirvish/default.conf11
-rw-r--r--examples/backup/dirvish/faiserver.intern/faiserver.intern_boot/dirvish/default.conf8
-rw-r--r--examples/backup/dirvish/faiserver.intern/faiserver.intern_rootfs/dirvish/default.conf18
-rw-r--r--examples/backup/dirvish/faiserver.intern/faiserver.intern_srv/dirvish/default.conf9
-rw-r--r--examples/backup/dirvish/faiserver.intern/faiserver.intern_usr/dirvish/default.conf10
-rw-r--r--examples/backup/dirvish/faiserver.intern/faiserver.intern_var/dirvish/default.conf11
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_var+log/dirvish/default.conf6
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf2
-rw-r--r--examples/backup/master.conf.dirvish39
-rw-r--r--examples/disklserver/README.tftp10
-rw-r--r--examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_background.svg158
-rwxr-xr-xexamples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_start47
-rwxr-xr-xexamples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init26
-rwxr-xr-xexamples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/005_x2gothinclient-wipe-home30
-rwxr-xr-xexamples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/010_x2gothinclient-fresh-home53
-rwxr-xr-xexamples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/950_x2gothinclient-minidesktop25
-rw-r--r--examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_sessions66
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg4
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/localboot-mswin.cfg4
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg5
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg13
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/memtest.cfg6
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg3
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg3
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg3
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg4
l---------examples/disklserver/tftp/_common_/ltsp/amd64+stretch/initrd.img1
l---------examples/disklserver/tftp/_common_/ltsp/amd64+stretch/vmlinuz1
l---------examples/disklserver/tftp/_common_/ltsp/i386+jessie/initrd.img1
l---------examples/disklserver/tftp/_common_/ltsp/i386+jessie/vmlinuz1
l---------examples/disklserver/tftp/_common_/pxelinux/jessie/pxelinux.01
l---------examples/disklserver/tftp/_common_/pxelinux/stretch/pxelinux.01
l---------examples/disklserver/tftp/_common_/syslinux/jessie/syslinux1
l---------examples/disklserver/tftp/_common_/syslinux/stretch/syslinux1
l---------examples/disklserver/tftp/_common_/x2go/i386/initrd.img1
l---------examples/disklserver/tftp/_common_/x2go/i386/vmlinuz1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg17
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-stretch.cfg1
-rw-r--r--examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest.cfg7
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/ltsp1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.01
l---------examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/syslinux1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg16
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-jessie.cfg1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-stretch.cfg1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/diskless+x2go/ltsp1
l---------examples/disklserver/tftp/diskless+x2go/pxelinux.01
l---------examples/disklserver/tftp/diskless+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/diskless+x2go/syslinux1
l---------examples/disklserver/tftp/mint+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg15
l---------examples/disklserver/tftp/mint+x2go/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/mint+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/mint+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/mint+x2go/debian-edu/mint-workstation.cfg1
l---------examples/disklserver/tftp/mint+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/mint+x2go/ltsp1
l---------examples/disklserver/tftp/mint+x2go/pxelinux.01
l---------examples/disklserver/tftp/mint+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/mint+x2go/syslinux1
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg15
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg1
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/skolelinux+x2go/ltsp1
l---------examples/disklserver/tftp/skolelinux+x2go/pxelinux.01
l---------examples/disklserver/tftp/skolelinux+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/skolelinux+x2go/syslinux1
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg15
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg1
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/ubuntu+x2go/ltsp1
l---------examples/disklserver/tftp/ubuntu+x2go/pxelinux.01
l---------examples/disklserver/tftp/ubuntu+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/ubuntu+x2go/syslinux1
l---------examples/disklserver/tftp/windows+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg15
l---------examples/disklserver/tftp/windows+x2go/debian-edu/localboot-mswin.cfg1
l---------examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/windows+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/windows+x2go/ltsp1
l---------examples/disklserver/tftp/windows+x2go/pxelinux.01
l---------examples/disklserver/tftp/windows+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/windows+x2go/syslinux1
l---------examples/disklserver/tftp/x2go-tce/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg13
l---------examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/x2go-tce/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/x2go-tce/ltsp1
l---------examples/disklserver/tftp/x2go-tce/pxelinux.01
l---------examples/disklserver/tftp/x2go-tce/pxelinux.cfg/default1
l---------examples/disklserver/tftp/x2go-tce/syslinux1
-rw-r--r--examples/disklserver/x2gothinclient-settings.conf61
-rw-r--r--examples/displayserver/README.tftp10
-rw-r--r--examples/displayserver/tftp/_common_/debian-edu/display.cfg5
-rw-r--r--examples/displayserver/tftp/_common_/debian-edu/memtest.cfg6
l---------examples/displayserver/tftp/_common_/display/amd64/initrd.img1
l---------examples/displayserver/tftp/_common_/display/amd64/vmlinuz1
l---------examples/displayserver/tftp/_common_/pxelinux/jessie/pxelinux.01
l---------examples/displayserver/tftp/_common_/syslinux/jessie/syslinux1
l---------examples/displayserver/tftp/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/displayserver/tftp/debian-edu/default-menu.cfg12
l---------examples/displayserver/tftp/debian-edu/display.cfg1
l---------examples/displayserver/tftp/debian-edu/memtest.cfg1
l---------examples/displayserver/tftp/debian-edu/memtest86+.bin1
l---------examples/displayserver/tftp/debian-edu/memtest86.bin1
l---------examples/displayserver/tftp/display1
l---------examples/displayserver/tftp/pxelinux.01
l---------examples/displayserver/tftp/pxelinux.cfg/default1
l---------examples/displayserver/tftp/syslinux1
-rw-r--r--examples/mainserver/README.tftp17
l---------examples/mainserver/tftp/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/mainserver/tftp/debian-edu/default-menu.cfg14
-rw-r--r--examples/mainserver/tftp/debian-edu/install-de8.cfg13
-rw-r--r--examples/mainserver/tftp/debian-edu/install-de9.cfg13
-rw-r--r--examples/mainserver/tftp/debian-edu/localboot.cfg5
-rw-r--r--examples/mainserver/tftp/debian-edu/memtest.cfg8
l---------examples/mainserver/tftp/debian-edu/memtest86+.bin1
l---------examples/mainserver/tftp/debian-edu/memtest86.bin1
l---------examples/mainserver/tftp/debian-installer/amd64.stretch1
l---------examples/mainserver/tftp/debian-installer/i386.stretch1
l---------examples/mainserver/tftp/pxelinux.01
l---------examples/mainserver/tftp/pxelinux.cfg/default1
l---------examples/mainserver/tftp/syslinux1
l---------man/diskless-workstation-shell.bookworm.8 (renamed from man/diskless-workstation-shell.jessie.8)0
l---------man/diskless-workstation-shell.bullseye.8 (renamed from man/diskless-workstation-shell.stretch.8)0
-rw-r--r--man/e2guardian-update-blacklists.8 (renamed from man/e2guardian-update-shallalists.8)14
l---------sbin/diskless-workstation-shell2
-rwxr-xr-xsbin/diskless-workstation-shell.bookworm (renamed from sbin/diskless-workstation-shell.stretch)6
-rwxr-xr-xsbin/diskless-workstation-shell.bullseye (renamed from sbin/diskless-workstation-shell.jessie)6
-rwxr-xr-xsbin/diskless-workstation-shell.buster4
-rwxr-xr-xsbin/e2guardian-update-blacklists147
-rwxr-xr-xsbin/e2guardian-update-shallalists72
-rwxr-xr-xsbin/itzks-check-ldap-group-not-in-correct-ou57
-rwxr-xr-xsbin/itzks-diskless-re-partition-dlw57
-rwxr-xr-xsbin/itzks-display-shell2
-rwxr-xr-xsbin/itzks-prepare-reinstall77
-rwxr-xr-xsbin/itzks-puppet-autosign-new-host-certificates92
-rwxr-xr-xsbin/itzks-puppet-refresh-ssl8
-rwxr-xr-xsbin/itzks-switch-back-to-networkmanager50
-rwxr-xr-xsbin/itzks-switch-to-systemd-networkd73
-rwxr-xr-xsbin/itzks-systems.do_preseed1
-rwxr-xr-xsbin/itzks-update-disklserver-squashfs-images145
-rwxr-xr-xshare/debian-edu-config/tools/gosa-create-host-itzks24
-rwxr-xr-xshare/debian-edu-config/tools/gosa-modify-host-itzks26
-rwxr-xr-xshare/debian-edu-config/tools/update-dlw-krb5-keytabs-itzks111
-rw-r--r--share/glib-2.0/schemas/90_itzks+gnome-tablet.gschema.override2
-rw-r--r--share/glib-2.0/schemas/90_itzks+mate.gschema.override19
277 files changed, 3736 insertions, 1046 deletions
diff --git a/README.disklserver b/README.disklserver
index 24571aa..da6af6a 100644
--- a/README.disklserver
+++ b/README.disklserver
@@ -4,7 +4,7 @@ IT-Zukunft Schule: Diskless Workstation Server (disklserver.intern)
This package pulls in software required for running a
Debian system as diskless workstation server.
-IN ITZkS a dedicated system is set up to serve diskless workstation images
+In ITZkS a dedicated system is set up to serve diskless workstation images
into the Debian Edu network. This package helps to install/configure these
machines.
diff --git a/README.faiserver b/README.faiserver
new file mode 100644
index 0000000..7abb4ea
--- /dev/null
+++ b/README.faiserver
@@ -0,0 +1,13 @@
+IT-Zukunft Schule: FAI Server (faiserver.intern)
+------------------
+
+This package pulls in software required for running a
+Debian system as FAI config space server.
+
+In ITZkS a dedicated system is set up to serve the network as device
+deployment server. With FAI, you can easily realize zero-click
+deployments of Linux based notebooks, tablets and workstations.
+
+This package helps to install/configure this FAI config space server.
+
+Mike Gabriel, 20211222 \ No newline at end of file
diff --git a/README.roamingworkstation b/README.roamingworkstation
new file mode 100644
index 0000000..32f3094
--- /dev/null
+++ b/README.roamingworkstation
@@ -0,0 +1,7 @@
+IT-Zukunft Schule: Roaming Workstation System
+------------------
+
+This package pulls in software required for running a
+Debian system as a (Skolelinux) roaming workstation.
+
+Mike Gabriel, 20200207
diff --git a/bin/itzks-filter-whitelist-sslmitm-ca b/bin/itzks-filter-whitelist-sslmitm-ca
deleted file mode 100755
index 838947f..0000000
--- a/bin/itzks-filter-whitelist-sslmitm-ca
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2018 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-if [ "$(hostname -s)" != "tjener" ]; then
- echo "ERROR: Not on TJENER. Aborting..."
- exit 1
-fi
-
-certificateFile="/etc/debian-edu/www/E2Guardian-ca.crt"
-certificateName="DebianEduFilter"
-
-if [ ! -e "${certificateFile}" ]; then
- echo "ERROR: no certificate file at ${certificateFile}. Aborting..."
- exit 1
-fi
-
-# Debian Edu specific
-if [ -e "$HOME/.mozilla/firefox/debian-edu.default" ]; then
- certDir="$HOME/.mozilla/firefox/debian-edu.default"
- if [ ! -e "$HOME/.mozilla/firefox/debian-edu.default/cert8.db" -a ! -e "$HOME/.mozilla/firefox/debian-edu.default/cert9.db" ]; then
- logger -t "Mozilla CA Import" "Install '${certificateName}' in ${certDir} (cert8.db)"
- certutil -A -n "${certificateName}" -t "TC,Cw,Tw" -i ${certificateFile} -d ${certDir}
- fi
-fi
-
-# Debian stretch, Firefox until v57
-for certDB in $(find ~/.mozilla* ~/.thunderbird -name "cert8.db" 2>/dev/null)
-do
- certDir=$(dirname ${certDB})
- logger -t "Mozilla CA Import" "Install '${certificateName}' in ${certDir} (cert8.db)"
- certutil -A -n "${certificateName}" -t "TC,Cw,Tw" -i ${certificateFile} -d ${certDir}
-done
-
-# Debian buster, Firefox v58 and higher
-for certDB in $(find ~/.mozilla* ~/.thunderbird -name "cert9.db" 2>/dev/null)
-do
- certDir=$(dirname ${certDB})
- logger -t "Mozilla CA Import" "Install '${certificateName}' in ${certDir} (cert9.db)"
- certutil -A -d dbm:${certDir} -t "CT,CT," -n ${certificateName} -i ${certificateFile}
-done
-
-certDir="$HOMEDIR/.pki/nssdb/"
-certutil -A -d sql:${certDir} -t "CT,CT," -n ${certificateName} -i ${certificateFile}
diff --git a/bin/itzks-goodbye-user-session b/bin/itzks-goodbye-user-session
index 82e2633..754ecf4 100755
--- a/bin/itzks-goodbye-user-session
+++ b/bin/itzks-goodbye-user-session
@@ -17,26 +17,38 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-if [ $EUID -ge 500 ]; then
-
- # safety net for well-known browsers
- pkill -TERM -u "${LOGNAME}" x-www-browser
- pkill -TERM -u "${LOGNAME}" firefox-esr
- pkill -TERM -u "${LOGNAME}" firefox
- pkill -TERM -u "${LOGNAME}" iceweasel
- pkill -TERM -u "${LOGNAME}" chromium
- pkill -TERM -u "${LOGNAME}" chrome
- pkill -TERM -u "${LOGNAME}" konqueror
- pkill -TERM -u "${LOGNAME}" midori
- pkill -TERM -u "${LOGNAME}" opera
- sleep 1
-
- # dump all other processes the hard way...
- pkill -KILL -u "${LOGNAME}"
+
+if [ -x /usr/share/debian-edu-config/tools/goodbye-user-session ]; then
+
+ # Use Debian Edu implementation, if we have it already...
+ /usr/share/debian-edu-config/tools/goodbye-user-session ${@}
else
- echo "$(basename $0): System accounts are not allowed to commit suicide."
+ # FIXME: Drop this section for bookworm. Upstreamed as
+ # /usr/share/debian-edu-config/tools/goodbye-user-session
+ if [ $EUID -ge 500 ]; then
+
+ # safety net for well-known browsers
+ pkill -TERM -u "${LOGNAME}" x-www-browser
+ pkill -TERM -u "${LOGNAME}" firefox-esr
+ pkill -TERM -u "${LOGNAME}" firefox
+ pkill -TERM -u "${LOGNAME}" iceweasel
+ pkill -TERM -u "${LOGNAME}" chromium
+ pkill -TERM -u "${LOGNAME}" chrome
+ pkill -TERM -u "${LOGNAME}" konqueror
+ pkill -TERM -u "${LOGNAME}" midori
+ pkill -TERM -u "${LOGNAME}" opera
+ sleep 1
+
+ # dump all other processes the hard way...
+ pkill -KILL -u "${LOGNAME}"
+
+ else
+
+ echo "$(basename $0): System accounts are not allowed to be terminated by this script."
+
+ fi
fi
diff --git a/bin/itzks-hosts b/bin/itzks-hosts
index 7d7f04f..ee1ade5 100755
--- a/bin/itzks-hosts
+++ b/bin/itzks-hosts
@@ -2,23 +2,30 @@
set -e
-ldapsearch -xLLL "(&(cn=*)(|(objectClass=ipHost)(objectClass=goServer)))" \
- cn ipHostNumber macAddress description 2>/dev/null | perl -p0e 's/\n //g' | \
-while read KEY VALUE ; do
- case "$KEY" in
- dn:)
- HOSTNAME= ; IP= ; MAC= ; DESC= ; DN=${VALUE}
- OU=$(echo $DN | sed -r -e 's/cn=[^,]+,ou=[^,]+,ou=[^,]+,ou=([^,]+),.*/\1/' | sed -r -e 's/cn=[^,]+,ou=[^,]+,ou=[^,]+,dc=.*/Servers/g')
- ;;
- cn:) HOSTNAME="${VALUE}";;
- ipHostNumber:) IP="${VALUE}";;
- macAddress:) MAC="${VALUE}";;
- description:) DESC="${VALUE}";;
- "")
- if [ -n "$DESC" ]; then DESC="\"${DESC}\""; fi
- echo "${OU},${HOSTNAME},${IP},${MAC},${DESC}"
- ;;
- esac
-done
+if [ -x "/usr/share/debian-edu-config/list-gosa-systems" ]; then
+ /usr/share/debian-edu-config/list-gosa-systems ${@}
+else
+
+ # FIXME: drop this part for the bookworm release cycle...
+
+ ldapsearch -xLLL "(&(cn=*)(|(objectClass=ipHost)(objectClass=goServer)))" \
+ cn ipHostNumber macAddress description 2>/dev/null | perl -p0e 's/\n //g' | \
+ while read KEY VALUE ; do
+ case "$KEY" in
+ dn:)
+ HOSTNAME= ; IP= ; MAC= ; DESC= ; DN=${VALUE}
+ OU=$(echo $DN | sed -r -e 's/cn=[^,]+,ou=[^,]+,ou=[^,]+,ou=([^,]+),.*/\1/' | sed -r -e 's/cn=[^,]+,ou=[^,]+,ou=[^,]+,dc=.*/Servers/g')
+ ;;
+ cn:) HOSTNAME="${VALUE}";;
+ ipHostNumber:) IP="${VALUE}";;
+ macAddress:) MAC="${VALUE}";;
+ description:) DESC="${VALUE}";;
+ "")
+ if [ -n "$DESC" ]; then DESC="\"${DESC}\""; fi
+ echo "${OU},${HOSTNAME},${IP},${MAC},${DESC}"
+ ;;
+ esac
+ done
+fi
exit 0
diff --git a/bin/itzks-puppet-list-known-hosts b/bin/itzks-puppet-list-known-hosts
new file mode 100755
index 0000000..5ca8b8f
--- /dev/null
+++ b/bin/itzks-puppet-list-known-hosts
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Copyright (C) 2022 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ls /var/lib/puppet/ssl/ca/signed | cut -d "." -f1-2 | while read host;
+ do getent hosts $host
+done | grep 10.
diff --git a/debian/changelog b/debian/changelog
index 8fad344..3a07199 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,977 @@
+itzks-systems (2023.10.11.1) unstable; urgency=medium
+
+ * debian/control:
+ + Also add D: minder for diskless machines.
+ * sbin/itzks-prepare-reinstall:
+ + Add script to clean-up puppet client certificates before reinstalling.
+ Must be run on tjener or puppetserver.
+ * debian/itzks-systems-{mainserver,puppetserver}.install:
+ + Install new itzks-prepare-reinstall script into mainserver and
+ puppetserver bin:pkgs.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 11 Oct 2023 15:43:37 +0200
+
+itzks-systems (2023.09.27.2) unstable; urgency=medium
+
+ * debian/control:
+ + Add D: minder (workstation + terminalserver).
+
+ -- Mike Gabriel <sunweaver@debian.org> Wed, 27 Sep 2023 22:56:25 +0200
+
+itzks-systems (2023.09.27.1) unstable; urgency=medium
+
+ * Introduce itzks-systems-puppetserver. Out-source puppetserver into separate
+ machine, which is more ideal for upgrading Debian Edu + ITZkS sites to the
+ next Debian Edu version.
+ * sbin/itzks-check-ldap-group-not-in-correct-ou:
+ - Add script. Analyze LDAP tree and find primary groups that are in the
+ wrong OU.
+ * sbin/itzks-systems.do_preseed:
+ - White-space cleanup.
+ * sbin/itzks-puppet-autosign-new-host-certificates:
+ - Support newer puppetserver ca API for handling certificate signing requests.
+ * bin/itzks-puppet-list-known-hosts:
+ - Set x-bits.
+ * debian/control:
+ + Drop obsolete dependency on lsb-base.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 27 Sep 2023 22:14:35 +0200
+
+itzks-systems (2023.08.22.2) unstable; urgency=medium
+
+ * etc/ltsp/ltsp.conf.itzks-systems-disklserver.in:
+ + Fix IPXE_ variable names for Debian trixie (testing/unstable).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 22 Aug 2023 19:31:30 +0200
+
+itzks-systems (2023.08.22.1) unstable; urgency=medium
+
+ * etc/ltsp/ltsp.conf.itzks-systems-disklserver.in:
+ + Update LTSP image/chroot pretty names for Debian bookworm (stable)
+ and Debian trixie (testing/unstable).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 22 Aug 2023 18:45:20 +0200
+
+itzks-systems (2023.07.12.1) unstable; urgency=medium
+
+ * debian/control:
+ + openshot is now openshot-qt.
+ + Accept gtick instead of gnome-metronome for now.gnome-metronome didn't
+ make it into Debian 12.
+ + Drop tootle. Removed from Debian.
+ + webext-ublock-origin has been split up into two bin:pkgs now (one
+ for chromium, one for firefox).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 12 Jul 2023 13:21:52 +0200
+
+itzks-systems (2023.07.11.1) unstable; urgency=medium
+
+ * debian/template: Drop SGM, add FREIWAERTS.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 11 Jul 2023 14:18:43 +0200
+
+itzks-systems (2023.06.08.1) unstable; urgency=medium
+
+ * sbin/diskless-workstation-shell.b{ookworm,uster}:
+ + Typo fix in /tmp path variable.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 08 Jun 2023 12:03:23 +0200
+
+itzks-systems (2023.06.02.1) unstable; urgency=medium
+
+ * debian/control:
+ + Add qgis as D to diskless and workstation systems.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 02 Jun 2023 08:20:50 +0200
+
+itzks-systems (2023.04.14.2) unstable; urgency=medium
+
+ * debian/control:
+ + Make nfs4-acl-tools available on all NFS-client-like systems.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Apr 2023 23:08:59 +0200
+
+itzks-systems (2023.04.14.1) unstable; urgency=medium
+
+ * etc/default/epoptes-client.d/:
+ + Initial approach of setting a custom epoptes server.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Apr 2023 00:53:53 +0200
+
+itzks-systems (2023.03.24.2) unstable; urgency=medium
+
+ * debian/control: Disable pulling in epoptes GUI. This needs some thinking
+ (we need to skip the SSL cert setup during installation).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 24 Mar 2023 17:02:12 +0100
+
+itzks-systems (2023.03.24.1) unstable; urgency=medium
+
+ * debian/control: Add D (diskless, workstation, terminalserver):
+ python3-pygame.
+ * debian/control: Add D (diskless, workstation, terminalserver):
+ epoptes, epoptes-client.
+ * debian/control: Add D (diskless, workstation, terminalserver):
+ python3-altair, python3-notebook, python3-numpy, python3-pandas,
+ python3-requests, python3-streamz, python3-vega-datasets and python3-zipp.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 24 Mar 2023 13:59:13 +0100
+
+itzks-systems (2023.03.07.2) unstable; urgency=medium
+
+ * debian/control:
+ + Drop libreoffice-officebean from D (various bin:pkgs). Not available in
+ Debian 12 anymore.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Mar 2023 08:59:21 +0100
+
+itzks-systems (2023.03.07.1) unstable; urgency=medium
+
+ * sbin/e2guardian-update-shallalists:
+ + Rewrite and rename to sbin/e2guardian-update-blacklists. Obtain blacklists
+ from University of Toulouse now.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Mar 2023 08:29:16 +0100
+
+itzks-systems (2022.11.21.1) unstable; urgency=medium
+
+ * debian/control:
+ + Move debian-edu-fai from R: to D:, prefer debian-edu-fai+itzks, though.
+ * etc/squid/conf.d/itzks-systems-mainserver.conf:
+ + Prefer IPv4 addresses.
+ * debian/control:
+ + Fix dependency, squid3 is gone, long live squid.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 22 Nov 2022 00:04:28 +0100
+
+itzks-systems (2022.08.29.1) unstable; urgency=medium
+
+ * debian/templates:
+ + Add LW as new customer.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 29 Aug 2022 20:16:35 +0200
+
+itzks-systems (2022.08.19.1) unstable; urgency=medium
+
+ * debian/control:
+ + Add x2goclient and tigervnc-viewer to tablet systems.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 19 Aug 2022 12:48:31 +0200
+
+itzks-systems (2022.04.07.1) unstable; urgency=medium
+
+ * debian/control:
+ + Drop D on pinta finally, depend on kolourpaint instead.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 07 Apr 2022 00:02:18 +0200
+
+itzks-systems (2022.03.22.1) unstable; urgency=medium
+
+ * debian/control:
+ + Bump versioned D (mainserver): debian-edu-config (>= 2.11.56+deb11u4~).
+ * share/debian-edu-config/tools/gosa-*-host-itzks:
+ + The .keytab files have been moved to /var/lib/debian-edu/host-keytabs.
+ Set puppet permissions there, now.
+
+ -- Mike Gabriel <sunweaver@debian.org> Tue, 22 Mar 2022 10:04:13 +0100
+
+itzks-systems (2022.03.04.1) unstable; urgency=medium
+
+ * debian/control:
+ + Provide unison-gtk on roaming workstations and tablets.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 04 Mar 2022 11:16:16 +0100
+
+itzks-systems (2022.02.09.2) unstable; urgency=medium
+
+ * bin/itzks-puppet-list-known-hosts:
+ + Add itzks-puppet-list-known-hosts (for mainserver bin:pkg).
+ * debian/control:
+ + Move libsss-sudo from Breaks: to Depends: (tablet bin:pkg). Flaw in
+ previous upload.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 09 Feb 2022 17:28:26 +0100
+
+itzks-systems (2022.02.09.1) unstable; urgency=medium
+
+ * sbin/itzks-puppet-refresh-ssl:
+ + Start puppet after having it enabled.
+ * debian/control:
+ + Add D (tablet): libsss-sudo.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 09 Feb 2022 17:05:31 +0100
+
+itzks-systems (2022.02.08.4) unstable; urgency=medium
+
+ * debian/itzks-systems-roamingworkstation.install:
+ + Don't itzks-puppet-refresh-ssl in this bin:pkg.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 08 Feb 2022 14:42:33 +0100
+
+itzks-systems (2022.02.08.3) unstable; urgency=medium
+
+ * sbin/itzks-puppet-refresh-ssl:
+ + Fix/improve script.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 08 Feb 2022 14:36:45 +0100
+
+itzks-systems (2022.02.08.2) unstable; urgency=medium
+
+ * debian/*.install:
+ + Install itzks-puppet-refresh-ssl where appropriate.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 08 Feb 2022 13:20:17 +0100
+
+itzks-systems (2022.02.08.1) unstable; urgency=medium
+
+ * sbin/itzks-puppet-refresh-ssl:
+ + Add script for wiping and refresh puppet's SSL related files.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 08 Feb 2022 13:11:56 +0100
+
+itzks-systems (2022.02.07.1) unstable; urgency=medium
+
+ * sbin/itzks-update-disklserver-squashfs-images:
+ + Ignore errors when removing ltsp.conf and it is not (yet) present.
+ * etc/ltsp/ltsp.conf.itzks-systems-disklserver.in:
+ + Add CUPS_SERVER variable and set it to ipp.intern.
+ + Enable ssh service by default.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 07 Feb 2022 15:15:19 +0100
+
+itzks-systems (2022.02.04.1) unstable; urgency=medium
+
+ * diskless-workstation-shell*:
+ + Set explicit TMPDIR to /tmp (instead of being bothered by libpam-tmpdir).
+ * etc/ltsp/ltsp.conf.itzks-systems-disklserver.in:
+ + Omit pam_main function (fixes unwanted SSHFS home mounting over NFS
+ mounts on Debian 10 LTSP clients).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 04 Feb 2022 22:46:39 +0100
+
+itzks-systems (2022.02.01.1) unstable; urgency=medium
+
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation_smb-bookmarks:
+ + Use short hostname for SERVER variable, strip domain part.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 01 Feb 2022 13:27:29 +0100
+
+itzks-systems (2022.01.27.2) unstable; urgency=medium
+
+ * sbin/itzks-diskless-re-partition-dlw:
+ + Handle NVMe storage devices gracefully.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Jan 2022 23:07:42 +0100
+
+itzks-systems (2022.01.27.1) unstable; urgency=medium
+
+ * etc/ltsp/ltsp.conf.itzks-systems-disklserver.in:
+ + Set DEFAULT_IMAGE to Debian Edu 11 diskless workstation.
+ * sbin/itzks-diskless-re-partition-dlw:
+ + Add file. Provide script that turns any storage device into a DLW
+ swap+scratch storage.
+ * debian/itzks-systems-diskless.install:
+ + Ship itzks-diskless-re-partition-dlw in itzks-systems-diskless bin:pkg.
+ * debian/control: Add D (roamingworkstation):
+ + libsss-sudo.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Jan 2022 16:26:21 +0100
+
+itzks-systems (2022.01.26.1) unstable; urgency=medium
+
+ * LTSP: Support providing SSH access to diskless clients.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 26 Jan 2022 12:36:37 +0100
+
+itzks-systems (2022.01.20.1) unstable; urgency=medium
+
+ * sbin/itzks-update-disklserver-squashfs-images:
+ + Typo fix in priv_key_file name (d_rsa -> id_rsa).
+ + Make sure <chroot>/root.ssh/ folder exists before trying to copy something
+ inside.
+ * debian/control:
+ + Add various more applications to diskless, workstation and terminalserver
+ profile.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 20 Jan 2022 15:50:57 +0100
+
+itzks-systems (2022.01.14.2) unstable; urgency=medium
+
+ * sbin/itzks-update-disklserver-squashfs-images:
+ + Remove previous x2gothinclient background before copying/symlinking.
+ + White-space / indentation fix.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Jan 2022 18:24:38 +0100
+
+itzks-systems (2022.01.14.1) unstable; urgency=medium
+
+ * sbin/itzks-display-shell:
+ + Prepare for running bullseye displays.
+ * examples/disklserver/:
+ + Add X2Go TCE example configuration.
+ * sbin/itzks-update-disklserver-squashfs-images:
+ + Stop script run, if not run as root.
+ + Add magic to configure an X2Go TCE.
+ * itzks-puppet-autosign-new-host-certificates:
+ + Add script. Auto-sign puppet host CSRs if host is in LDAP.
+ * etc/cron.d/itzks-systems-mainserver:
+ + Run itzks-puppet-autosign-new-host-certificates as CRON job.
+ * debian/itzks-systems-mainserver.install:
+ + Install itzks-puppet-autosign-new-host-certificates and its CRON job into
+ mainserver bin:pkg.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Jan 2022 16:42:28 +0100
+
+itzks-systems (2022.01.11.2) unstable; urgency=medium
+
+ * debian/control:
+ + Re-enable bluefish and musescore(3) for bin:pkgs diskless, terminalserver
+ and workstation.
+ + Add D (terminalserver, diskless, workstation): remmina.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 11 Jan 2022 21:32:46 +0100
+
+itzks-systems (2022.01.11.1) unstable; urgency=medium
+
+ * etc/ltsp/ltsp.conf.itzks-systems-disklserver.in:
+ + Add more well-known LTSP chroots.
+ * sbin/itzks-update-disklserver-squashfs-images:
+ + Also re-create / update kernel images when running this script.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 11 Jan 2022 15:20:20 +0100
+
+itzks-systems (2022.01.07.1) unstable; urgency=medium
+
+ * debian/control:
+ + Fix bad paragraph separator in LONG_DESCRIPTION (roamingworkstation).
+ + Add D (roamingworkstation): sensible-utils (mainly to silence lintian on
+ this).
+ + Add D (mainserver): adduser.
+ + Resolve lintian's complaints about binary files being in non-conflicting
+ packages.
+ + Add R³ field and set it to 'no'.
+ + Bump Standards-Version: to 4.6.0. No changes needed.
+ * etc/ltsp/ltsp.conf.in:
+ + Fix commented-out [set-root-hash] section.
+ * etc/ltsp/:
+ + Keep /root/.ssh while cleaning up nearly everything else in /root before
+ SquashFS image creation.
+ + Rename (and move into our namespace): ltsp.conf.in ->
+ ltsp.conf.itzks-systems-disklserver.in.
+ * sbin/itzks-update-disklserver-squashfs-images:
+ + Use renamed ltsp.conf.itzks-systems-disklserver.in file.
+ + Deploy SSH key file(s) and authorized_keys file into DLW chroot.
+ * debian/itzks-systems-disklserver.install:
+ + Install etc/ltsp/ into disklserver bin:pkg.
+ * bin/itzks-filter-whitelist-sslmitm-ca:
+ + Drop file, not needed anymore. Update d/copyright accordingly.
+ * share/glib-2.0/schemas/90_itzks+mate.gschema.override:
+ + Drop settings already default in Debian Edu MATE. Mark all other
+ settings as FIXMEs (to be removed for the bookworm release cycle).
+ * bin/itzks-goodbye-user-session:
+ + Mark for removal when the bookworm release cycle starts.
+ + Actually, this script needs to stay around for a long time (or users'
+ dconf settings might need porting). Thus, wrapping around Debian Edu's
+ goodby-user-session.
+ * bin/itzks-hosts:
+ + Prefer Debian Edu's list-gosa-system script over our own implementation.
+ Mark code section for removal when the bookworm release cycle starts.
+ * examples/displayserver/:
+ + Drop example TFTP configuration for syslinux. This needs to be ported to
+ iPXE some time near in the future.
+ * sbin/itzks-switch-to-systemd-networkd:
+ + Drop file. We don't want systemd-networkd for now.
+ * sbin/itzks-switch-back-to-networkmanager:
+ + Drop file. We don't need switching back anymore, either.
+ * etc/chromium/policies/managed/itzks-systems-common.json:
+ + Drop file from itzks-systems-common. In Debian Edu, this is the default
+ recommended policy, so let's be fine with that. No need to enforce it.
+ * etc/chromium/policies/recommended/itzks-systems_search_provider.json:
+ + Recommend DuckDuckGo as default search provider on virt-man* and backup*
+ machines.
+ * etc/cron.d/itzks-systems-common:
+ + Improve (but not yet fix) how we discover if being inside a DLW or TC
+ chroot.
+ * etc/cron.daily/itzks-systems-workstation:
+ + Drop attempts to update flashplugin-nonfree. Flash is dead.
+ * etc/firefox-esr/itzks_caching.js:
+ + Drop file. This is now the default in Debian Edu's Firefox ESR config
+ tweaks.
+ * etc/standardskriver.cfg:
+ + Drop previous customer.
+ * debian/itzks-systems-{workstation,common}.maintscript:
+ + Fix old and wrong or missing versions.
+ * fetch-filter-cert:
+ + Remove init script. Not required anymore for Debian Edu 11 (which has a
+ rootCA now).
+ * debian/copyright:
+ + All-over copyright attributions update.
+ * lintian:
+ + source: Ignore absolute-symbolic-link-target-in-source for our symlinks
+ in /etc/skel/.
+ + itzks-systems-common: Rename lintian tag 'binary-without-manpage' to
+ 'no-manual-page'.
+ + itzks-systems-{tablet,roamingworkstation}: Silence unusal-interpeter and
+ package-contains-file-in-etc-skel. Both are intentional.
+ + itzks-systems-faiserver.lintian-overrides: Add overrides for complaints
+ about messing with the squid service from within the postinst script.
+ + itzks-systems-mainserver.lintian-overrides: Adjust to new unusual-
+ interpreter syntax/output.
+ * debian/itzks-systems-mainserver.postinst:
+ + Drop single quotes in adduser command to silence lintian.
+ * sbin/diskless-workstation-shell.bookworm:
+ + Add file. Update d/copyright.
+ * man/:
+ + Update symlinks for diskless-workstation-shell script.
+ * debian/itzks-systems-faiserver.postinst:
+ + Silence update-rc.d output (as complained about by lintian).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 07 Jan 2022 15:22:47 +0100
+
+itzks-systems (2022.01.05.1) unstable; urgency=medium
+
+ * share/debian-edu-config/tools/gosa-modify-host-itzks:
+ + Reduce delay before calling update-dlw-krb5-keytabs(-itzks).
+ * share/debian-edu-config/tools/update-dlw-krb5-keytabs-itzks:
+ + Fix detection if cmdline host is found in diskless-workstation-hosts NIS
+ netgroup.
+ + Write command-line options to syslog if any are given.
+ + Add FIXME. Report how many files/hosts have been updated.
+ * etc/ltsp/:
+ + Add good configuration for a Diskless Workstation Server's LTSP setup.
+ * sbin/itzks-update-disklserver-squashfs-images:
+ + Hack in a larger TMPDIR (and work around libpam-tmpdir not working for
+ root).
+ + Update ltsp.img and LTSP's iPXE boot menu on a regular basis, while we
+ are at it.
+ + Fail on errors.
+ + Create ltsp.conf from ltsp.conf.in template file and use disklserver's
+ root PW for root@<diskless-workstation>.
+ * examples/disklserver/:
+ + Drop folder and TFTP example config contained inside. Not needed anymore,
+ handled fully by LTSP now.
+ * examples/mainserver/:
+ + Drop example TFTP configuration. Not used anymore, at all.
+ * examples/backup/:
+ + Update dirvish configuration examples.
+ * debian/copyright:
+ + Update copyright attributions (examples/disklserver/ removed).
+ + Update copyright attributions (examples/mainserver/ removed).
+ + Update copyright attributions (examples/backup/ updated).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 05 Jan 2022 22:39:38 +0100
+
+itzks-systems (2022.01.04.2) unstable; urgency=medium
+
+ * debian/template:
+ + Fix school tag (SPG -> SGM).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jan 2022 11:30:53 +0100
+
+itzks-systems (2022.01.04.1) unstable; urgency=medium
+
+ * debian/control:
+ + Add D (faiserver): puppet.
+ + Add to D (common): screen, rsync.
+ + Add D (disklserver): ltsp.
+ + Add D (disklserver): squashfs-tools.
+ + Add D (disklserver): ipxe.
+ * share/debian-edu-config/tools/gosa-*-host-itzks:
+ + Ship wrappers for Debian Edu's GOsa² hooks gosa-create-host and
+ gosa-modify-host. We need to assure file permissions on the created
+ keytabs, so that puppet can read them.
+ * sbin/itzks-update-disklserver-squashfs-images:
+ - Rewrite script (proper variable syntax); adjust for next-generation LTSP.
+ * debian/itzks-systems-mainserver.install:
+ + Include our gosa hook script wrappers in mainserver bin:pkg.
+ * debian/itzks-systems-mainserver.{postinst,postrm}:
+ + Create 'debian-edu' system user for DLW keytab distribution.
+ * mainserver:
+ - Provide gosa-*-host hook script extension 'update-dlw-krb5-keytabs-itzks'
+ that collects Krb5 host keytabs of diskless workstation hosts in a
+ separate folder and makes those (theoretically, if used by the admin)
+ available to diskless workstations via SSH as unprivileged user.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jan 2022 09:15:39 +0100
+
+itzks-systems (2022.01.01.3) unstable; urgency=medium
+
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation_smb-bookmarks:
+ + Drop GTK-3 bookmark created by /etc/mklocaluser.d/20-debian-edu-config.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 01 Jan 2022 22:39:17 +0100
+
+itzks-systems (2022.01.01.2) unstable; urgency=medium
+
+ * etc/squid-deb-proxy/mirror-dstdomain.acl.d/90-itzks-systems-faiserver:
+ + Add 3rd partry APT repo servers we use to the squid-deb-proxy white-list.
+ * etc/mklocaluser.d/60-itzks-systems-tablet_add-to-local-groups:
+ + Add bluetooth to local user's default groups.
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation_smb-bookmarks:
+ + Rewrite entirely for Debian Edu LDAP without Samba Domain setup.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 01 Jan 2022 22:07:16 +0100
+
+itzks-systems (2022.01.01.1) unstable; urgency=medium
+
+ * HAPPY NEW YEAR!
+
+ * debian/itzks-systems-common.maintscript:
+ + Use today's version to assure removal of old config files.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 01 Jan 2022 14:19:00 +0100
+
+itzks-systems (2021.12.29.3) unstable; urgency=medium
+
+ * debian/itzks-systems-faiserver.postinst:
+ + Restart squid-deb-proxy during postinst.
+ + Inform about delay when we have to stop and disable squid.
+ + Always restart squid-deb-proxy, not only if squid was still enabled.
+ * debian/control:
+ + Add C (faiserver): libpam-tmpdir. Breaks fai-make-nfsroot.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 29 Dec 2021 23:15:36 +0100
+
+itzks-systems (2021.12.29.2) unstable; urgency=medium
+
+ * etc/squid-deb-proxy/mirror-dstdomain.acl.d/90-itzks-systems-faiserver:
+ + White-list FAI APT repo and ITZkS repo.
+ * debian/itzks-systems-faiserver.install:
+ + Ship squid-deb-proxy white-list in bin:pkg faiserver.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 29 Dec 2021 20:54:18 +0100
+
+itzks-systems (2021.12.29.1) unstable; urgency=medium
+
+ * debian/control:
+ + Add D (faiserver): squid-deb-proxy.
+ + Add to R (faiserver): debian-edu-fai.
+ * debian/itzks-systems-faiserver.postinst:
+ + Make sure that only squid-deb-proxy runs on a faiserver, not squid,
+ as well.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 29 Dec 2021 20:11:29 +0100
+
+itzks-systems (2021.12.28.1) unstable; urgency=medium
+
+ * debian/control:
+ + Drop ltsp-server as D from disklserver.
+ + Prefer libvirt-daemon over ganeti. LibVirt is the more common setup.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 28 Dec 2021 00:33:56 +0100
+
+itzks-systems (2021.12.27.1) unstable; urgency=medium
+
+ * debian/control:
+ + Add D (faiserver): ipxe, drop from D (faiserver): pxelinux, syslinux.
+ + Add to C (virtman): connman. Gets pulled in via lxde and breaks
+ internet connectivity.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 27 Dec 2021 18:26:38 +0100
+
+itzks-systems (2021.12.22.2) unstable; urgency=medium
+
+ * debian/control: Add C (faiserver) with isc-dhcp-server. Not wanted on
+ faiserver.intern.
+ * debian/copyright: Update copyright attributions.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Dec 2021 23:26:15 +0100
+
+itzks-systems (2021.12.22.1) unstable; urgency=medium
+
+ * README.disklserver: Correct typo fix.
+ * debian/*.links: Add the README.itzks-common to packages (as symlink) that
+ didn't have it, so far.
+ * debian/: Add bin:pkg itzks-systems-faiserver.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Dec 2021 23:05:32 +0100
+
+itzks-systems (2021.12.17.1) unstable; urgency=medium
+
+ * debian/itzks-systems-diskless.postinst:
+ + Drop calling update-gconf-defaults. This is a tool long gone.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 18 Dec 2021 10:53:29 +0100
+
+itzks-systems (2021.12.16.1) unstable; urgency=medium
+
+ * etc/network/if-up.d/: Drop itzks-autofs and itzks-cups.
+ * debian/itzks-systems-common.maintscript:
+ + Assure removal of itzks-autofs and itzks-cups.
+ * debian/templates:
+ + Add school short name 'SPG'.
+ * sbin/diskless-workstation-shell.*:
+ + Drop versions for jessie and stretch, add bullseye version.
+ * debian/rules:
+ + Add EOL at EOF.
+ * debian/copyright:
+ + Update copyright attributions.
+ * debian/control:
+ + Drop firmware-linux-nonfree from D (itzks-systems-backup). Already in R:
+ field.
+ + Switch to debhelper-compat notation and bump to DH compat level version
+ 13.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 17 Dec 2021 22:39:07 +0100
+
+itzks-systems (2021.11.03.1) unstable; urgency=medium
+
+ * debian/control:
+ + Add to D (and R) (mostly all systems): openboard (D) and
+ openboard-contrib (R).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 03 Nov 2021 13:36:18 +0100
+
+itzks-systems (2021.10.03.1) unstable; urgency=medium
+
+ * debian/control:
+ + Allow alternative D: tftpd-hpa.
+ + Drop xpdf everywhere.
+ + In D (mainserver): Prefer puppet-master-passenger over puppet-master
+ (and stop failing because pupetmaster does not exist anymore in Debian
+ bullseye.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 03 Oct 2021 10:35:48 +0200
+
+itzks-systems (2021.10.01.1) unstable; urgency=medium
+
+ * debian/control:
+ + Add B:/R: for ifupdown (on tablets).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 01 Oct 2021 14:49:15 +0200
+
+itzks-systems (2021.09.30.3) unstable; urgency=medium
+
+ * debian/control:
+ + Drop x2golxdebindings and x2gomatebindings from D: fields. Not in Debian.
+ + Add D (workstation): openshot-qt.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 30 Sep 2021 21:45:08 +0200
+
+itzks-systems (2021.09.30.2) unstable; urgency=medium
+
+ * APT: Disable sid package source now that bullseye is stable.
+ * debian/itzks-systems-common.postinst: Only set solar.theme as
+ plymouth theme if we have it.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 30 Sep 2021 18:45:47 +0200
+
+itzks-systems (2021.09.30.1) unstable; urgency=medium
+
+ * debian/template: Add 'customer' OvG.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 30 Sep 2021 18:36:01 +0200
+
+itzks-systems (2021.08.13.1) unstable; urgency=medium
+
+ * debian/control:
+ + Add to R (workstation): firmware-sof-signed.
+ * etc/modprobe.d/itzks-systems-common_dsp-fix.conf:
+ + Disable the snd_intel DSP driver again. The SOF firmware is now available
+ in Debian 11.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 13 Aug 2021 13:16:03 +0200
+
+itzks-systems (2021.05.20.1) unstable; urgency=medium
+
+ * debian/control:
+ + Drop D (all bin:pkgs): pkg-mozilla-archive-keyring. Package not available
+ anymore.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 20 May 2021 14:45:20 +0200
+
+itzks-systems (2020.12.16.1) unstable; urgency=medium
+
+ * debian/templates:
+ + Drop previous customers that now have migrated elsewhere.
+ * debian/itzks-systems-common.postinst:
+ + Reset 'desktop-background' to default alternative (i.e. bg image in the
+ active desktop-theme), if not so.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 16 Dec 2020 16:12:30 +0100
+
+itzks-systems (2020.12.15.4) unstable; urgency=medium
+
+ * debian/itzks-systems-common.postinst:
+ + Fix artwork and plymouth theme consolidation from previous package
+ version.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 15 Dec 2020 11:48:43 +0100
+
+itzks-systems (2020.12.15.3) unstable; urgency=medium
+
+ * debian/itzks-systems-common.postinst:
+ + Fix Edu artwork and plymouth theme for ITZkS systems whenever we
+ configure itzks-systems-common.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 15 Dec 2020 11:34:39 +0100
+
+itzks-systems (2020.12.15.2) unstable; urgency=medium
+
+ * debian/control:
+ + Assure that the spacefun Edu theme is the only available theme on the
+ system.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 15 Dec 2020 10:18:44 +0100
+
+itzks-systems (2020.12.15.1) unstable; urgency=medium
+
+ * debian/itzks-systems-common.maintscript:
+ + Fix version for dsp-fix.conf file remaming.
+ * share/glib-2.0/schemas/90_itzks+mate.gschema.override:
+ + Set desktop-base's background as default background image.
+ (This needs to be fixed in Debian, so it is an interim
+ workaround).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 15 Dec 2020 08:08:11 +0100
+
+itzks-systems (2020.12.14.2) unstable; urgency=medium
+
+ * etc/modprobe.d/: Rename dsp-fix.conf file and prepend package namespace.
+ * debian/itzks-systems-common.install:
+ + Adapt to renamed modprobe conf file.
+ * debian/itzks-systems-common.maintscript:
+ + Move /etc/modprobe.d/dsp-fix.conf to itzks-systems-common_dsp-fix.conf.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 14 Dec 2020 18:56:29 +0100
+
+itzks-systems (2020.12.14.1) unstable; urgency=medium
+
+ * etc/modprobe.d/: Add dsp-fix.conf. Disable SOF driver firmware usage.
+ * debian/itzks-systems-common.install: Install etc/modprobe.d/dsp-fix.conf
+ into bin:pkg itzks-common.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 14 Dec 2020 17:27:20 +0100
+
+itzks-systems (2020.12.13.1) unstable; urgency=medium
+
+ * etc/network/if-up.d/itzks-autofs:
+ + Only use on Workstations, and not on lo device.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 14 Dec 2020 13:28:21 +0100
+
+itzks-systems (2020.12.10.1) unstable; urgency=medium
+
+ * debian/control:
+ + Add D (mainserver, workstation, terminalserver and diskless): pavucontrol.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 10 Dec 2020 23:18:49 +0100
+
+itzks-systems (2020.10.06.2) unstable; urgency=medium
+
+ * debian/control:
+ + Move sagemath and xpdf to Recommends: field. Currently unavailable in
+ Debian testing.
+ + Move non-free packages to Recommends: fields.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 06 Oct 2020 20:34:15 +0200
+
+itzks-systems (2020.10.06.1) unstable; urgency=medium
+
+ * debian/control:
+ + Drop from D: libreoffice-style-tango. Not available with LibreOffice 7.x
+ anymore.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 06 Oct 2020 15:10:58 +0200
+
+itzks-systems (2020.07.09.1) unstable; urgency=medium
+
+ * debian/control:
+ + Comment out musescore, currently not in Debian testing.
+ + Comment out openboard, needs to be uploaded to Debian.
+ + Comment out pinta, currently not in Debian testing.
+ + Comment out bluefish, currently not in Debian testing.
+ + Drop mate-icon-theme-faenza, deprecated upstream.
+ + Switch from emacs24 to emacs.
+ + Drop python-matplotlib. Python2 is dead.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 09 Jul 2020 14:56:43 +0200
+
+itzks-systems (2020.06.24.2) unstable; urgency=medium
+
+ * etc/mklocaluser.d/60-itzks-systems-tablet_add-to-local-groups:
+ + Fix copy+paste flaw; we don't need user account creation code.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 24 Jun 2020 15:45:50 +0200
+
+itzks-systems (2020.06.24.1) unstable; urgency=medium
+
+ * itzks-systems-tablet:
+ + Add LDAP-derived local user to system groups on initial login.
+ * debian/itzks-systems-tablet.install:
+ + Add missing slash at EOL, at line break at EOF.
+ * debian/control:
+ + Drop xterm from B:/R: (tablet). Leads to removal of itzks-systems-tablet
+ during FAI installation.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 24 Jun 2020 15:36:50 +0200
+
+itzks-systems (2020.04.17.1) unstable; urgency=medium
+
+ * etc/apt/sources.list.d/*.list:
+ + Adapt APT URLs for Debian bullseye. Drop deb-multimedia inclusion.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 17 Apr 2020 11:00:48 +0200
+
+itzks-systems (2020.04.08.1) unstable; urgency=medium
+
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox:
+ + Fix missing white-spaces in square brackets of if clauses.
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation_disable-welcome-page:
+ + Use -n option for checking if a string is of non-zero length.
+ + Fix welcomeurl not being set if hostname is not www.intern.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Apr 2020 13:24:18 +0200
+
+itzks-systems (2020.04.04.1) unstable; urgency=medium
+
+ * etc/chromium/policies/managed/itzks-systems-common.json:
+ + Enforce chromium to using DuckDuckGo as default search provider.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 04 Apr 2020 00:36:54 +0200
+
+itzks-systems (2020.04.03.3) unstable; urgency=medium
+
+ * debian/control:
+ + Try getting rid of imagemagick*.desktop file and
+ debian-(u)xterm.desktop file.
+ * debian/itzks-systems-tablet.install:
+ + Provide 90_itzks+gnome-tablet.gschema.override adapting GNOME's
+ favorite-apps for ITZkS.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 03 Apr 2020 22:25:46 +0200
+
+itzks-systems (2020.04.03.2) unstable; urgency=medium
+
+ * debian/control:
+ + Add D (tablet): chromium-l10n, mc, tree, vim.
+ + Prohibit installation of Firefox on tablets.
+ * debian/itzks-systems-tablet.install:
+ + No .desktop files. GNOME doesn't support them anyway.
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox:
+ + Fix script when running on Debian Edu bullseye.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 03 Apr 2020 22:08:02 +0200
+
+itzks-systems (2020.04.03.1) unstable; urgency=medium
+
+ * debian/{control,*.install}:
+ + Add new bin:pkg itzks-systems-tablet.
+ * debian/control:
+ + Drop roamingworkstion from B:/R:, having workstation bin:pkg there is
+ enough.
+ + Fix SYNOPSIS and LONG_DESCRIPTION texts of workstation and
+ roamingworkstation bin:pkgs.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 03 Apr 2020 10:38:14 +0200
+
+itzks-systems (2020.02.27.1) unstable; urgency=medium
+
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation_disable-welcome-page:
+ + White-space cleanup.
+ + Only do LANGCODE i18n page lookups, if homepage points to TJENER. This fixes
+ freezes if default homepage URL points to an external site.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Feb 2020 08:22:46 +0100
+
+itzks-systems (2020.02.26.1) unstable; urgency=medium
+
+ * debian/control:
+ + Downgrade arctica-greeter-guest-session from R: to S:.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 26 Feb 2020 13:04:07 +0100
+
+itzks-systems (2020.02.21.2) unstable; urgency=medium
+
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation_gvfs-symlink:
+ + Put symlink into /home/mike to ease finding XDG_RUNTIME_DIR/gvfs.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 21 Feb 2020 16:33:38 +0100
+
+itzks-systems (2020.02.21.1) unstable; urgency=medium
+
+ * debian/control:
+ + Downgrade arctica-greeter-guest-session from D: to R:.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 21 Feb 2020 10:57:49 +0100
+
+itzks-systems (2020.02.19.3) unstable; urgency=medium
+
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation-disable-welcome-page:
+ + Add script that disables Debian Edu's welcome page on Roaming
+ Workstations.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 19 Feb 2020 16:52:47 +0100
+
+itzks-systems (2020.02.19.2) unstable; urgency=medium
+
+ * etc/skel/.debian-edu/welcome-page-shown:
+ + Add flag file to suppress browser startup on first login on new accounts
+ or new roaming account.
+ * debian/itzks-systems-roamingworkstation.install:
+ + Add welcome-page-shown flag file to /etc/skel of Roaming Workstations.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 19 Feb 2020 16:34:21 +0100
+
+itzks-systems (2020.02.19.1) unstable; urgency=medium
+
+ * debian/control:
+ + Add B-D (roamingworkstation): gvfs-fuse.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 19 Feb 2020 15:12:45 +0100
+
+itzks-systems (2020.02.12.1) unstable; urgency=medium
+
+ * debian/itzks-systems-workstation.postinst:
+ + Avoid script failure on non-existing directories.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 12 Feb 2020 15:31:08 +0100
+
+itzks-systems (2020.02.10.3) unstable; urgency=medium
+
+ * debian/itzks-systems-workstation.install:
+ + Use correct option with rmdir.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 10 Feb 2020 22:14:22 +0100
+
+itzks-systems (2020.02.10.2) unstable; urgency=medium
+
+ * debian/itzks-systems-workstation.install:
+ + Drop ITZkS specific /etc/skel again.
+ * debian/itzks-systems-workstation.{postinst,maintscript}:
+ + Clean-up mess of having /etc/skel in workstation bin:pkg for a while.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 10 Feb 2020 20:39:21 +0100
+
+itzks-systems (2020.02.10.1) unstable; urgency=medium
+
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation_smb-bookmarks:
+ + Obtain SMB domain from user object and domain object in LDAP; various tests.
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox:
+ + Make sure, the default Debian Edu profile folder gets used.
+ * debian/itzks-systems-roamingworkstation.install:
+ + Ship a reduced version of ITZkS's home dir skeleton.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 10 Feb 2020 13:46:37 +0100
+
+itzks-systems (2020.02.08.1) unstable; urgency=medium
+
+ * New bin:pkg: itzks-systems-roamingworkstation.
+ * etc/mklocaluser.d/60-itzks-systems-roamingworkstation_smb-bookmarks:
+ + Add CIFS/SMB home share to 'Places' area for GTK-3 based file browsers.
+ * etc/skel/**/pkcs11.txt:
+ + Drop i386 loading path of p11-kit-trust.so. Breaks functionality on amd64.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 08 Feb 2020 12:10:20 +0100
+
+itzks-systems (2020.01.24.1) unstable; urgency=medium
+
+ * debian/itzks-systems-workstation.install:
+ + Ship ITZkS's /etc/skel on workstation hosts, too. Required for roaming
+ workstations.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 24 Jan 2020 20:20:45 +0100
+
itzks-systems (2019.11.22.1) unstable; urgency=medium
* itzks-reset-userprofile:
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 2732f2d..d6c5858 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,12 @@ Section: misc
Priority: optional
Maintainer: ITZkS Packaging <admins@lists.it-zukunft-schule.de>
Uploaders: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Build-Depends: debhelper (>= 9), po-debconf
+Build-Depends: debhelper-compat (= 13), po-debconf
Homepage: http://wiki.it-zukunft-schule.de
+Rules-Requires-Root: no
Vcs-Git: https://code.it-zukunft-schule.de/cgit/itzks-systems/
Vcs-Browser: https://code.it-zukunft-schule.de/cgit/itzks-systems/
-Standards-Version: 4.1.4
+Standards-Version: 4.6.0
Package: itzks-systems-common
Architecture: all
@@ -18,6 +19,12 @@ Replaces:
itzks-systems-workstation (<< 2018.01.03.1~),
itzks-systems-terminalserver (<< 2018.01.03.1~),
itzks-systems-diskless (<< 2018.01.03.1~),
+ debian-edu-artwork-joy,
+ debian-edu-artwork-lines,
+ debian-edu-artwork-softwaves,
+ debian-edu-artwork-buster,
+ debian-edu-artwork-futureprototype,
+ debian-edu-artwork-homeworld,
Breaks:
itzks-systems-config,
itzks-debian-mate-default-settings,
@@ -25,9 +32,19 @@ Breaks:
itzks-systems-workstation (<< 2018.01.03.1~),
itzks-systems-terminalserver (<< 2018.01.03.1~),
itzks-systems-diskless (<< 2018.01.03.1~),
+ debian-edu-artwork-joy,
+ debian-edu-artwork-lines,
+ debian-edu-artwork-softwaves,
+ debian-edu-artwork-buster,
+ debian-edu-artwork-futureprototype,
+ debian-edu-artwork-homeworld,
Depends:
${misc:Depends},
+ debian-edu-artwork-spacefun,
+ dnsutils,
iptables,
+ rsync,
+ screen,
standardskriver,
Description: Configuration for ITZkS Systems
Set of configuration parameters and common files
@@ -43,7 +60,10 @@ Replaces:
itzks-systems-disklserver,
itzks-systems-display,
itzks-systems-displayserver,
+ itzks-systems-faiserver,
itzks-systems-filter,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
@@ -53,7 +73,10 @@ Breaks:
itzks-systems-disklserver,
itzks-systems-display,
itzks-systems-displayserver,
+ itzks-systems-faiserver,
itzks-systems-filter,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
@@ -65,7 +88,6 @@ Depends:
etckeeper,
firefox-esr,
firmware-linux-free,
- firmware-linux-nonfree,
gdisk,
git,
htop,
@@ -80,7 +102,6 @@ Depends:
ocsinventory-agent,
odt2txt,
openvpn,
- pkg-mozilla-archive-keyring,
postfix,
python3,
python3-dateutil,
@@ -94,6 +115,8 @@ Depends:
xfsprogs,
zip,
${misc:Depends},
+Recommends:
+ firmware-linux-nonfree,
Conflicts:
debian-edu-artwork-joy,
exim4,
@@ -120,6 +143,8 @@ Replaces:
itzks-systems-displayserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
@@ -133,20 +158,27 @@ Breaks:
itzks-systems-displayserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
xul-ext-adblock-plus,
logisim,
Depends:
+ acpid,
+ ardour,
arduino,
arj,
arctica-greeter,
arctica-greeter-theme-debian,
atril,
audacity,
+ avogadro,
+ blender,
bluefish,
bzip2,
+ caja-nextcloud,
catdvi,
chromium,
cups,
@@ -156,30 +188,34 @@ Depends:
debian-edu-config (>= 1.929+deb9u1~),
debian-mate-default-settings,
desktop-base,
- emacs24,
+ emacs,
engrampa,
eom,
+# epoptes,
+ epoptes-client,
etckeeper,
ffmpegthumbnailer,
filezilla,
firefox-esr,
firefox-esr-l10n-de,
firmware-linux-free,
- firmware-linux-nonfree,
- firmware-realtek,
fonts-linex | ttf-linex,
fonts-sil-doulos | ttf-sil-doulos,
+ freecad,
+ freeplane,
galculator,
geany,
- geogebra5 | geogebra44,
+ geogebra | geogebra5 | geogebra44,
git,
gnome-colors-common,
+ gnome-metronome | gtick,
grdesktop,
gstreamer1.0-libav,
gstreamer1.0-plugins-bad,
gstreamer1.0-plugins-good,
gstreamer1.0-plugins-ugly,
gv,
+ handbrake,
htop,
thunderbird,
idle3,
@@ -188,9 +224,12 @@ Depends:
itzks-systems-common (>= ${source:Version}),
kdenlive,
kile,
+ kolourpaint,
+ krita,
ktouch,
kturtle,
lazarus,
+ librecad,
libreoffice,
libreoffice-base,
libreoffice-base-core,
@@ -215,19 +254,17 @@ Depends:
libreoffice-l10n-pt-br,
libreoffice-l10n-sv,
libreoffice-math,
- libreoffice-officebean,
libreoffice-report-builder-bin,
- libreoffice-style-tango,
libreoffice-writer,
libwacom-bin,
links,
linuxlogo,
- lsb-base,
+ marble-maps,
+ marble-qt,
mate-applets,
mate-applet-brisk-menu,
mate-desktop-environment,
mate-desktop-environment-extras,
- mate-icon-theme-faenza,
mate-media,
mate-notification-daemon,
mate-power-manager,
@@ -239,27 +276,43 @@ Depends:
mc,
memtest86,
memtest86+,
- musescore,
+ minder,
+ musescore3,
+ nfs4-acl-tools,
nload,
nmap,
nted,
+ obs-studio,
ocsinventory-agent,
odt2txt,
+ okular,
openboard,
+ openshot | openshot-qt,
+ pavucontrol,
+ pdfsam,
+ pdfarranger,
pidgin,
- pinta,
- pkg-mozilla-archive-keyring,
pluma,
pyhoca-gui,
- python-matplotlib,
+ python3-altair,
python3-matplotlib,
+ python3-notebook,
+ python3-numpy,
+ python3-pandas,
+ python3-pygame,
+ python3-requests,
+ python3-streamz,
python3-tk,
+ python3-vega-datasets,
+ python3-zipp,
+ qgis,
rawtherapee,
+ remmina,
reportbug,
- sagemath,
scratch,
sensible-utils,
shutdown-at-night (>= 0.19~),
+ simplescreenrecorder,
sl,
sm,
sqlite3,
@@ -274,20 +327,24 @@ Depends:
unzip,
vlc,
webcamoid,
- webext-ublock-origin,
+ webext-ublock-origin-firefox | webext-ublock-origin,
+ webext-ublock-origin-chromium | webext-ublock-origin,
x11-apps,
itzks-keyring (>= 2018.01.27~) | x2go-keyring,
x2goclient,
x2godesktopsharing,
xarchiver,
xournal,
- xpdf,
yakuake,
zip,
${misc:Depends},
Recommends:
+ firmware-linux-nonfree,
+ firmware-realtek,
flashplayer-chromium,
flashplayer-mozilla,
+ openboard-contrib,
+ sagemath,
Conflicts:
browser-plugin-gnash,
browser-plugin-freshplayer-pepperflash,
@@ -325,7 +382,6 @@ Conflicts:
openoffice.org-l10n-pt-br,
openoffice.org-l10n-sv,
openoffice.org-math,
- openoffice.org-officebean,
openoffice.org-report-builder-bin,
openoffice.org-style-galaxy,
openoffice.org-style-tango,
@@ -350,6 +406,8 @@ Replaces:
itzks-systems-displayserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
@@ -361,12 +419,14 @@ Breaks:
itzks-systems-displayserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
Depends:
arj,
- tftpd | atftpd,
+ tftpd-hpa | tftpd | atftpd,
bzip2,
itzks-keyring (>= 2018.01.29~) | deb-multimedia-keyring,
debian-edu-artwork-spacefun,
@@ -375,30 +435,31 @@ Depends:
firefox-esr,
gdisk,
htop,
+ ipxe,
itzks-keyring,
itzks-systems-common (>= ${source:Version}),
links,
linuxlogo,
- ltsp-server,
+ ltsp,
mc,
memtest86,
memtest86+,
nfs-kernel-server,
+ nfs4-acl-tools,
nload,
nmap,
ocsinventory-agent,
openvpn,
- pkg-mozilla-archive-keyring,
puppet,
pxelinux,
reportbug,
shutdown-at-night (>= 0.19~),
+ squashfs-tools,
syslinux,
sysstat,
tree,
unzip,
vim,
- xpdf,
zip,
${misc:Depends},
Description: Profiling ITZkS-DisklServer systems
@@ -420,8 +481,10 @@ Replaces:
itzks-systems-diskless,
itzks-systems-disklserver,
itzks-systems-displayserver,
+ itzks-systems-faiserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
@@ -430,8 +493,10 @@ Breaks:
itzks-systems-diskless,
itzks-systems-disklserver,
itzks-systems-displayserver,
+ itzks-systems-faiserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
@@ -444,8 +509,6 @@ Depends:
desktop-base,
etckeeper,
firmware-linux-free,
- firmware-linux-nonfree,
- firmware-realtek,
git,
htop,
impressive-display,
@@ -470,6 +533,9 @@ Depends:
unzip,
zip,
${misc:Depends},
+Recommends:
+ firmware-linux-nonfree,
+ firmware-realtek,
Conflicts: debian-edu-artwork-joy, debian-edu-artwork-lines, ldm
Description: Profiling for ITZkS Diskless Displays (meta package)
Install this package to pull in all dependencies required on
@@ -487,8 +553,10 @@ Replaces:
itzks-systems-diskless,
itzks-systems-disklserver,
itzks-systems-display,
+ itzks-systems-faiserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
@@ -497,14 +565,16 @@ Breaks:
itzks-systems-diskless,
itzks-systems-disklserver,
itzks-systems-display,
+ itzks-systems-faiserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
Depends:
arj,
- tftpd | atftpd,
+ tftpd-hpa | tftpd | atftpd,
bzip2,
debian-edu-artwork-spacefun,
dnsutils,
@@ -519,6 +589,7 @@ Depends:
memtest86+,
nbd-server,
nfs-kernel-server,
+ nfs4-acl-tools,
nload,
nmap,
ocsinventory-agent,
@@ -531,7 +602,6 @@ Depends:
tree,
unzip,
vim,
- xpdf,
zip,
${misc:Depends},
Description: Profiling ITZkS-DisplayServer systems
@@ -541,6 +611,77 @@ Description: Profiling ITZkS-DisplayServer systems
ITZkS (IT-Zukunft Schule) is a Northern German project and based
on Debian Edu / Skolelinux.
+Package: itzks-systems-faiserver
+Architecture: all
+Replaces:
+ debian-edu-artwork-joy,
+ gnu-fdisk,
+ itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
+ itzks-systems-displayserver,
+ itzks-systems-filter,
+ itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-terminalserver,
+ itzks-systems-virtman,
+ itzks-systems-workstation,
+Breaks:
+ itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
+ itzks-systems-displayserver,
+ itzks-systems-filter,
+ itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-terminalserver,
+ itzks-systems-virtman,
+ itzks-systems-workstation,
+Depends:
+ arj,
+ tftpd-hpa | tftpd | atftpd,
+ bzip2,
+ debian-edu-artwork-spacefun,
+ debian-edu-fai+itzks | debian-edu-fai,
+ dnsutils,
+ fai-server,
+ gdisk,
+ htop,
+ ipxe,
+ itzks-keyring,
+ itzks-systems-common (>= ${source:Version}),
+ links,
+ linuxlogo,
+ mc,
+ memtest86,
+ memtest86+,
+ nfs4-acl-tools,
+ nload,
+ nmap,
+ ocsinventory-agent,
+ openvpn,
+ puppet,
+ reportbug,
+ shutdown-at-night (>= 0.19~),
+ squid-deb-proxy,
+ sysstat,
+ tree,
+ unzip,
+ vim,
+ zip,
+ ${misc:Depends},
+Conflicts:
+ isc-dhcp-server,
+ libpam-tmpdir,
+Description: Profiling ITZkS-FAIServer systems
+ Install this package to pull in all dependencies required on
+ ITZkS Servers providing a FAI deployment server.
+ .
+ ITZkS (IT-Zukunft Schule) is a Northern German project and based
+ on Debian Edu / Skolelinux.
+
Package: itzks-systems-filter
Architecture: all
Replaces:
@@ -551,7 +692,10 @@ Replaces:
itzks-systems-disklserver,
itzks-systems-display,
itzks-systems-displayserver,
+ itzks-systems-faiserver,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
@@ -561,7 +705,10 @@ Breaks:
itzks-systems-disklserver,
itzks-systems-display,
itzks-systems-displayserver,
+ itzks-systems-faiserver,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
itzks-systems-workstation,
@@ -589,14 +736,13 @@ Depends:
puppet,
reportbug,
shutdown-at-night (>= 0.19~),
- squid3,
+ squid,
squidclient,
syslinux,
sysstat,
tree,
unzip,
vim,
- xpdf,
zip,
${misc:Depends},
Description: Profiling ITZkS-Filter systems
@@ -618,6 +764,9 @@ Replaces:
itzks-systems-display,
itzks-systems-displayserver,
itzks-systems-filter,
+ itzks-systems-puppetserver,
+ itzks-systems-roamingworkstation,
+ itzks-systems-tablet,
itzks-systems-virtman,
itzks-systems-workstation,
xul-ext-adblock-plus,
@@ -629,20 +778,24 @@ Breaks:
itzks-systems-display,
itzks-systems-displayserver,
itzks-systems-filter,
+ itzks-systems-puppetserver,
+ itzks-systems-roamingworkstation,
+ itzks-systems-tablet,
itzks-systems-virtman,
itzks-systems-workstation,
xul-ext-adblock-plus,
Depends:
acl,
+ adduser,
apt-file,
arj,
arpwatch,
- tftpd | atftpd,
+ tftpd-hpa | tftpd | atftpd,
bzip2,
chromium,
itzks-keyring (>= 2018.01.29~) | deb-multimedia-keyring,
debian-edu-artwork-spacefun,
- debian-edu-config (>= 1.929+deb9u1~),
+ debian-edu-config (>= 2.11.56+deb11u4~),
debian-mate-default-settings,
dnsutils,
engrampa,
@@ -656,24 +809,24 @@ Depends:
libmonitoring-plugin-perl,
links,
linuxlogo,
- lsb-base,
mate-applet-brisk-menu,
mate-desktop-environment-core,
mc,
memtest86,
memtest86+,
+ nfs4-acl-tools,
nload,
nmap,
ocsinventory-agent,
openvpn,
+ pavucontrol,
p11-kit-modules,
- pkg-mozilla-archive-keyring,
puppet,
puppet-module-puppetlabs-apt,
puppet-module-puppetlabs-concat,
puppet-module-puppetlabs-inifile,
puppet-module-puppetlabs-stdlib,
- puppetmaster,
+ puppet-master-passenger | puppet-master | puppetmaster,
pxelinux,
reportbug,
sensible-utils,
@@ -684,9 +837,9 @@ Depends:
tree,
unzip,
vim,
- webext-ublock-origin,
+ webext-ublock-origin-firefox | webext-ublock-origin,
+ webext-ublock-origin-chromium | webext-ublock-origin,
xarchiver,
- xpdf,
zip,
${misc:Depends},
Description: Profiling for ITZkS-MainServer Systems
@@ -699,6 +852,74 @@ Description: Profiling for ITZkS-MainServer Systems
ITZkS (IT-Zukunft Schule) is a Northern German project and based
on Debian Edu / Skolelinux.
+Package: itzks-systems-puppetserver
+Architecture: all
+Replaces:
+ debian-edu-artwork-joy,
+ gnu-fdisk,
+ itzks-systems-mainserver,
+ itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
+ itzks-systems-displayserver,
+ itzks-systems-filter,
+ itzks-systems-roamingworkstation,
+ itzks-systems-tablet,
+ itzks-systems-virtman,
+ itzks-systems-workstation,
+ xul-ext-adblock-plus,
+Breaks:
+ itzks-systems-mainserver,
+ itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
+ itzks-systems-displayserver,
+ itzks-systems-filter,
+ itzks-systems-roamingworkstation,
+ itzks-systems-tablet,
+ itzks-systems-virtman,
+ itzks-systems-workstation,
+ xul-ext-adblock-plus,
+Depends:
+ apt-file,
+ debian-edu-artwork-spacefun,
+ debian-edu-config (>= 2.11.56+deb11u4~),
+ dnsutils,
+ gdisk,
+ htop,
+ itzks-keyring,
+ itzks-systems-common (>= ${source:Version}),
+ libmonitoring-plugin-perl,
+ links,
+ linuxlogo,
+ mc,
+ nload,
+ nmap,
+ ocsinventory-agent,
+ openvpn,
+ puppet,
+ puppet-module-puppetlabs-apt,
+ puppet-module-puppetlabs-concat,
+ puppet-module-puppetlabs-inifile,
+ puppet-module-puppetlabs-stdlib,
+ puppetserver | puppet-master-passenger | puppet-master | puppetmaster,
+ shutdown-at-night (>= 0.19~),
+ sysstat,
+ tree,
+ unzip,
+ vim,
+ zip,
+ ${misc:Depends},
+Description: Profiling for ITZkS-PuppetServer Systems
+ Install this package to pull in recommended dependencies
+ on a Debian Edu minimal server used as puppet configuration
+ management server.
+ .
+ ITZkS (IT-Zukunft Schule) is a Northern German project and based
+ on Debian Edu / Skolelinux.
+
Package: itzks-systems-smartboard
Architecture: all
Depends: schroot, ${misc:Depends}
@@ -729,6 +950,8 @@ Replaces:
itzks-systems-display,
itzks-systems-displayserver,
itzks-systems-filter,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-virtman,
itzks-systems-workstation,
xul-ext-adblock-plus,
@@ -741,6 +964,8 @@ Breaks:
itzks-systems-display,
itzks-systems-displayserver,
itzks-systems-filter,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-virtman,
itzks-systems-workstation,
xul-ext-adblock-plus,
@@ -752,8 +977,11 @@ Depends:
arj,
atril,
audacity,
+ avogadro,
+ blender,
bluefish,
bzip2,
+ caja-nextcloud,
catdvi,
chromium,
cups,
@@ -763,25 +991,28 @@ Depends:
debian-edu-config (>= 1.929+deb9u1~),
debian-mate-default-settings,
desktop-base,
- emacs24,
+ emacs,
engrampa,
eom,
+# epoptes,
+ epoptes-client,
etckeeper,
ffmpegthumbnailer,
filezilla,
firefox-esr,
firefox-esr-l10n-de,
firmware-linux-free,
- firmware-linux-nonfree,
- firmware-realtek,
fonts-linex | ttf-linex,
fonts-sil-doulos | ttf-sil-doulos,
+ freecad,
+ freeplane,
galculator,
gdisk,
geany,
- geogebra5 | geogebra44,
+ geogebra | geogebra5 | geogebra44,
git,
gnome-colors-common,
+ gnome-metronome | gtick,
grdesktop,
gv,
htop,
@@ -791,9 +1022,12 @@ Depends:
itzks-keyring,
itzks-systems-common (>= ${source:Version}),
kile,
+ kolourpaint,
+ krita,
kturtle,
ktouch,
lazarus,
+ librecad,
libreoffice,
libreoffice-base,
libreoffice-base-core,
@@ -818,18 +1052,16 @@ Depends:
libreoffice-l10n-pt-br,
libreoffice-l10n-sv,
libreoffice-math,
- libreoffice-officebean,
libreoffice-report-builder-bin,
- libreoffice-style-tango,
libreoffice-writer,
links,
linuxlogo,
- lsb-base,
+ marble-maps,
+ marble-qt,
mate-applets,
mate-applet-brisk-menu,
mate-desktop-environment,
mate-desktop-environment-extras,
- mate-icon-theme-faenza,
mate-media,
mate-notification-daemon,
mate-power-manager,
@@ -839,30 +1071,43 @@ Depends:
mate-themes,
mate-utils,
mc,
- musescore,
+ minder,
+ musescore3,
+ nfs4-acl-tools,
nload,
nmap,
nted,
ocsinventory-agent,
odt2txt,
+ okular,
openvpn,
openboard,
+ pavucontrol,
p11-kit-modules,
+ pdfsam,
+ pdfarranger,
pidgin,
- pinta,
- pkg-mozilla-archive-keyring,
pluma,
puppet,
pyhoca-gui,
- python-matplotlib,
+ python3-altair,
python3-matplotlib,
+ python3-notebook,
+ python3-numpy,
+ python3-pandas,
+ python3-pygame,
+ python3-requests,
+ python3-streamz,
python3-tk,
+ python3-vega-datasets,
+ python3-zipp,
rawtherapee,
+ remmina,
reportbug,
- sagemath,
scratch,
sensible-utils,
shutdown-at-night (>= 0.19~),
+ simplescreenrecorder,
sl,
sm,
sqlite3,
@@ -875,26 +1120,28 @@ Depends:
tree,
ttf-mscorefonts-installer,
unzip,
- webext-ublock-origin,
+ webext-ublock-origin-firefox | webext-ublock-origin,
+ webext-ublock-origin-chromium | webext-ublock-origin,
x11-apps,
itzks-keyring (>= 2018.01.27~) | x2go-keyring,
x2goclient,
x2godesktopsharing,
- x2golxdebindings,
- x2gomatebindings,
x2goserver,
x2goserver-fmbindings,
x2goserver-printing,
x2goserver-xsession,
xarchiver,
xournal,
- xpdf,
yakuake,
zip,
${misc:Depends},
Recommends:
+ firmware-linux-nonfree,
+ firmware-realtek,
flashplayer-chromium,
flashplayer-mozilla,
+ openboard-contrib,
+ sagemath,
Conflicts:
browser-plugin-gnash,
browser-plugin-freshplayer-pepperflash,
@@ -932,7 +1179,6 @@ Conflicts:
openoffice.org-l10n-pt-br,
openoffice.org-l10n-sv,
openoffice.org-math,
- openoffice.org-officebean,
openoffice.org-report-builder-bin,
openoffice.org-style-galaxy,
openoffice.org-style-tango,
@@ -954,8 +1200,11 @@ Replaces:
itzks-systems-disklserver,
itzks-systems-display,
itzks-systems-displayserver,
+ itzks-systems-faiserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-workstation,
xul-ext-adblock-plus,
@@ -966,8 +1215,11 @@ Breaks:
itzks-systems-disklserver,
itzks-systems-display,
itzks-systems-displayserver,
+ itzks-systems-faiserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-workstation,
xul-ext-adblock-plus,
@@ -981,8 +1233,8 @@ Depends:
firefox-esr,
firefox-esr-l10n-de,
firmware-linux-free,
- ganeti | libvirt-daemon | libvirt-bin,
- ganeti-os-noop | libvirt-daemon | libvirt-bin,
+ libvirt-daemon | ganeti | libvirt-bin,
+ libvirt-daemon | ganeti-os-noop | libvirt-bin,
gdisk,
git,
htop,
@@ -998,7 +1250,6 @@ Depends:
ocsinventory-agent,
odt2txt,
openvpn,
- pkg-mozilla-archive-keyring,
postfix,
pyhoca-gui,
qemu-kvm,
@@ -1008,19 +1259,24 @@ Depends:
tree,
unzip,
vim,
- webext-ublock-origin,
+ webext-ublock-origin-firefox | webext-ublock-origin,
+ webext-ublock-origin-chromium | webext-ublock-origin,
itzks-keyring (>= 2018.01.27~) | x2go-keyring,
x2goclient,
x2godesktopsharing,
- x2golxdebindings,
x2goserver,
x2goserver-xsession,
xinit,
- xpdf,
zip,
${misc:Depends},
-Recommends: firmware-linux-nonfree
-Conflicts: exim4, exim4-base, exim4-config, exim4-daemon, gnu-fdisk
+Recommends:
+ firmware-linux-nonfree,
+Conflicts: exim4,
+ exim4-base,
+ exim4-config,
+ exim4-daemon,
+ gnu-fdisk,
+ connman,
Description: Profiling ITZkS-VirtMan Systems
Install this package to pull in all dependencies required on
ITZkS VirtMan Debian systems.
@@ -1038,6 +1294,8 @@ Breaks:
itzks-systems-displayserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
xul-ext-adblock-plus,
@@ -1052,21 +1310,27 @@ Replaces:
itzks-systems-displayserver,
itzks-systems-filter,
itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-tablet,
itzks-systems-terminalserver,
itzks-systems-virtman,
xul-ext-adblock-plus,
logisim,
Depends:
+ acpid,
+ ardour,
anacron,
arctica-greeter,
arctica-greeter-theme-debian,
- arctica-greeter-guest-session,
arj,
atril,
audacity,
+ avogadro,
+ blender,
bluefish,
bzip2,
cachefilesd,
+ caja-nextcloud,
catdvi,
chromium,
cups,
@@ -1076,31 +1340,36 @@ Depends:
debian-edu-config (>= 1.929+deb9u1~),
debian-mate-default-settings,
desktop-base,
- emacs24,
+ emacs,
engrampa,
eom,
+# epoptes,
+ epoptes-client,
etckeeper,
ffmpegthumbnailer,
filezilla,
firefox-esr,
firefox-esr-l10n-de,
firmware-linux-free,
- firmware-linux-nonfree,
- firmware-realtek,
fonts-linex | ttf-linex,
fonts-sil-doulos | ttf-sil-doulos,
fping,
+ freecad,
+ freeplane,
galculator,
gdisk,
geany,
+ geogebra | geogebra5 | geogebra44,
git,
gnome-colors-common,
+ gnome-metronome | gtick,
grdesktop,
gstreamer1.0-libav,
gstreamer1.0-plugins-bad,
gstreamer1.0-plugins-good,
gstreamer1.0-plugins-ugly,
gv,
+ handbrake,
htop,
thunderbird,
idle3,
@@ -1109,9 +1378,12 @@ Depends:
itzks-systems-common (>= ${source:Version}),
kdenlive,
kile,
+ kolourpaint,
+ krita,
kturtle,
ktouch,
lazarus,
+ librecad,
libreoffice,
libreoffice-base,
libreoffice-base-core,
@@ -1136,19 +1408,17 @@ Depends:
libreoffice-l10n-pt-br,
libreoffice-l10n-sv,
libreoffice-math,
- libreoffice-officebean,
libreoffice-report-builder-bin,
- libreoffice-style-tango,
libreoffice-writer,
libwacom-bin,
links,
linuxlogo,
- lsb-base,
+ marble-maps,
+ marble-qt,
mate-applets,
mate-applet-brisk-menu,
mate-desktop-environment,
mate-desktop-environment-extras,
- mate-icon-theme-faenza,
mate-media,
mate-notification-daemon,
mate-power-manager,
@@ -1158,30 +1428,46 @@ Depends:
mate-themes,
mate-utils,
mc,
- musescore,
+ minder,
+ musescore3,
+ nfs4-acl-tools,
nload,
nmap,
nted,
+ obs-studio,
ocsinventory-agent,
odt2txt,
+ okular,
+ openshot | openshot-qt,
openvpn,
openboard,
+ pavucontrol,
p11-kit-modules,
+ pdfsam,
+ pdfarranger,
pidgin,
- pinta,
- pkg-mozilla-archive-keyring,
pluma,
puppet,
pyhoca-gui,
- python-matplotlib,
+ python3-altair,
python3-matplotlib,
+ python3-notebook,
+ python3-numpy,
+ python3-pandas,
+ python3-pygame,
+ python3-requests,
+ python3-streamz,
python3-tk,
+ python3-vega-datasets,
+ python3-zipp,
+ qgis,
rawtherapee,
+ remmina,
reportbug,
- sagemath,
sensible-utils,
shutdown-at-night (>= 0.19~),
scratch,
+ simplescreenrecorder,
sl,
sm,
sqlite3,
@@ -1197,7 +1483,8 @@ Depends:
uuid-runtime,
vlc,
webcamoid,
- webext-ublock-origin,
+ webext-ublock-origin-firefox | webext-ublock-origin,
+ webext-ublock-origin-chromium | webext-ublock-origin,
wireless-tools,
x11-apps,
itzks-keyring (>= 2018.01.27~) | x2go-keyring,
@@ -1205,14 +1492,20 @@ Depends:
x2godesktopsharing,
xarchiver,
xournal,
- xpdf,
yakuake,
zip,
${misc:Depends},
Recommends:
+ firmware-linux-nonfree,
+ firmware-realtek,
+ firmware-sof-signed,
flashplayer-chromium,
flashplayer-mozilla,
network-manager-gnome,
+ openboard-contrib,
+ sagemath,
+Suggests:
+ arctica-greeter-guest-session,
Conflicts:
browser-plugin-gnash,
browser-plugin-freshplayer-pepperflash,
@@ -1251,7 +1544,6 @@ Conflicts:
openoffice.org-l10n-pt-br,
openoffice.org-l10n-sv,
openoffice.org-math,
- openoffice.org-officebean,
openoffice.org-report-builder-bin,
openoffice.org-style-galaxy,
openoffice.org-style-tango,
@@ -1263,3 +1555,87 @@ Description: Profiling for ITZkS Workstation Systems
.
ITZkS (IT-Zukunft Schule) is a Northern German project and based
on Debian Edu / Skolelinux.
+
+Package: itzks-systems-roamingworkstation
+Architecture: all
+Depends:
+ itzks-systems-workstation,
+ sensible-utils,
+ gvfs-fuse,
+ libsss-sudo,
+ unison-gtk,
+ ${misc:Depends},
+Description: Profiling for ITZkS Roaming Workstation Systems
+ Install this package to pull in all dependencies required on
+ ITZkS (diskfull) Roaming Workstation systems.
+ .
+ ITZkS (IT-Zukunft Schule) is a Northern German project and based
+ on Debian Edu / Skolelinux.
+
+Package: itzks-systems-tablet
+Architecture: all
+Depends:
+ chromium,
+ chromium-l10n,
+ debian-edu-artwork-spacefun,
+ gvfs-fuse,
+ itzks-systems-common,
+ libsss-sudo,
+ mc,
+ nfs4-acl-tools,
+ openboard,
+ tigervnc-viewer,
+ tree,
+ vim,
+ unison-gtk,
+ x2goclient,
+ ${misc:Depends},
+Breaks:
+ debian-edu-artwork-joy,
+ ifupdown,
+ itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
+ itzks-systems-displayserver,
+ itzks-systems-faiserver,
+ itzks-systems-filter,
+ itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-roamingworkstation,
+ itzks-systems-terminalserver,
+ itzks-systems-virtman,
+ itzks-systems-workstation,
+ firefox-esr,
+ firefox,
+ imagemagick,
+ imagemagick-6.q16,
+ playonlinux,
+Replaces:
+ debian-edu-artwork-joy,
+ ifupdown,
+ itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
+ itzks-systems-displayserver,
+ itzks-systems-faiserver,
+ itzks-systems-filter,
+ itzks-systems-mainserver,
+ itzks-systems-puppetserver,
+ itzks-systems-roamingworkstation,
+ itzks-systems-terminalserver,
+ itzks-systems-virtman,
+ itzks-systems-workstation,
+ firefox-esr,
+ firefox,
+ imagemagick,
+ imagemagick-6.q16,
+ openboard-contrib,
+ playonlinux,
+Description: Profiling for ITZkS Tablet Systems
+ Install this package to pull in all dependencies required on
+ ITZkS Tablet systems.
+ .
+ ITZkS (IT-Zukunft Schule) is a Northern German project and based
+ on Debian Edu / Skolelinux.
diff --git a/debian/copyright b/debian/copyright
index 6f6378e..558f5e4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -44,20 +44,10 @@ Files: bin/smarttech-SMARTBoardService
bin/passwd
bin/itzks-hosts
bin/itzks-goodbye-user-session
- bin/itzks-filter-whitelist-sslmitm-ca
debian/*
+ etc/X11/Xsession.d/98itzks-systems
etc/.java/deployment/deployment.config
etc/.java/deployment/deployment.properties
- etc/default/itzks-transfer-create
- etc/standardskriver.cfg
- etc/skel/Desktop/firefox.desktop
- etc/skel/Desktop/libreoffice-impress.desktop
- etc/skel/Desktop/pwdchange.desktop
- etc/skel/Desktop/Netzwerkordner.desktop
- etc/skel/Desktop/libreoffice-calc.desktop
- etc/skel/Desktop/libreoffice-writer.desktop
- etc/firefox-esr/itzks_papersize.js
- etc/firefox-esr/itzks_caching.js
etc/apt/sources.list.d/itzks.list
etc/apt/sources.list.d/x2go.list
etc/apt/sources.list.d/geogebra.list
@@ -66,81 +56,83 @@ Files: bin/smarttech-SMARTBoardService
etc/apt/sources.list.d/debian-lts.list
etc/apt/sources.list.d/mozilla.list
etc/apt/sources.list.d/arctica.list
- etc/xdg/autostart/smarttech-SMARTBoardTools-autostart.desktop
- etc/xdg/autostart/smarttech-SMARTBoardService-autostart.desktop
- etc/debian-edu/itzks.config
- etc/sudoers.d/itzks-systems-backup
- etc/sudoers.d/itzks-systems-common
- etc/sudoers.d/itzks-systems-mainserver
- etc/network/if-up.d/itzks-cups
- etc/network/if-up.d/itzks-autofs
- etc/sitesummary/config.d/01itzksconf
- etc/shutdown-at-night/shutdown-at-night-nowakeup-others
- etc/schroot/chroot.d/precise-i386-smartboard-ITZkS
- etc/schroot/slxdesktop.ITZkS/nssdatabases
- etc/schroot/slxdesktop.ITZkS/copyfiles
- etc/schroot/slxdesktop.ITZkS/fstab
- etc/mimeapps.list
+ etc/chromium/policies/recommended/itzks-systems_search_provider.json
etc/cron.daily/itzks-systems-workstation
etc/cron.d/itzks-systems-common
etc/cron.d/itzks-systems-disklserver
etc/cron.d/itzks-systems-filter
etc/cron.d/itzks-transfer-cleaner
- etc/init.d/fetch-filter-cert
+ etc/debian-edu/itzks.config
+ etc/default/itzks-transfer-create
+ etc/firefox-esr/itzks_papersize.js
+ etc/ltsp/image-local.excludes
+ etc/ltsp/ltsp.conf.itzks-systems-disklserver.in
+ etc/mimeapps.list
+ etc/mklocaluser.d/60-itzks-systems-roamingworkstation_disable-welcome-page
+ etc/mklocaluser.d/60-itzks-systems-roamingworkstation_gvfs-symlink
+ etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox
+ etc/mklocaluser.d/60-itzks-systems-roamingworkstation_smb-bookmarks
+ etc/mklocaluser.d/60-itzks-systems-tablet_add-to-local-groups
+ etc/modprobe.d/itzks-systems-common_dsp-fix.conf
+ etc/profile.d/itzks-systems.sh
+ etc/schroot/chroot.d/precise-i386-smartboard-ITZkS
+ etc/schroot/slxdesktop.ITZkS/nssdatabases
+ etc/schroot/slxdesktop.ITZkS/copyfiles
+ etc/schroot/slxdesktop.ITZkS/fstab
+ etc/shutdown-at-night/shutdown-at-night-nowakeup-others
+ etc/sitesummary/config.d/01itzksconf
+ etc/skel/.debian-edu/welcome-page-shown
etc/skel/.mozilla/firefox/debian-edu.default/pkcs11.txt
etc/skel/.pki/nssdb/pkcs11.txt
- examples/mainserver/tftp/debian-edu/install-de9.cfg
- examples/mainserver/tftp/debian-edu/memtest.cfg
- examples/mainserver/tftp/debian-edu/default-menu.cfg
- examples/mainserver/tftp/debian-edu/localboot.cfg
- examples/mainserver/tftp/debian-edu/install-de8.cfg
- examples/mainserver/README.tftp
- examples/displayserver/tftp/_common_/debian-edu/display.cfg
- examples/displayserver/tftp/_common_/debian-edu/memtest.cfg
- examples/displayserver/tftp/debian-edu/default-menu.cfg
- examples/displayserver/README.tftp
- examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf
- examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf
- examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf
- examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf
- examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf
- examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf
- examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf
- examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf
- examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf
- examples/backup/dirvish/contentserver.intern/contentserver.intern_srv/dirvish/default.conf
+ etc/skel/Desktop/firefox.desktop
+ etc/skel/Desktop/libreoffice-impress.desktop
+ etc/skel/Desktop/pwdchange.desktop
+ etc/skel/Desktop/Netzwerkordner.desktop
+ etc/skel/Desktop/libreoffice-calc.desktop
+ etc/skel/Desktop/libreoffice-writer.desktop
+ etc/squid-deb-proxy/mirror-dstdomain.acl.d/90-itzks-systems-faiserver
+ etc/standardskriver.cfg
+ etc/sudoers.d/itzks-systems-backup
+ etc/sudoers.d/itzks-systems-common
+ etc/sudoers.d/itzks-systems-mainserver
+ etc/systemd/system/autofs.service
+ etc/xdg/autostart/smarttech-SMARTBoardTools-autostart.desktop
+ etc/xdg/autostart/smarttech-SMARTBoardService-autostart.desktop
+ examples/backup/master.conf.dirvish
+ examples/backup/dirvish/contentserver.intern/contentserver.intern_var/dirvish/default.conf
examples/backup/dirvish/contentserver.intern/contentserver.intern_rootfs/dirvish/default.conf
- examples/backup/dirvish/virt-man-01.backbone/virt-man-01.backbone_rootfs/dirvish/default.conf
- examples/backup/dirvish/virt-man-03.backbone/virt-man-03.backbone_rootfs/dirvish/default.conf
+ examples/backup/dirvish/contentserver.intern/contentserver.intern_srv/dirvish/default.conf
+ examples/backup/dirvish/contentserver.intern/contentserver.intern_boot/dirvish/default.conf
+ examples/backup/dirvish/contentserver.intern/contentserver.intern_usr/dirvish/default.conf
+ examples/backup/dirvish/faiserver.intern/faiserver.intern_boot/dirvish/default.conf
+ examples/backup/dirvish/faiserver.intern/faiserver.intern_rootfs/dirvish/default.conf
+ examples/backup/dirvish/faiserver.intern/faiserver.intern_var/dirvish/default.conf
+ examples/backup/dirvish/faiserver.intern/faiserver.intern_srv/dirvish/default.conf
+ examples/backup/dirvish/faiserver.intern/faiserver.intern_usr/dirvish/default.conf
examples/backup/dirvish/virt-man-02.backbone/virt-man-02.backbone_rootfs/dirvish/default.conf
- examples/backup/dirvish/ltspserver00.intern/ltspserver00.intern_rootfs/dirvish/default.conf
examples/backup/dirvish/ltspserver00.intern/ltspserver00.intern_var/dirvish/default.conf
examples/backup/dirvish/ltspserver00.intern/ltspserver00.intern_boot/dirvish/default.conf
- examples/backup/dirvish/ltspserver00.intern/ltspserver00.intern_usr/dirvish/default.conf
+ examples/backup/dirvish/ltspserver00.intern/ltspserver00.intern_rootfs/dirvish/default.conf
examples/backup/dirvish/ltspserver00.intern/ltspserver00.intern_opt/dirvish/default.conf
- examples/backup/dirvish/disklserver.intern/disklserver.intern_srv/dirvish/default.conf
+ examples/backup/dirvish/ltspserver00.intern/ltspserver00.intern_usr/dirvish/default.conf
+ examples/backup/dirvish/virt-man-01.backbone/virt-man-01.backbone_rootfs/dirvish/default.conf
+ examples/backup/dirvish/disklserver.intern/disklserver.intern_var/dirvish/default.conf
examples/backup/dirvish/disklserver.intern/disklserver.intern_rootfs/dirvish/default.conf
- examples/backup/master.conf.dirvish
+ examples/backup/dirvish/disklserver.intern/disklserver.intern_usr/dirvish/default.conf
+ examples/backup/dirvish/disklserver.intern/disklserver.intern_boot/dirvish/default.conf
+ examples/backup/dirvish/disklserver.intern/disklserver.intern_srv/dirvish/default.conf
+ examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf
+ examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf
+ examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf
+ examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf
+ examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf
+ examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf
+ examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf
+ examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf
+ examples/backup/dirvish/tjener.intern/tjener.intern_var+log/dirvish/default.conf
+ examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf
+ examples/backup/dirvish/virt-man-03.backbone/virt-man-03.backbone_rootfs/dirvish/default.conf
examples/backup/README.dirvish
- examples/disklserver/tftp/_common_/debian-edu/localboot-mswin.cfg
- examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg
- examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg
- examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg
- examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg
- examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg
- examples/disklserver/tftp/_common_/debian-edu/memtest.cfg
- examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg
- examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg
- examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-squeeze.cfg
- examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg
- examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest.cfg
- examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg
- examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg
- examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg
- examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg
- examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg
- examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg
- examples/disklserver/README.tftp
lib-udev-rules.d/60-SMARTBoard32.rules
man/diskless-workstation-shell*.8
man/e2guardian-update-shallalists.8
@@ -157,26 +149,28 @@ Files: bin/smarttech-SMARTBoardService
README.disklserver
README.display
README.displayserver
+ README.faiserver
README.filter
README.itzks-common
README.mainserver
+ README.roamingworkstation
README.terminalserver
README.virtman
README.workstation
+ sbin/diskless-workstation-shell.bookworm
+ sbin/diskless-workstation-shell.bullseye
sbin/diskless-workstation-shell.buster
- sbin/itzks-filewalker
sbin/itzks-display-shell
sbin/itzks-systems.do_preseed
sbin/e2guardian-update-shallalists
sbin/e2guardian-setup-sslmitm
- sbin/diskless-workstation-shell
- sbin/diskless-workstation-shell.jessie
- sbin/diskless-workstation-shell.stretch
- sbin/itzks-switch-to-systemd-networkd
- sbin/itzks-switch-back-to-networkmanager
+ sbin/itzks-reset-userprofile
sbin/itzks-transfer-cleaner
sbin/itzks-transfer-create
sbin/itzks-update-disklserver-squashfs-images
+ share/debian-edu-config/tools/gosa-create-host-itzks
+ share/debian-edu-config/tools/gosa-modify-host-itzks
+ share/debian-edu-config/tools/update-dlw-krb5-keytabs-itzks
share/itzks-systems-common/wine-fixes/wine.mime
share/itzks-systems-common/wine-fixes/wine.keys
share/itzks-systems-common/wine-fixes/wine.desktop
@@ -187,9 +181,9 @@ Files: bin/smarttech-SMARTBoardService
share/icons/hicolor/64x64/apps/SMART+ITZkS_FirmwareUpdater.png
share/icons/hicolor/32x32/apps/SMART+ITZkS_FirmwareUpdater.png
share/icons/hicolor/48x48/apps/SMART+ITZkS_FirmwareUpdater.png
+ share/glib-2.0/schemas/90_itzks+gnome-tablet.gschema.override
share/glib-2.0/schemas/90_itzks+mate.gschema.override
share/glib-2.0/schemas/90_itzks-smartboard+mate.gschema.override
- share/tips_og_hjelp.desktop
share/itzks-systems-smartboard/mime/packages/x-smarttech-gallery.xml
share/itzks-systems-smartboard/mime/packages/x-smarttech-galleryitem.xml
share/itzks-systems-smartboard/mime/packages/x-smarttech-notebook.xml
@@ -293,3 +287,4 @@ License: MIT~OldStyle
License: UNKNOWN
Author has published code without specifying a specific license.
+
diff --git a/debian/itzks-systems-backup.install b/debian/itzks-systems-backup.install
index 1d60393..5991d0a 100644
--- a/debian/itzks-systems-backup.install
+++ b/debian/itzks-systems-backup.install
@@ -1,3 +1,4 @@
etc/sudoers.d/itzks-systems-backup etc/sudoers.d/
+etc/chromium/policies/recommended/itzks-systems_search_provider.json
usr-lib-nagios-plugins/check_dirvish* usr/lib/nagios/plugins/
usr-lib-nagios-plugins/check_md_raid usr/lib/nagios/plugins/
diff --git a/debian/itzks-systems-backup.links b/debian/itzks-systems-backup.links
new file mode 100644
index 0000000..e9dbc61
--- /dev/null
+++ b/debian/itzks-systems-backup.links
@@ -0,0 +1 @@
+usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-backup/README.itzks-common
diff --git a/debian/itzks-systems-common.install b/debian/itzks-systems-common.install
index 5e5673b..efac506 100644
--- a/debian/itzks-systems-common.install
+++ b/debian/itzks-systems-common.install
@@ -3,7 +3,7 @@ etc/apt/* etc/apt/
etc/cron.d/itzks-systems-common
etc/debian-edu/* etc/debian-edu/
etc/firefox-esr/* etc/firefox-esr/
-etc/network/* etc/network/
+etc/modprobe.d/itzks-systems-common_dsp-fix.conf etc/modprobe.d/
etc/sitesummary/* etc/sitesummary/
etc/standardskriver.cfg etc/
etc/sudoers.d/itzks-systems-common etc/sudoers.d/
diff --git a/debian/itzks-systems-common.lintian-overrides b/debian/itzks-systems-common.lintian-overrides
index 0f90d28..df3ec58 100644
--- a/debian/itzks-systems-common.lintian-overrides
+++ b/debian/itzks-systems-common.lintian-overrides
@@ -2,4 +2,4 @@
itzks-systems-common: package-installs-apt-sources
# let's not divert the passwd man page (it is localized, to much of a hassle)
-itzks-systems-common: binary-without-manpage usr/bin/passwd
+itzks-systems-common: no-manual-page usr/bin/passwd
diff --git a/debian/itzks-systems-common.maintscript b/debian/itzks-systems-common.maintscript
index ae68bdf..93752fd 100644
--- a/debian/itzks-systems-common.maintscript
+++ b/debian/itzks-systems-common.maintscript
@@ -1 +1,6 @@
-mv_conffile /etc/iceweasel/pref/itzks_papersize.js /etc/firefox-esr/itzks_papersize.js 2016.07.15.1
+mv_conffile /etc/iceweasel/pref/itzks_papersize.js /etc/firefox-esr/itzks_papersize.js 2016.07.15.1~
+mv_conffile /etc/modprobe.d/dsp-fix.conf /etc/modprobe.d/itzks-systems-common_dsp-fix.conf 2020.12.14.1~
+rm_conffile /etc/network/if-up.d/itzks-autofs 2022.01.01.1~
+rm_conffile /etc/network/if-up.d/itzks-cups 2022.01.01.1~
+rm_conffile /etc/chromium/policies/managed/itzks-systems-common.json 2022.01.07.1~
+rm_conffile /etc/firefox-esr/itzks_caching.js 2022.01.07.1~
diff --git a/debian/itzks-systems-common.postinst b/debian/itzks-systems-common.postinst
index a142825..2f49073 100755
--- a/debian/itzks-systems-common.postinst
+++ b/debian/itzks-systems-common.postinst
@@ -81,6 +81,29 @@ case "$1" in
update-desktop-database
fi
+ if [ -d /usr/share/desktop-base/debian-edu-spacefun-theme ] && which update-debian-edu-artwork-spacefun 1>/dev/null; then
+ if readlink /etc/alternatives/desktop-theme | grep -q debian-edu-spacefun-theme; then
+ :
+ else
+ update-debian-edu-artwork-spacefun configure
+ fi
+ if readlink /etc/alternatives/desktop-background | grep -q desktop-base/active-theme/; then
+ :
+ else
+ update-alternatives --auto desktop-background
+ fi
+ fi
+
+ if [ -e /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme 1>/dev/null && which update-initramfs 1>/dev/null; then
+ if grep -q "Theme=solar" /etc/plymouth/plymouthd.conf; then
+ :
+ else
+ if [ -f /usr/share/plymouth/themes/solar/solar.plymouth ]; then
+ plymouth-set-default-theme solar
+ update-initramfs -k all -u
+ fi
+ fi
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/itzks-systems-diskless.fetch-filter-cert.init b/debian/itzks-systems-diskless.fetch-filter-cert.init
deleted file mode 120000
index 048dfd5..0000000
--- a/debian/itzks-systems-diskless.fetch-filter-cert.init
+++ /dev/null
@@ -1 +0,0 @@
-../etc/init.d/fetch-filter-cert \ No newline at end of file
diff --git a/debian/itzks-systems-diskless.install b/debian/itzks-systems-diskless.install
index de6b80b..8a8536e 100644
--- a/debian/itzks-systems-diskless.install
+++ b/debian/itzks-systems-diskless.install
@@ -2,8 +2,10 @@ bin/itzks-hosts usr/bin/
bin/itzks-goodbye-user-session usr/bin/
etc/.java etc/
etc/X11/Xsession.d/98itzks-systems etc/X11/Xsession.d/
+etc/default/epoptes-client.d/90_itzks-systems-diskless
etc/mimeapps.list etc/
etc/profile.d/itzks-systems.sh etc/profile.d/
etc/shutdown-at-night/ etc/
+sbin/itzks-diskless-re-partition-dlw
share/glib-2.0/schemas/90_itzks+mate.gschema.override usr/share/glib-2.0/schemas/
share/mate-panel/layouts/itzks.layout usr/share/mate-panel/layouts/
diff --git a/debian/itzks-systems-diskless.maintscript b/debian/itzks-systems-diskless.maintscript
new file mode 100644
index 0000000..905772a
--- /dev/null
+++ b/debian/itzks-systems-diskless.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/init.d/fetch-filter-cert 2022.01.07.1~
diff --git a/debian/itzks-systems-diskless.postinst b/debian/itzks-systems-diskless.postinst
index 2fddf61..7ab153b 100755
--- a/debian/itzks-systems-diskless.postinst
+++ b/debian/itzks-systems-diskless.postinst
@@ -19,7 +19,6 @@ set -e
case "$1" in
configure)
- update-gconf-defaults
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/itzks-systems-diskless.postrm b/debian/itzks-systems-diskless.postrm
index 2e1a124..d65bd76 100755
--- a/debian/itzks-systems-diskless.postrm
+++ b/debian/itzks-systems-diskless.postrm
@@ -18,7 +18,6 @@ set -e
case "$1" in
purge|remove)
- update-gconf-defaults
;;
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
diff --git a/debian/itzks-systems-diskless.preinst b/debian/itzks-systems-diskless.preinst
new file mode 100755
index 0000000..e9d02f5
--- /dev/null
+++ b/debian/itzks-systems-diskless.preinst
@@ -0,0 +1,39 @@
+#!/bin/sh
+# preinst script for itzks-systems-diskless
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+ install|upgrade)
+ if dpkg --compare-versions "$2" lt "2022.01.07.1~"; then
+ update-rc.d fetch-filter-cert remove >/dev/null || exit $?
+ fi
+ ;;
+ abort-upgrade)
+ ;;
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/itzks-systems-disklserver.examples b/debian/itzks-systems-disklserver.examples
deleted file mode 100644
index b98fe86..0000000
--- a/debian/itzks-systems-disklserver.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-examples/disklserver/README.tftp
-examples/disklserver/disklserver-tftp.tar.gz
diff --git a/debian/itzks-systems-disklserver.install b/debian/itzks-systems-disklserver.install
index 427de84..9a32e48 100644
--- a/debian/itzks-systems-disklserver.install
+++ b/debian/itzks-systems-disklserver.install
@@ -2,3 +2,5 @@ etc/cron.d/itzks-systems-disklserver etc/cron.d/
etc/systemd/system/autofs.service
sbin/diskless-workstation-shell* usr/sbin/
sbin/itzks-update-disklserver-squashfs-images usr/sbin/
+sbin/itzks-puppet-refresh-ssl usr/sbin/
+etc/ltsp/
diff --git a/debian/itzks-systems-displayserver.examples b/debian/itzks-systems-displayserver.examples
deleted file mode 100644
index a1c03f6..0000000
--- a/debian/itzks-systems-displayserver.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-examples/displayserver/README.tftp
-examples/displayserver/displayserver-tftp.tar.gz
diff --git a/debian/itzks-systems-displayserver.install b/debian/itzks-systems-displayserver.install
index 6e501e0..bbd2e59 100644
--- a/debian/itzks-systems-displayserver.install
+++ b/debian/itzks-systems-displayserver.install
@@ -1 +1,2 @@
sbin/itzks-display-shell usr/sbin/
+sbin/itzks-puppet-refresh-ssl usr/sbin/
diff --git a/debian/itzks-systems-faiserver.docs b/debian/itzks-systems-faiserver.docs
new file mode 100644
index 0000000..a7e54ba
--- /dev/null
+++ b/debian/itzks-systems-faiserver.docs
@@ -0,0 +1 @@
+README.faiserver
diff --git a/debian/itzks-systems-faiserver.install b/debian/itzks-systems-faiserver.install
new file mode 100644
index 0000000..966ef43
--- /dev/null
+++ b/debian/itzks-systems-faiserver.install
@@ -0,0 +1,2 @@
+etc/squid-deb-proxy/mirror-dstdomain.acl.d/90-itzks-systems-faiserver
+sbin/itzks-puppet-refresh-ssl usr/sbin/
diff --git a/debian/itzks-systems-faiserver.links b/debian/itzks-systems-faiserver.links
new file mode 100644
index 0000000..11260f2
--- /dev/null
+++ b/debian/itzks-systems-faiserver.links
@@ -0,0 +1 @@
+usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-faiserver/README.itzks-common
diff --git a/debian/itzks-systems-faiserver.lintian-overrides b/debian/itzks-systems-faiserver.lintian-overrides
new file mode 100644
index 0000000..6e0309e
--- /dev/null
+++ b/debian/itzks-systems-faiserver.lintian-overrides
@@ -0,0 +1,3 @@
+# yes, we know. We want to disable and stop squid nonetheless as it is not needed
+itzks-systems-faiserver: init.d-script-not-included-in-package etc/init.d/squid
+itzks-systems-faiserver: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/squid
diff --git a/debian/itzks-systems-faiserver.postinst b/debian/itzks-systems-faiserver.postinst
new file mode 100755
index 0000000..dee5b9d
--- /dev/null
+++ b/debian/itzks-systems-faiserver.postinst
@@ -0,0 +1,45 @@
+#!/bin/sh
+# postinst script for itzks-systems-faiserver
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+ configure)
+ if invoke-rc.d squid status 1>/dev/null 2>/dev/null; then
+ echo "Stopping and disabling 'squid' service. This may take a while..."
+ invoke-rc.d squid stop
+ update-rc.d squid disable >/dev/null
+ fi
+ # apply the added white-list file
+ invoke-rc.d squid-deb-proxy restart
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/itzks-systems-filter.install b/debian/itzks-systems-filter.install
index a1f5c66..f757290 100644
--- a/debian/itzks-systems-filter.install
+++ b/debian/itzks-systems-filter.install
@@ -1,4 +1,5 @@
usr-lib-nagios-plugins/check_squid usr/lib/nagios/plugins/
-sbin/e2guardian-update-shallalists usr/sbin/
etc/cron.d/itzks-systems-filter
etc/systemd/system/autofs.service
+sbin/e2guardian-update-blacklists usr/sbin/
+sbin/itzks-puppet-refresh-ssl usr/sbin/
diff --git a/debian/itzks-systems-filter.links b/debian/itzks-systems-filter.links
new file mode 100644
index 0000000..bcf72c3
--- /dev/null
+++ b/debian/itzks-systems-filter.links
@@ -0,0 +1 @@
+usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-filter/README.itzks-common
diff --git a/debian/itzks-systems-filter.manpages b/debian/itzks-systems-filter.manpages
index 5840249..af5580f 100644
--- a/debian/itzks-systems-filter.manpages
+++ b/debian/itzks-systems-filter.manpages
@@ -1 +1 @@
-man/e2guardian-update-shallalists.8 \ No newline at end of file
+man/e2guardian-update-blacklists.8
diff --git a/debian/itzks-systems-mainserver.examples b/debian/itzks-systems-mainserver.examples
deleted file mode 100644
index ce9df9a..0000000
--- a/debian/itzks-systems-mainserver.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-examples/mainserver/README.tftp
-examples/mainserver/mainserver-tftp.tar.gz
diff --git a/debian/itzks-systems-mainserver.install b/debian/itzks-systems-mainserver.install
index 63b3c0b..fed5b82 100644
--- a/debian/itzks-systems-mainserver.install
+++ b/debian/itzks-systems-mainserver.install
@@ -1,9 +1,17 @@
bin/itzks-hosts usr/bin/
+bin/itzks-puppet-list-known-hosts usr/bin/
etc/cron.d/itzks-transfer-cleaner /etc/cron.d/
+etc/cron.d/itzks-systems-mainserver /etc/cron.d/
etc/skel etc/
+etc/squid/conf.d/itzks-systems-mainserver.conf etc/squid/conf.d/
etc/sudoers.d/itzks-systems-mainserver etc/sudoers.d/
sbin/itzks-transfer-create usr/sbin/
sbin/itzks-transfer-cleaner usr/sbin/
sbin/itzks-reset-userprofile usr/sbin/
+sbin/itzks-puppet-autosign-new-host-certificates usr/sbin/
+sbin/itzks-prepare-reinstall usr/sbin/
+sbin/itzks-check-ldap-group-not-in-correct-ou usr/sbin/
usr-lib-nagios-plugins/check_puppetmaster* usr/lib/nagios/plugins/
usr-lib-nagios-plugins/check_squid usr/lib/nagios/plugins/
+share/debian-edu-config/tools/gosa-*-itzks usr/share/debian-edu-config/tools/
+share/debian-edu-config/tools/update-dlw-krb5-keytabs-itzks usr/share/debian-edu-config/tools/
diff --git a/debian/itzks-systems-mainserver.lintian-overrides b/debian/itzks-systems-mainserver.lintian-overrides
index 8b8fcc6..f65272c 100644
--- a/debian/itzks-systems-mainserver.lintian-overrides
+++ b/debian/itzks-systems-mainserver.lintian-overrides
@@ -1,7 +1,7 @@
-itzks-systems-mainserver: unusual-interpreter etc/skel/Desktop/Netzwerkordner.desktop #!xdg-open
-itzks-systems-mainserver: unusual-interpreter etc/skel/Desktop/firefox.desktop #!xdg-open
-itzks-systems-mainserver: unusual-interpreter etc/skel/Desktop/libreoffice-calc.desktop #!xdg-open
-itzks-systems-mainserver: unusual-interpreter etc/skel/Desktop/libreoffice-impress.desktop #!xdg-open
-itzks-systems-mainserver: unusual-interpreter etc/skel/Desktop/libreoffice-writer.desktop #!xdg-open
-itzks-systems-mainserver: unusual-interpreter etc/skel/Desktop/pwdchange.desktop #!xdg-open
+itzks-systems-mainserver: unusual-interpreter xdg-open [etc/skel/Desktop/Netzwerkordner.desktop]
+itzks-systems-mainserver: unusual-interpreter xdg-open [etc/skel/Desktop/firefox.desktop]
+itzks-systems-mainserver: unusual-interpreter xdg-open [etc/skel/Desktop/libreoffice-calc.desktop]
+itzks-systems-mainserver: unusual-interpreter xdg-open [etc/skel/Desktop/libreoffice-impress.desktop]
+itzks-systems-mainserver: unusual-interpreter xdg-open [etc/skel/Desktop/libreoffice-writer.desktop]
+itzks-systems-mainserver: unusual-interpreter xdg-open [etc/skel/Desktop/pwdchange.desktop]
itzks-systems-mainserver: package-contains-file-in-etc-skel
diff --git a/debian/itzks-systems-mainserver.postinst b/debian/itzks-systems-mainserver.postinst
new file mode 100755
index 0000000..da9dcf1
--- /dev/null
+++ b/debian/itzks-systems-mainserver.postinst
@@ -0,0 +1,52 @@
+#!/bin/sh
+# postinst script for itzks-systems-mainserver
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "${1}" in
+ 'configure')
+ ###
+ ### setup debian-edu user account (needed for DLW keytab distribution)
+ ###
+
+ if ! getent 'passwd' 'debian-edu' >'/dev/null'; then
+ echo 'Creating debian-edu user.' >&2
+ adduser --system --home /var/lib/debian-edu \
+ --disabled-password --shell /bin/sh \
+ --group 'debian-edu'
+ else
+ echo 'User debian-edu already exists.' >&2
+ # make sure all settings are appropriate
+ if [ "$(id -gn 'debian-edu')" != 'debian-edu' ]; then
+ usermod --gid 'debian-edu' 'debian-edu'
+ fi
+ fi
+ ;;
+ 'abort-upgrade'|'abort-remove'|'abort-deconfigure')
+ ;;
+ *)
+ echo "postinst called with unknown argument '${1}'" >&2
+ exit '1'
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit '0'
diff --git a/debian/itzks-systems-mainserver.postrm b/debian/itzks-systems-mainserver.postrm
new file mode 100755
index 0000000..c6d94e8
--- /dev/null
+++ b/debian/itzks-systems-mainserver.postrm
@@ -0,0 +1,44 @@
+#! /bin/sh
+# postrm script for itzks-systems-mainserver
+#
+# see: dh_installdeb(1)
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/share/doc/packaging-manual/
+
+set -e
+
+case "$1" in
+ purge)
+
+ if [ ! -d /usr/share/doc/debian-edu-config ]; then
+ # remove user/group debian-edu from system (only if package
+ # debian-edu-config has also been removed)
+ getent passwd debian-edu 1>/dev/null && deluser debian-edu
+ getent group debian-edu 1>/dev/null && delgroup debian-edu
+ getent group debian-edu 1>/dev/null && delgroup debian-edu
+ rm -Rf /var/lib/debian-edu
+ fi
+
+ ;;
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+ *)
+ echo "postrm called with unknown argument \`$1'" 1>&2
+ exit 0
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/itzks-systems-puppetserver.install b/debian/itzks-systems-puppetserver.install
new file mode 100644
index 0000000..5a498a6
--- /dev/null
+++ b/debian/itzks-systems-puppetserver.install
@@ -0,0 +1,4 @@
+bin/itzks-puppet-list-known-hosts usr/bin/
+etc/cron.d/itzks-systems-puppetserver
+sbin/itzks-puppet-autosign-new-host-certificates usr/sbin/
+sbin/itzks-prepare-reinstall usr/sbin/
diff --git a/debian/itzks-systems-roamingworkstation.install b/debian/itzks-systems-roamingworkstation.install
new file mode 100644
index 0000000..5bdb44b
--- /dev/null
+++ b/debian/itzks-systems-roamingworkstation.install
@@ -0,0 +1,9 @@
+etc/mklocaluser.d/60-itzks-systems-roamingworkstation_*
+etc/skel/.pki
+etc/skel/Desktop/libreoffice-impress.desktop
+etc/skel/Desktop/pwdchange.desktop
+etc/skel/Desktop/firefox.desktop
+etc/skel/Desktop/libreoffice-calc.desktop
+etc/skel/Desktop/libreoffice-writer.desktop
+etc/skel/.mozilla
+etc/skel/.debian-edu/welcome-page-shown
diff --git a/debian/itzks-systems-roamingworkstation.lintian-overrides b/debian/itzks-systems-roamingworkstation.lintian-overrides
new file mode 100644
index 0000000..d916025
--- /dev/null
+++ b/debian/itzks-systems-roamingworkstation.lintian-overrides
@@ -0,0 +1,6 @@
+itzks-systems-roamingworkstation: unusual-interpreter xdg-open [etc/skel/Desktop/firefox.desktop]
+itzks-systems-roamingworkstation: unusual-interpreter xdg-open [etc/skel/Desktop/libreoffice-calc.desktop]
+itzks-systems-roamingworkstation: unusual-interpreter xdg-open [etc/skel/Desktop/libreoffice-impress.desktop]
+itzks-systems-roamingworkstation: unusual-interpreter xdg-open [etc/skel/Desktop/libreoffice-writer.desktop]
+itzks-systems-roamingworkstation: unusual-interpreter xdg-open [etc/skel/Desktop/pwdchange.desktop]
+itzks-systems-roamingworkstation: package-contains-file-in-etc-skel
diff --git a/debian/itzks-systems-smartboard.links b/debian/itzks-systems-smartboard.links
new file mode 100644
index 0000000..7a9cfbc
--- /dev/null
+++ b/debian/itzks-systems-smartboard.links
@@ -0,0 +1 @@
+usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-smartboard/README.itzks-common
diff --git a/debian/itzks-systems-tablet.install b/debian/itzks-systems-tablet.install
new file mode 100644
index 0000000..778235c
--- /dev/null
+++ b/debian/itzks-systems-tablet.install
@@ -0,0 +1,7 @@
+etc/mklocaluser.d/60-itzks-systems-roamingworkstation_*
+etc/mklocaluser.d/60-itzks-systems-tablet_*
+etc/skel/.pki
+etc/skel/.mozilla
+etc/skel/.debian-edu/welcome-page-shown
+share/glib-2.0/schemas/90_itzks+gnome-tablet.gschema.override usr/share/glib-2.0/schemas/
+sbin/itzks-puppet-refresh-ssl usr/sbin/
diff --git a/debian/itzks-systems-tablet.links b/debian/itzks-systems-tablet.links
new file mode 100644
index 0000000..0f698f1
--- /dev/null
+++ b/debian/itzks-systems-tablet.links
@@ -0,0 +1 @@
+usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-tablet/README.itzks-common
diff --git a/debian/itzks-systems-tablet.lintian-overrides b/debian/itzks-systems-tablet.lintian-overrides
new file mode 100644
index 0000000..8c32638
--- /dev/null
+++ b/debian/itzks-systems-tablet.lintian-overrides
@@ -0,0 +1,6 @@
+itzks-systems-tablet: unusual-interpreter xdg-open [etc/skel/Desktop/firefox.desktop]
+itzks-systems-tablet: unusual-interpreter xdg-open [etc/skel/Desktop/libreoffice-calc.desktop]
+itzks-systems-tablet: unusual-interpreter xdg-open [etc/skel/Desktop/libreoffice-impress.desktop]
+itzks-systems-tablet: unusual-interpreter xdg-open [etc/skel/Desktop/libreoffice-writer.desktop]
+itzks-systems-tablet: unusual-interpreter xdg-open [etc/skel/Desktop/pwdchange.desktop]
+itzks-systems-tablet: package-contains-file-in-etc-skel
diff --git a/debian/itzks-systems-terminalserver.fetch-filter-cert.init b/debian/itzks-systems-terminalserver.fetch-filter-cert.init
deleted file mode 120000
index 048dfd5..0000000
--- a/debian/itzks-systems-terminalserver.fetch-filter-cert.init
+++ /dev/null
@@ -1 +0,0 @@
-../etc/init.d/fetch-filter-cert \ No newline at end of file
diff --git a/debian/itzks-systems-terminalserver.install b/debian/itzks-systems-terminalserver.install
index 0691ba7..14a7dbf 100644
--- a/debian/itzks-systems-terminalserver.install
+++ b/debian/itzks-systems-terminalserver.install
@@ -6,3 +6,4 @@ etc/profile.d/itzks-systems.sh etc/profile.d/
etc/systemd/system/autofs.service
share/glib-2.0/schemas/90_itzks+mate.gschema.override usr/share/glib-2.0/schemas/
share/mate-panel/layouts/itzks.layout usr/share/mate-panel/layouts/
+sbin/itzks-puppet-refresh-ssl usr/sbin/
diff --git a/debian/itzks-systems-terminalserver.maintscript b/debian/itzks-systems-terminalserver.maintscript
new file mode 100644
index 0000000..905772a
--- /dev/null
+++ b/debian/itzks-systems-terminalserver.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/init.d/fetch-filter-cert 2022.01.07.1~
diff --git a/debian/itzks-systems-terminalserver.preinst b/debian/itzks-systems-terminalserver.preinst
new file mode 100755
index 0000000..9ce101e
--- /dev/null
+++ b/debian/itzks-systems-terminalserver.preinst
@@ -0,0 +1,39 @@
+#!/bin/sh
+# preinst script for itzks-systems-terminalserver
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+ install|upgrade)
+ if dpkg --compare-versions "$2" lt "2022.01.07.1~"; then
+ update-rc.d fetch-filter-cert remove >/dev/null || exit $?
+ fi
+ ;;
+ abort-upgrade)
+ ;;
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/itzks-systems-virtman.install b/debian/itzks-systems-virtman.install
index 4acbcec..fcc7d11 100644
--- a/debian/itzks-systems-virtman.install
+++ b/debian/itzks-systems-virtman.install
@@ -1,2 +1,3 @@
+etc/chromium/policies/recommended/itzks-systems_search_provider.json
usr-lib-nagios-plugins/check_apcupsd usr/lib/nagios/plugins/
usr-lib-nagios-plugins/check_md_raid usr/lib/nagios/plugins/
diff --git a/debian/itzks-systems-virtman.links b/debian/itzks-systems-virtman.links
new file mode 100644
index 0000000..373b0cd
--- /dev/null
+++ b/debian/itzks-systems-virtman.links
@@ -0,0 +1 @@
+usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-virtman/README.itzks-common
diff --git a/debian/itzks-systems-workstation.fetch-filter-cert.init b/debian/itzks-systems-workstation.fetch-filter-cert.init
deleted file mode 120000
index 048dfd5..0000000
--- a/debian/itzks-systems-workstation.fetch-filter-cert.init
+++ /dev/null
@@ -1 +0,0 @@
-../etc/init.d/fetch-filter-cert \ No newline at end of file
diff --git a/debian/itzks-systems-workstation.install b/debian/itzks-systems-workstation.install
index f43f20c..fdd60e7 100644
--- a/debian/itzks-systems-workstation.install
+++ b/debian/itzks-systems-workstation.install
@@ -3,10 +3,11 @@ bin/itzks-goodbye-user-session usr/bin/
etc/.java etc/
etc/X11/Xsession.d/98itzks-systems etc/X11/Xsession.d/
etc/cron.daily/itzks-systems-workstation /etc/cron.daily/
+etc/default/epoptes-client.d/90_itzks-systems-workstation
etc/mimeapps.list etc/
etc/profile.d/itzks-systems.sh etc/profile.d/
-etc/skel etc/
etc/shutdown-at-night/ etc/
etc/systemd/system/autofs.service
share/glib-2.0/schemas/90_itzks+mate.gschema.override usr/share/glib-2.0/schemas/
share/mate-panel/layouts/itzks.layout usr/share/mate-panel/layouts/
+sbin/itzks-puppet-refresh-ssl usr/sbin/
diff --git a/debian/itzks-systems-workstation.maintscript b/debian/itzks-systems-workstation.maintscript
new file mode 100644
index 0000000..e8df472
--- /dev/null
+++ b/debian/itzks-systems-workstation.maintscript
@@ -0,0 +1,8 @@
+rm_conffile /etc/skel/Desktop/firefox.desktop 2020.02.10.2~
+rm_conffile /etc/skel/Desktop/libreoffice-calc.desktop 2020.02.10.2~
+rm_conffile /etc/skel/Desktop/libreoffice-writer.desktop 2020.02.10.2~
+rm_conffile /etc/skel/Desktop/Netzwerkordner.desktop 2020.02.10.2~
+rm_conffile /etc/skel/Desktop/pwdchange.desktop 2020.02.10.2~
+rm_conffile /etc/skel/.mozilla/firefox/debian-edu.default/pkcs11.txt 2020.02.10.2~
+rm_conffile /etc/skel/.pki/nssdb/pkcs11.txt 2020.02.10.2~
+rm_conffile /etc/init.d/fetch-filter-cert 2022.01.07.1~
diff --git a/debian/itzks-systems-workstation.postinst b/debian/itzks-systems-workstation.postinst
new file mode 100755
index 0000000..3fb3068
--- /dev/null
+++ b/debian/itzks-systems-workstation.postinst
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+#DEBHELPER#
+
+# we once shipped /etc/skell in itzks-systems-workstation, bad idea!
+if [ "$1" = "configure" ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt "2020.02.10.2"; then
+ rm -Rfv /etc/skel/Netzwerkordner
+ test -d /etc/skel/Desktop && rmdir -p --ignore-fail-on-non-empty /etc/skel/Desktop || true
+ test -d /etc/skel/.mozilla && rmdir -p --ignore-fail-on-non-empty /etc/skel/.mozilla || true
+ test -d /etc/skel/.pki && rmdir -p --ignore-fail-on-non-empty /etc/skel/.pki || true
+fi
diff --git a/debian/itzks-systems-workstation.preinst b/debian/itzks-systems-workstation.preinst
new file mode 100755
index 0000000..b0c4693
--- /dev/null
+++ b/debian/itzks-systems-workstation.preinst
@@ -0,0 +1,39 @@
+#!/bin/sh
+# preinst script for itzks-systems-workstation
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+ install|upgrade)
+ if dpkg --compare-versions "$2" lt "2022.01.07.1~"; then
+ update-rc.d fetch-filter-cert remove >/dev/null || exit $?
+ fi
+ ;;
+ abort-upgrade)
+ ;;
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 0c6536b..dbf628f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,12 +8,9 @@ override_dh_installinit:
dh_installinit --name fetch-filter-cert -r --no-start
override_dh_installexamples:
- cd examples/mainserver/ && tar cvf mainserver-tftp.tar tftp && gzip -9n mainserver-tftp.tar
- cd examples/disklserver/ && tar cvf disklserver-tftp.tar tftp && gzip -9n disklserver-tftp.tar
- cd examples/displayserver/ && tar cvf displayserver-tftp.tar tftp && gzip -9n displayserver-tftp.tar
cd examples/backup/ && tar cvf backup-dirvish.tar dirvish && gzip -9n backup-dirvish.tar
dh_installexamples
override_dh_clean:
rm -f examples/*/*.tar.gz
- dh_clean \ No newline at end of file
+ dh_clean
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 8b6c9b7..20b29bb 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1,5 @@
# it is so much easier heaving those absolute symlinks
source: source-contains-unsafe-symlink
+
+# yes, we know...
+source: absolute-symbolic-link-target-in-source etc/skel/*
diff --git a/debian/templates b/debian/templates
index 3824121..a8209e0 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,5 +1,5 @@
Template: itzks-systems-common/customer-name
Type: select
-Choices: DEMO, DEV, EBG, FRS, FWSECK, HGG, HHS, KATHARINEUM, PUS, TEST, WDORF
+Choices: DEMO, DEV, FREIWAERTS, FWSECK, KATHARINEUM, LW, OvG, TEST
_Description: School's Short Name:
Select the school this system is located at.
diff --git a/etc/apt/sources.list.d/arctica.list b/etc/apt/sources.list.d/arctica.list
index c6be1f3..c317b5e 100644
--- a/etc/apt/sources.list.d/arctica.list
+++ b/etc/apt/sources.list.d/arctica.list
@@ -1,2 +1,2 @@
-#deb http://packages.arctica-project.org/debian buster main
-#deb http://packages.arctica-project.org/debian-extras buster main
+#deb http://packages.arctica-project.org/debian bullseye main
+#deb http://packages.arctica-project.org/debian-extras bullseye main
diff --git a/etc/apt/sources.list.d/backports.list b/etc/apt/sources.list.d/backports.list
index 18ee5d8..44db69f 100644
--- a/etc/apt/sources.list.d/backports.list
+++ b/etc/apt/sources.list.d/backports.list
@@ -1 +1 @@
-#deb http://ftp.de.debian.org/debian buster-backports main contrib non-free
+#deb http://ftp.de.debian.org/debian bullseye-backports main contrib non-free
diff --git a/etc/apt/sources.list.d/itzks.list b/etc/apt/sources.list.d/itzks.list
index 2483921..3f7419e 100644
--- a/etc/apt/sources.list.d/itzks.list
+++ b/etc/apt/sources.list.d/itzks.list
@@ -1,3 +1,4 @@
-deb http://packages.it-zukunft-schule.de/debian buster main contrib non-free
-deb http://packages.it-zukunft-schule.de/debian buster-backports main contrib non-free
#deb http://packages.it-zukunft-schule.de/debian sid main contrib non-free
+
+deb http://packages.it-zukunft-schule.de/debian bullseye main contrib non-free
+deb http://packages.it-zukunft-schule.de/debian bullseye-backports main contrib non-free
diff --git a/etc/apt/sources.list.d/multimedia.list b/etc/apt/sources.list.d/multimedia.list
index e094f45..6a89d44 100644
--- a/etc/apt/sources.list.d/multimedia.list
+++ b/etc/apt/sources.list.d/multimedia.list
@@ -1 +1 @@
-deb http://www.deb-multimedia.org/ buster main non-free
+#deb http://www.deb-multimedia.org/ bullseye main non-free
diff --git a/etc/apt/sources.list.d/x2go.list b/etc/apt/sources.list.d/x2go.list
index a1c770a..e19af1b 100644
--- a/etc/apt/sources.list.d/x2go.list
+++ b/etc/apt/sources.list.d/x2go.list
@@ -1 +1 @@
-#deb http://packages.x2go.org/debian buster main
+#deb http://packages.x2go.org/debian bullseye main
diff --git a/etc/chromium/policies/recommended/itzks-systems_search_provider.json b/etc/chromium/policies/recommended/itzks-systems_search_provider.json
new file mode 100644
index 0000000..5d3649d
--- /dev/null
+++ b/etc/chromium/policies/recommended/itzks-systems_search_provider.json
@@ -0,0 +1,9 @@
+{
+ "DefaultSearchProviderEnabled": true,
+ "DefaultSearchProviderName": "DuckDuckGo",
+ "DefaultSearchProviderIconURL": "https://duckduckgo.com/favicon.ico",
+ "DefaultSearchProviderEncodings": ["UTF-8"],
+ "DefaultSearchProviderSearchURL": "https://duckduckgo.com/?q={searchTerms}",
+ "DefaultSearchProviderSuggestURL": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
+ "DefaultSearchProviderNewTabURL": "https://duckduckgo.com/chrome_newtab"
+}
diff --git a/etc/cron.d/itzks-systems-common b/etc/cron.d/itzks-systems-common
index 8c62a5e..37ef787 100644
--- a/etc/cron.d/itzks-systems-common
+++ b/etc/cron.d/itzks-systems-common
@@ -3,6 +3,9 @@ PATH=/usr/bin:/bin:/usr/sbin:/sbin
@reboot root apt-get autoclean 1>/dev/null
+# FIXME: The below detection that tells us if we run inside a DLW (or similar) is not 100% safe.
+# The disklserver also has an ltsp.conf file... This needs to be improved.
+
# make latest package lists available to the user and Icinga
-0 7,11,15 * * * root if [ ! -e /etc/lts.conf ]; then apt-get update 1>/dev/null 2>/dev/null; fi
-15 8 * * * root if [ ! -e /etc/lts.conf ]; then apt-get clean 1>/dev/null 2>/dev/null; fi
+0 7,11,15 * * * root if [ ! -e /etc/ltsp/ltsp.conf ]; then apt-get update 1>/dev/null 2>/dev/null; fi
+15 8 * * * root if [ ! -e /etc/ltsp/ltsp.conf ]; then apt-get clean 1>/dev/null 2>/dev/null; fi
diff --git a/etc/cron.d/itzks-systems-filter b/etc/cron.d/itzks-systems-filter
index a0d8c31..84e862c 100644
--- a/etc/cron.d/itzks-systems-filter
+++ b/etc/cron.d/itzks-systems-filter
@@ -1,5 +1,5 @@
MAILTO=root
PATH=/usr/bin:/bin:/usr/sbin:/sbin
-#run e2guardian-update-shallalists script
-0 21 * * 0 [ -x /usr/sbin/e2guardian-update-shallalists ] && http_proxy="" https_proxy="" /usr/sbin/e2guardian-update-shallalists
+#run e2guardian-update-blacklists script
+0 21 * * 0 [ -x /usr/sbin/e2guardian-update-blacklists ] && http_proxy="" https_proxy="" /usr/sbin/e2guardian-update-blacklists
diff --git a/etc/cron.d/itzks-systems-mainserver b/etc/cron.d/itzks-systems-mainserver
new file mode 100644
index 0000000..341d0f2
--- /dev/null
+++ b/etc/cron.d/itzks-systems-mainserver
@@ -0,0 +1,5 @@
+MAILTO=root
+PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# run puppet auto-CSR signing hourly
+0 7,8,9,10,11,12,13,14,15,16,17 * * * root [ -d /etc/puppet ] && [ -x /usr/sbin/itzks-puppet-autosign-new-host-certificates ] && /usr/sbin/itzks-puppet-autosign-new-host-certificates
diff --git a/etc/cron.d/itzks-systems-puppetserver b/etc/cron.d/itzks-systems-puppetserver
new file mode 100644
index 0000000..341d0f2
--- /dev/null
+++ b/etc/cron.d/itzks-systems-puppetserver
@@ -0,0 +1,5 @@
+MAILTO=root
+PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# run puppet auto-CSR signing hourly
+0 7,8,9,10,11,12,13,14,15,16,17 * * * root [ -d /etc/puppet ] && [ -x /usr/sbin/itzks-puppet-autosign-new-host-certificates ] && /usr/sbin/itzks-puppet-autosign-new-host-certificates
diff --git a/etc/cron.daily/itzks-systems-workstation b/etc/cron.daily/itzks-systems-workstation
index 15d4707..394b1b5 100755
--- a/etc/cron.daily/itzks-systems-workstation
+++ b/etc/cron.daily/itzks-systems-workstation
@@ -7,11 +7,3 @@ PATH=/usr/bin:/bin:/usr/sbin:/sbin
if [ -x /usr/share/debian-edu-config/tools/update-proxy-from-wpad ]; then
/usr/share/debian-edu-config/tools/update-proxy-from-wpad 2>&1 1>/dev/null
fi
-
-# Run update-flashplugin-nonfree daily (only if installed)
-if which update-flashplugin-nonfree 1>/dev/null; then
- if fping people.debian.org 1>/dev/null; then
- update-flashplugin-nonfree --install 2>&1 1>/dev/null
- fi
-fi
-
diff --git a/etc/default/epoptes-client.d/90_itzks-systems-diskless b/etc/default/epoptes-client.d/90_itzks-systems-diskless
new file mode 100644
index 0000000..5a53e09
--- /dev/null
+++ b/etc/default/epoptes-client.d/90_itzks-systems-diskless
@@ -0,0 +1 @@
+SERVER=epoptes-server \ No newline at end of file
diff --git a/etc/default/epoptes-client.d/90_itzks-systems-workstation b/etc/default/epoptes-client.d/90_itzks-systems-workstation
new file mode 100644
index 0000000..5a53e09
--- /dev/null
+++ b/etc/default/epoptes-client.d/90_itzks-systems-workstation
@@ -0,0 +1 @@
+SERVER=epoptes-server \ No newline at end of file
diff --git a/etc/firefox-esr/itzks_caching.js b/etc/firefox-esr/itzks_caching.js
deleted file mode 100644
index 929ea31..0000000
--- a/etc/firefox-esr/itzks_caching.js
+++ /dev/null
@@ -1,2 +0,0 @@
-pref("browser.cache.disk.enable", "false");
-pref("browser.cache.memory.enable", "true");
diff --git a/etc/init.d/fetch-filter-cert b/etc/init.d/fetch-filter-cert
deleted file mode 100755
index 13bb264..0000000
--- a/etc/init.d/fetch-filter-cert
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: fetch-filter-cert
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Should-Start: $network $syslog $named
-# Default-Start: 2 3 4 5
-# Default-Stop:
-# Short-Description: Fetch e2guardian SSL public cacert
-# Description:
-# Retrieve e2guardian proxy's CA certificate and add it to
-# the system-wide list of CA certificates.
-### END INIT INFO
-
-set -e
-
-. /lib/lsb/init-functions
-
-CERTFILE=/usr/local/share/ca-certificates/debian-edu/filter-ca.crt
-FILTERSERVER="filter"
-FILTERCACERTURL="http://$FILTERSERVER/filter-ca.crt"
-
-do_start() {
- ERROR=false
- if ! fping "$FILTERSERVER" 1>/dev/null 2>/dev/null; then
- logger -t fetch-filter-cert "Site does not have a content filter server, aborting."
- return 0
- elif [ ! -f $CERTFILE ]; then
- [ "$VERBOSE" != no ] && log_action_begin_msg "Fetching content filter CA certificate."
- mkdir -p "$(dirname $CERTFILE)"
- curl "$FILTERCACERTURL" > $CERTFILE.new
- chmod 644 $CERTFILE.new
- if test -s $CERTFILE.new && head -n1 $CERTFILE.new | grep -q -E '^-----BEGIN CERTIFICATE-----$'; then
- mv $CERTFILE.new $CERTFILE
- [ "$VERBOSE" != no ] && log_action_end_msg 0
- logger -t fetch-filter-cert "Fetched content filter CA certificate from $FILTERCACERTURL."
- update-ca-certificates 1>/dev/null
- else
- rm $CERTFILE.new
- log_action_end_msg 1
- logger -t fetch-filter-cert "Failed to fetch content filter CA certificate from $FILTERCACERTURL."
- ERROR=true
- fi
- fi
- if [ -d /opt/ltsp ] ; then
- for ltsp_chroot in `find /opt/ltsp/ -mindepth 1 -maxdepth 1 -type d`; do
- if [ ! -f $ltsp_chroot$CERTFILE ]; then
- [ "$VERBOSE" != no ] &&
- log_action_begin_msg "Copying content filter CA certificate to ltsp-chroot $ltsp_chroot "
- if test -s $CERTFILE; then
- mkdir -p $(dirname $ltsp_chroot/$CERTFILE)
- cp $CERTFILE $ltsp_chroot$CERTFILE
- chmod 644 $ltsp_chroot$CERTFILE
- chroot $ltsp_chroot update-ca-certificates 1>/dev/null
- [ "$VERBOSE" != no ] && log_action_end_msg 0
- else
- log_action_end_msg 1
- ERROR=true
- fi
- fi
- done
- fi
- if $ERROR; then
- return 1
- fi
-}
-
-case "$1" in
- start)
- do_start
- ;;
- stop)
- ;;
- restart|force-reload)
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload}"
- exit 2
-esac
-exit 0
diff --git a/etc/ltsp/image-local.excludes b/etc/ltsp/image-local.excludes
new file mode 100644
index 0000000..10125cd
--- /dev/null
+++ b/etc/ltsp/image-local.excludes
@@ -0,0 +1,16 @@
+# we want to keep root/.ssh, therefore we need to
+# omit system-wide root/.* and exclude well-known
+# files in /root/ manually...
+root/.bash*
+root/.cache*
+root/.config*
+root/.dbus*
+root/.gnupg*
+root/.lesshst
+root/.local*
+root/.profile*
+root/.rpmdb*
+root/.var*
+root/.viminfo
+root/.vim*
+root/.wget*
diff --git a/etc/ltsp/image-local.omit-excludes b/etc/ltsp/image-local.omit-excludes
new file mode 100644
index 0000000..18d36b8
--- /dev/null
+++ b/etc/ltsp/image-local.omit-excludes
@@ -0,0 +1,2 @@
+root/.*
+etc/ssh/ssh_host_*
diff --git a/etc/ltsp/ltsp.conf.itzks-systems-disklserver.in b/etc/ltsp/ltsp.conf.itzks-systems-disklserver.in
new file mode 100644
index 0000000..b7a3dfb
--- /dev/null
+++ b/etc/ltsp/ltsp.conf.itzks-systems-disklserver.in
@@ -0,0 +1,87 @@
+[server]
+
+# let's default to the Debian Edu 11 diskless workstation
+DEFAULT_IMAGE=dlw+amd64+bullseye
+
+# Debian Edu 10 pretty names
+IPXE_DLW_AMD64_BUSTER_IMG="Debian Edu 10 Diskless Workstation (Squashfs Image)"
+IPXE_DLW_AMD64_BUSTER="Debian Edu 10 Diskless Workstation (NFS rootfs)"
+IPXE_X2GO_DISPLAYMANAGER_AMD64_BUSTER_IMG="X2Go Thin Client (Squashfs, 64 bit, Debian 10, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_AMD64_BUSTER="X2Go Thin Client (NFS rootfs, 64 bit, Debian 10, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_I386_BUSTER_IMG="X2Go Thin Client (Squashfs, 32 bit, Debian 10, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_I386_BUSTER="X2Go Thin Client (NFS rootfs, 32 bit, Debian 10, Anmeldemanager)"
+IPXE_X2GO_MINIDESKTOP_AMD64_BUSTER_IMG="X2Go Thin Client (Squashfs, 64 bit, Debian 10, Desktop)"
+IPXE_X2GO_MINIDESKTOP_AMD64_BUSTER="X2Go Thin Client (NFS rootfs, 64 bit, Debian 10, Desktop)"
+IPXE_X2GO_MINIDESKTOP_I386_BUSTER_IMG="X2Go Thin Client (Squashfs, 32 bit, Debian 10, Desktop)"
+IPXE_X2GO_MINIDESKTOP_I386_BUSTER="X2Go Thin Client (NFS rootfs, 32 bit, Debian 10, Desktop)"
+
+# Debian Edu 11 pretty names
+IPXE_DLW_AMD64_BULLSEYE_IMG="Debian Edu 11 Diskless Workstation (SquashFS Image)"
+IPXE_DLW_AMD64_BULLSEYE="Debian Edu 11 Diskless Workstation (NFS rootfs)"
+IPXE_X2GO_DISPLAYMANAGER_AMD64_BULLSEYE_IMG="X2Go Thin Client (Squashfs, 64 bit, Debian 11, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_AMD64_BULLSEYE="X2Go Thin Client (NFS rootfs, 64 bit, Debian 11, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_I386_BULLSEYE_IMG="X2Go Thin Client (Squashfs, 32 bit, Debian 11, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_I386_BULLSEYE="X2Go Thin Client (NFS rootfs, 32 bit, Debian 11, Anmeldemanager)"
+IPXE_X2GO_MINIDESKTOP_AMD64_BULLSEYE_IMG="X2Go Thin Client (Squashfs, 64 bit, Debian 11, Desktop)"
+IPXE_X2GO_MINIDESKTOP_AMD64_BULLSEYE="X2Go Thin Client (NFS rootfs, 64 bit, Debian 11, Desktop)"
+IPXE_X2GO_MINIDESKTOP_I386_BULLSEYE_IMG="X2Go Thin Client (Squashfs, 32 bit, Debian 11, Desktop)"
+IPXE_X2GO_MINIDESKTOP_I386_BULLSEYE="X2Go Thin Client (NFS rootfs, 32 bit, Debian 11, Desktop)"
+
+# Debian Edu 12 pretty names
+IPXE_DLW_AMD64_BOOKWORM_IMG="Debian Edu 12 Diskless Workstation (SquashFS Image)"
+IPXE_DLW_AMD64_BOOKWORM="Debian Edu 12 Diskless Workstation (NFS rootfs)"
+IPXE_X2GO_DISPLAYMANAGER_AMD64_BOOKWORM_IMG="X2Go Thin Client (Squashfs, 64 bit, Debian 12, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_AMD64_BOOKWORM="X2Go Thin Client (NFS rootfs, 64 bit, Debian 12, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_I386_BOOKWORM_IMG="X2Go Thin Client (Squashfs, 32 bit, Debian 12, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_I386_BOOKWORM="X2Go Thin Client (NFS rootfs, 32 bit, Debian 12, Anmeldemanager)"
+IPXE_X2GO_MINIDESKTOP_AMD64_BOOKWORM_IMG="X2Go Thin Client (Squashfs, 64 bit, Debian 12, Desktop)"
+IPXE_X2GO_MINIDESKTOP_AMD64_BOOKWORM="X2Go Thin Client (NFS rootfs, 64 bit, Debian 12, Desktop)"
+IPXE_X2GO_MINIDESKTOP_I386_BOOKWORM_IMG="X2Go Thin Client (Squashfs, 32 bit, Debian 12, Desktop)"
+IPXE_X2GO_MINIDESKTOP_I386_BOOKWORM="X2Go Thin Client (NFS rootfs, 32 bit, Debian 12, Desktop)"
+
+# Debian Edu 13 (aka testing/unstable) pretty names
+IPXE_DLW_AMD64_TRIXIE_IMG="Debian Edu testing/unstable Diskless Workstation (SquashFS Image)"
+IPXE_DLW_AMD64_TRIXIE="Debian Edu testing/unstable Diskless Workstation (NFS rootfs)"
+IPXE_X2GO_DISPLAYMANAGER_AMD64_TRIXIE_IMG="X2Go Thin Client (Squashfs, 64 bit, Debian 13, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_AMD64_TRIXIE="X2Go Thin Client (NFS rootfs, 64 bit, Debian 13, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_I386_TRIXIE_IMG="X2Go Thin Client (Squashfs, 32 bit, Debian 13, Anmeldemanager)"
+IPXE_X2GO_DISPLAYMANAGER_I386_TRIXIE="X2Go Thin Client (NFS rootfs, 32 bit, Debian 13, Anmeldemanager)"
+IPXE_X2GO_MINIDESKTOP_AMD64_TRIXIE_IMG="X2Go Thin Client (Squashfs, 64 bit, Debian 13, Desktop)"
+IPXE_X2GO_MINIDESKTOP_AMD64_TRIXIE="X2Go Thin Client (NFS rootfs, 64 bit, Debian 13, Desktop)"
+IPXE_X2GO_MINIDESKTOP_I386_TRIXIE_IMG="X2Go Thin Client (Squashfs, 32 bit, Debian 13, Desktop)"
+IPXE_X2GO_MINIDESKTOP_I386_TRIXIE="X2Go Thin Client (NFS rootfs, 32 bit, Debian 13, Desktop)"
+
+# Debian Edu specific
+DNS_SERVER=10.0.2.2
+SEARCH_DOMAIN=intern
+
+KERNEL_PARAMETERS="quiet splash"
+
+ADD_IMAGE_EXCLUDES="/etc/ltsp/image-local.excludes"
+OMIT_IMAGE_EXCLUDES="/etc/ltsp/image-local.omit-excludes"
+
+[common]
+OMIT_FUNCTIONS="pam_main"
+
+[clients]
+
+HOSTS_1="10.0.2.2 tjener.intern tjener"
+HOSTS_2="10.0.2.9 disklserver.intern disklserver"
+
+LIGHTDM_CONF="greeter-hide-users=true"
+
+CUPS_SERVER="ipp.intern"
+
+POST_INIT_USE_FQDN="sed -i '/10.0.2.2/ s/server/tjener.intern tjener/' /etc/hosts"
+POST_INIT_SITESUMMARY="sed -i 's/main-server/ltsp-client/' /etc/sitesummary/hostclass"
+MASK_SYSTEM_SERVICES="apache2 etckeeper icinga2 nmbd smbd systemd-journald isc-dhcp-server"
+# uncomment this to enable SSH access to LTSP clients
+KEEP_SYSTEM_SERVICES="ssh"
+
+# Allow local root logins by setting a password hash for the root user.
+# The hash contains $, making it hard to escape in POST_INIT_x="sed ...".
+# So put sed in a section and call it at POST_INIT like this:
+POST_INIT_SET_ROOT_HASH="section_set_root_hash"
+
+[set_root_hash]
+sed 's|^root:[^:]*:|root:@rootpw@:|' -i /etc/shadow
diff --git a/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_disable-welcome-page b/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_disable-welcome-page
new file mode 100755
index 0000000..07eec74
--- /dev/null
+++ b/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_disable-welcome-page
@@ -0,0 +1,48 @@
+#!/bin/sh
+# Make Debian Edu's show-welcome-page think that the welcome page has already been shown.
+
+set -e
+
+HOMEDIR=/home/$USER
+
+# Allow lookup script to be replaced using /etc/debian-edu/config
+GETDEFAULTHOMEPAGE=$(/usr/share/debian-edu-config/tools/get-default-homepage || true)
+
+if [ -e /etc/debian-edu/config ] ; then
+ . /etc/debian-edu/config
+fi
+
+if [ -n "$GETDEFAULTHOMEPAGE" ] &&
+ echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|LTSP-Server|Minimal' ; then
+ host="$(echo $GETDEFAULTHOMEPAGE | sed -re 's@[^:]+://([^/]+)/.*@\1@')"
+ if [ "x$host" = "xwww" ] || [ "x$host" = "xwww.intern" ]; then
+ for lang in $(echo $LANGCODE | tr : " "); do
+ if wget -q -O /dev/null ${GETDEFAULTHOMEPAGE}index.html.$lang ; then
+ welcomeurl="${GETDEFAULTHOMEPAGE}index.html.$lang"
+ break
+ else
+ welcomeurl=$GETDEFAULTHOMEPAGE || true
+ fi
+ done
+ else
+ welcomeurl=$GETDEFAULTHOMEPAGE || true
+ fi
+else
+ welcomeurl=http://www.skolelinux.org/
+fi
+
+if [ -z "$welcomeurl" ] || [ "about:blank" = "$welcomeurl" ]; then
+ exit 0
+fi
+
+flagdir="$HOMEDIR/.debian-edu"
+flagfile="$flagdir/welcome-page-shown"
+
+if [ ! -f "$flagfile" ] ; then
+ echo "$welcomeurl" > "$flagfile"
+else
+ oldwelcomeurl="$(cat $flagfile)"
+ if [ "$welcomeurl" != "$oldwelcomeurl" ] ; then
+ echo "$welcomeurl" > "$flagfile"
+ fi
+fi
diff --git a/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_gvfs-symlink b/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_gvfs-symlink
new file mode 100755
index 0000000..6253eda
--- /dev/null
+++ b/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_gvfs-symlink
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+UIDNUMBER=$(id -u $USER)
+GIDNUMBER=$(id -g $USER)
+
+if [ -n "$UIDNUMBER" ]; then
+ XDG_RUNTIME_DIR="/run/user/$UIDNUMBER"
+
+ ln -s "$XDG_RUNTIME_DIR/gvfs/" "/home/$USER/Eingebundene-Orte"
+ chown -h ${UIDNUMBER}:${GIDNUMBER} "/home/$USER/Eingebundene-Orte"
+
+fi
diff --git a/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox b/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox
new file mode 100755
index 0000000..90636da
--- /dev/null
+++ b/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+GROUP=$(id -g "$USER")
+HOMEDIR="/home/$USER"
+
+# this is maily for Debian buster or rather Firefox versions that don't support
+# the policies.json file
+
+if [ -e "/usr/share/debian-edu-config/profiles.ini.ff" ]; then
+ mkdir -p "$HOMEDIR/.mozilla/firefox/debian-edu.default"
+ if [ ! -e "$HOMEDIR/.mozilla/firefox/profiles.ini" ]; then
+ cp "/usr/share/debian-edu-config/profiles.ini.ff" "$HOMEDIR/.mozilla/firefox/profiles.ini"
+ fi
+fi
+
+if [ -e "/usr/share/debian-edu-config/installs.ini" ]; then
+ if [ ! -e "$HOMEDIR/.mozilla/firefox/installs.ini" ]; then
+ cp "/usr/share/debian-edu-config/installs.ini" "$HOMEDIR/.mozilla/firefox/installs.ini"
+ fi
+fi
+
+if [ -d "$HOMEDIR/.mozilla" ]; then
+ chmod -R u+w,go-rwx "$HOMEDIR/.mozilla/"
+ chown -R $USER:$GROUP "$HOMEDIR/.mozilla/"
+fi
+
+if [ -e "/usr/share/debian-edu-config/profiles.ini" ]; then
+ mkdir -p "$HOMEDIR/.thunderbird/debian-edu.default"
+ if [ ! -e "$HOMEDIR/.thunderbird/profiles.ini" ]; then
+ cp "/usr/share/debian-edu-config/profiles.ini" "$HOMEDIR/.thunderbird/profiles.ini"
+ fi
+fi
+
+if [ -d "$HOMEDIR/.thunderbird" ]; then
+ chmod -R u+w,go-rwx "$HOMEDIR/.thunderbird/"
+ chown -R $USER:$GROUP "$HOMEDIR/.thunderbird/"
+fi
diff --git a/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_smb-bookmarks b/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_smb-bookmarks
new file mode 100755
index 0000000..5da74c0
--- /dev/null
+++ b/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_smb-bookmarks
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+set -e
+
+# Create GTK/Gnome places bookmark for easy access.
+add_gtk3_place() {
+ SERVER="$1"
+ USER="$2"
+ GROUP="$3"
+ TITLE="$4"
+ SMBPATH="$5"
+
+ if [ -e /home/$USER/.config/gtk-3.0/bookmarks ] && grep -q "$TITLE" "/home/$USER/.config/gtk-3.0/bookmarks"; then
+ # drop bookmark created by /etc/mklocaluser.d/20-debian-edu-config, it lacks the SMBDOMAIN part
+ sed -i /home/$USER/.config/gtk-3.0/bookmarks -e "/$TITLE/d"
+ fi
+
+ if [ ! -e /home/$USER/.config/gtk-3.0/bookmarks ] || ! grep -q "$SMBPATH $TITLE" "/home/$USER/.config/gtk-3.0/bookmarks"; then
+ su - "$USER" -c "mkdir -p \"/home/$USER/.config/gtk-3.0\""
+ echo "$SMBPATH $TITLE" >> "/home/$USER/.config/gtk-3.0/bookmarks"
+ chown $USER:$GROUP "/home/$USER/.config/gtk-3.0/bookmarks"
+ fi
+}
+
+case "$ORIGHOMEDIR" in
+ /*/*/*)
+
+ # Extract FQDN from home directory path (we assume a /skole/<server>/homeX/<user> pattern here)
+ SERVER="$(getent hosts $(echo $ORIGHOMEDIR | cut -d/ -f3) | head -n1 | awk '{print $2}' | cut -d "." -f1)"
+
+ SMBDOMAIN=""
+ sambaSID="$(ldapsearch -LLL -x "(&(uid=$USER)(sambaSID=*))" sambaSID 2>/dev/null | head -n1 | awk '/sambaSID: / { print $2 }' || true)"
+ if [ "$sambaSID" ]; then
+ sambaDomainSID=$(echo $sambaSID | cut -d"-" -f1-7)
+ SMBDOMAIN="$(ldapsearch -LLL -x "(&(sambaDomainName=*)(sambaSID=$sambaSID))" sambaDomainName 2>/dev/null | head -n1 | awk '/sambaDomainName: / { print $2 }' || true);"
+ fi
+
+ if [ "$SMBDOMAIN" ]; then
+
+ # looks like we (still) have a Samba Domain in LDAP, so let's use it
+
+ homepath="$(ldapsearch -LLL -x "(&(uid=$USER)(sambaHomePath=*))" sambaHomePath 2>/dev/null | head -n1 | awk '/sambaHomePath: / { print $2 }' || true)"
+ if [ "$homepath" ] ; then
+
+ SMBPATH=$(echo "smb:$homepath" | sed -e "s|\\\\|//|" -e "s|\\\\|/|" | sed -e "s|smb://|smb://$SMBDOMAIN$USER@|")
+
+ # Update server name from homepath (via SMBPATH)
+ SERVER="$(echo $SMBPATH | cut -d "@" -f2 | cut -d/ -f1)"
+
+ else
+
+ # no sambaHomePath given per user; let's guess it...
+ SMBPATH="smb://$SMBDOMAIN$USER@$SERVER/$USER"
+
+ # and use sever as detected above from ORIGHOMEDIR...
+
+ fi
+
+ else
+
+ # probably no Samba Domain in LDAP (anymore)
+
+ # get the SMBDOMAIN fallback from smb.conf first, but try LDAP later on
+ if [ -e /etc/debian-edu/itzks.school ]; then
+
+ # fallback / cosmetic fix, use school tag as domain
+ SMBDOMAIN="$(cat /etc/debian-edu/itzks.school | head -n1);"
+
+ else
+
+ SMBDOMAIN="SCHULE;"
+
+ fi
+
+ SMBPATH="smb://$SMBDOMAIN$USER@$SERVER/$USER"
+ fi
+
+ GROUP="$(id -ng $USER)"
+ TITLE="$USER on $SERVER via SMB"
+ add_gtk3_place "$SERVER" "$USER" "$GROUP" "$TITLE" "$SMBPATH"
+ ;;
+esac
diff --git a/etc/mklocaluser.d/60-itzks-systems-tablet_add-to-local-groups b/etc/mklocaluser.d/60-itzks-systems-tablet_add-to-local-groups
new file mode 100755
index 0000000..da21948
--- /dev/null
+++ b/etc/mklocaluser.d/60-itzks-systems-tablet_add-to-local-groups
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+groups="audio bluetooth cdrom dip plugdev video netdev scanner lpadmin"
+
+# add additional user account
+if [ -n "$USER" ]; then
+
+ if getent passwd $USER 1>/dev/null; then
+ for g in $groups; do
+ adduser $USER $g
+ done
+ fi
+
+fi
diff --git a/etc/modprobe.d/itzks-systems-common_dsp-fix.conf b/etc/modprobe.d/itzks-systems-common_dsp-fix.conf
new file mode 100644
index 0000000..fbf87d5
--- /dev/null
+++ b/etc/modprobe.d/itzks-systems-common_dsp-fix.conf
@@ -0,0 +1,5 @@
+# use the SOF firmware provided by firmware-sof-signed
+options snd_intel_dspcfg dsp_driver=0
+
+# play sound without the SOF firmware
+#options snd_intel_dspcfg dsp_driver=1
diff --git a/etc/network/if-up.d/itzks-autofs b/etc/network/if-up.d/itzks-autofs
deleted file mode 100755
index 974a1c6..0000000
--- a/etc/network/if-up.d/itzks-autofs
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if test -e /etc/network/if-up.d/autofs; then exit 0; fi
-if test -e /etc/network/if-up.d/debian-edu; then exit 0; fi
-
-invoke-rc.d --quiet autofs restart
-
diff --git a/etc/network/if-up.d/itzks-cups b/etc/network/if-up.d/itzks-cups
deleted file mode 100755
index c07f740..0000000
--- a/etc/network/if-up.d/itzks-cups
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# DISABLED for Debian jessie and beyond...
-
-#if test -e /etc/network/if-up.d/cups; then exit 0; fi
-#if test -e /etc/network/if-up.d/debian-edu; then exit 0; fi
-#
-#invoke-rc.d --quiet cups restart
-
diff --git a/etc/skel/.debian-edu/welcome-page-shown b/etc/skel/.debian-edu/welcome-page-shown
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/etc/skel/.debian-edu/welcome-page-shown
diff --git a/etc/skel/.mozilla/firefox/debian-edu.default/pkcs11.txt b/etc/skel/.mozilla/firefox/debian-edu.default/pkcs11.txt
index 93e31c4..31d2f18 100644
--- a/etc/skel/.mozilla/firefox/debian-edu.default/pkcs11.txt
+++ b/etc/skel/.mozilla/firefox/debian-edu.default/pkcs11.txt
@@ -1,4 +1,3 @@
library=/usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-trust.so
-library=/usr/lib/i386-linux-gnu/pkcs11/p11-kit-trust.so
name=PKCS#11 Trust Module
NSS=trustOrder=100
diff --git a/etc/skel/.pki/nssdb/pkcs11.txt b/etc/skel/.pki/nssdb/pkcs11.txt
index 93e31c4..31d2f18 100644
--- a/etc/skel/.pki/nssdb/pkcs11.txt
+++ b/etc/skel/.pki/nssdb/pkcs11.txt
@@ -1,4 +1,3 @@
library=/usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-trust.so
-library=/usr/lib/i386-linux-gnu/pkcs11/p11-kit-trust.so
name=PKCS#11 Trust Module
NSS=trustOrder=100
diff --git a/etc/squid-deb-proxy/mirror-dstdomain.acl.d/90-itzks-systems-faiserver b/etc/squid-deb-proxy/mirror-dstdomain.acl.d/90-itzks-systems-faiserver
new file mode 100644
index 0000000..06dae00
--- /dev/null
+++ b/etc/squid-deb-proxy/mirror-dstdomain.acl.d/90-itzks-systems-faiserver
@@ -0,0 +1,17 @@
+# allow squid-deb-proxy'ing of packages on official FAI APT repository
+fai-project.org
+
+# allow squid-deb-proxy'ing of ITZkS packages
+packages.it-zukunft-schule.de
+
+# Arctica Project (builds of Ayatana Indicators, nx-libs, etc)
+packages.arctica-project.org
+
+# X2Go
+packages.x2go.org
+
+# DEB Multimedia
+www.deb-multimedia.org
+
+# Geogebra
+www.geogebra.net
diff --git a/etc/squid/conf.d/itzks-systems-mainserver.conf b/etc/squid/conf.d/itzks-systems-mainserver.conf
new file mode 100644
index 0000000..236a72d
--- /dev/null
+++ b/etc/squid/conf.d/itzks-systems-mainserver.conf
@@ -0,0 +1 @@
+dns_v4_first on
diff --git a/etc/standardskriver.cfg b/etc/standardskriver.cfg
index 5f0b9e3..a36235d 100644
--- a/etc/standardskriver.cfg
+++ b/etc/standardskriver.cfg
@@ -3,29 +3,6 @@ enable = yes
order = machine groups
delete lpoptions = yes
-[machine.EBG]
-
-# Computer-Raum H9
-10.1.1.0/24 = H9-printer
-
-# Lehrer-PCs in Lehrmittelbücherei
-10.0.2.51 = BuechLehrmittel-printer
-10.0.2.52 = BuechLehrmittel-printer
-10.0.2.55 = BuechLehrmittel-printer
-10.0.2.56 = BuechLehrmittel-printer
-
-# Drucker, stellv. Schulleiter
-10.0.5.51 = D02-printer
-
-# Notebook am Tresen der Schulbibliothek
-10.6.0.49 = Schulbibliothek-printer
-
-# DLWs in der Schulbibliothek
-10.6.0.1 = Bibliothek-printer
-10.6.0.2 = Bibliothek-printer
-10.6.0.3 = Bibliothek-printer
-10.6.0.4 = Bibliothek-printer
-
[machine.FWSECK]
# keine Standard-Drucker für PCs an der FWSECK eingerichtet
diff --git a/examples/backup/dirvish/contentserver.intern/contentserver.intern_boot/dirvish/default.conf b/examples/backup/dirvish/contentserver.intern/contentserver.intern_boot/dirvish/default.conf
new file mode 100644
index 0000000..2990787
--- /dev/null
+++ b/examples/backup/dirvish/contentserver.intern/contentserver.intern_boot/dirvish/default.conf
@@ -0,0 +1,8 @@
+client: root@contentserver.intern
+tree: /boot
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ _NO-BACKUP_/** \ No newline at end of file
diff --git a/examples/backup/dirvish/contentserver.intern/contentserver.intern_usr/dirvish/default.conf b/examples/backup/dirvish/contentserver.intern/contentserver.intern_usr/dirvish/default.conf
new file mode 100644
index 0000000..25889ec
--- /dev/null
+++ b/examples/backup/dirvish/contentserver.intern/contentserver.intern_usr/dirvish/default.conf
@@ -0,0 +1,10 @@
+client: root@contentserver.intern
+tree: /usr
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ src/**/*.o
+ local/src/**/*.o
+
diff --git a/examples/backup/dirvish/contentserver.intern/contentserver.intern_var/dirvish/default.conf b/examples/backup/dirvish/contentserver.intern/contentserver.intern_var/dirvish/default.conf
new file mode 100644
index 0000000..944ebe5
--- /dev/null
+++ b/examples/backup/dirvish/contentserver.intern/contentserver.intern_var/dirvish/default.conf
@@ -0,0 +1,11 @@
+client: root@contentserver.intern
+tree: /var
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ lib/nfs/*tab
+ cache/apt/archives/*.deb
+ cache/man/**
+ tmp/**
diff --git a/examples/backup/dirvish/disklserver.intern/disklserver.intern_boot/dirvish/default.conf b/examples/backup/dirvish/disklserver.intern/disklserver.intern_boot/dirvish/default.conf
new file mode 100644
index 0000000..7e698c4
--- /dev/null
+++ b/examples/backup/dirvish/disklserver.intern/disklserver.intern_boot/dirvish/default.conf
@@ -0,0 +1,8 @@
+client: root@disklserver.intern
+tree: /boot
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ _NO-BACKUP_/** \ No newline at end of file
diff --git a/examples/backup/dirvish/disklserver.intern/disklserver.intern_usr/dirvish/default.conf b/examples/backup/dirvish/disklserver.intern/disklserver.intern_usr/dirvish/default.conf
new file mode 100644
index 0000000..0704a33
--- /dev/null
+++ b/examples/backup/dirvish/disklserver.intern/disklserver.intern_usr/dirvish/default.conf
@@ -0,0 +1,10 @@
+client: root@disklserver.intern
+tree: /usr
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ src/**/*.o
+ local/src/**/*.o
+
diff --git a/examples/backup/dirvish/disklserver.intern/disklserver.intern_var/dirvish/default.conf b/examples/backup/dirvish/disklserver.intern/disklserver.intern_var/dirvish/default.conf
new file mode 100644
index 0000000..1b5b8a4
--- /dev/null
+++ b/examples/backup/dirvish/disklserver.intern/disklserver.intern_var/dirvish/default.conf
@@ -0,0 +1,11 @@
+client: root@disklserver.intern
+tree: /var
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ lib/nfs/*tab
+ cache/apt/archives/*.deb
+ cache/man/**
+ tmp/**
diff --git a/examples/backup/dirvish/faiserver.intern/faiserver.intern_boot/dirvish/default.conf b/examples/backup/dirvish/faiserver.intern/faiserver.intern_boot/dirvish/default.conf
new file mode 100644
index 0000000..5e4cfbf
--- /dev/null
+++ b/examples/backup/dirvish/faiserver.intern/faiserver.intern_boot/dirvish/default.conf
@@ -0,0 +1,8 @@
+client: root@faiserver.intern
+tree: /boot
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ _NO-BACKUP_/** \ No newline at end of file
diff --git a/examples/backup/dirvish/faiserver.intern/faiserver.intern_rootfs/dirvish/default.conf b/examples/backup/dirvish/faiserver.intern/faiserver.intern_rootfs/dirvish/default.conf
new file mode 100644
index 0000000..2c838d7
--- /dev/null
+++ b/examples/backup/dirvish/faiserver.intern/faiserver.intern_rootfs/dirvish/default.conf
@@ -0,0 +1,18 @@
+client: root@faiserver.intern
+tree: /
+devices: 1
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ tmp/**
+ proc/
+ sys/
+ etc/mtab
+ var/lib/nfs/*tab
+ var/cache/apt/archives/*.deb
+ var/cache/man/**
+ var/tmp/**
+ usr/src/**/*.o
+ usr/local/src/**/*.o
diff --git a/examples/backup/dirvish/faiserver.intern/faiserver.intern_srv/dirvish/default.conf b/examples/backup/dirvish/faiserver.intern/faiserver.intern_srv/dirvish/default.conf
new file mode 100644
index 0000000..92dc1d7
--- /dev/null
+++ b/examples/backup/dirvish/faiserver.intern/faiserver.intern_srv/dirvish/default.conf
@@ -0,0 +1,9 @@
+client: root@faiserver.intern
+tree: /srv
+devices: 1
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ _NO-BACKUP_/**
diff --git a/examples/backup/dirvish/faiserver.intern/faiserver.intern_usr/dirvish/default.conf b/examples/backup/dirvish/faiserver.intern/faiserver.intern_usr/dirvish/default.conf
new file mode 100644
index 0000000..8a4de50
--- /dev/null
+++ b/examples/backup/dirvish/faiserver.intern/faiserver.intern_usr/dirvish/default.conf
@@ -0,0 +1,10 @@
+client: root@faiserver.intern
+tree: /usr
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ src/**/*.o
+ local/src/**/*.o
+
diff --git a/examples/backup/dirvish/faiserver.intern/faiserver.intern_var/dirvish/default.conf b/examples/backup/dirvish/faiserver.intern/faiserver.intern_var/dirvish/default.conf
new file mode 100644
index 0000000..080920e
--- /dev/null
+++ b/examples/backup/dirvish/faiserver.intern/faiserver.intern_var/dirvish/default.conf
@@ -0,0 +1,11 @@
+client: root@faiserver.intern
+tree: /var
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ lib/nfs/*tab
+ cache/apt/archives/*.deb
+ cache/man/**
+ tmp/**
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf
index 49e925d..226a8df 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /boot
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf
index 712ea02..ada6338 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /
devices: 1
xdev: 1
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf
index b50a6bb..477db82 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /skole/tjener/group0
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf
index f17f3d8..8fb5706 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /skole/tjener/group1
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf
index f131194..b69467c 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /skole/tjener/home0
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf
index e63c1fc..4a63100 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /skole/tjener/home1
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf
index 6fc6531..1a430b9 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /skole/tjener/transfer
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf
index 57d2775..974a780 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /usr
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_var+log/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_var+log/dirvish/default.conf
new file mode 100644
index 0000000..b9fc910
--- /dev/null
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_var+log/dirvish/default.conf
@@ -0,0 +1,6 @@
+client: root@tjener.backbone
+tree: /var/log
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf
index 9e5a9b5..abb8e3e 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /var
xdev: 1
index: gzip
diff --git a/examples/backup/master.conf.dirvish b/examples/backup/master.conf.dirvish
index d860108..7e4443b 100644
--- a/examples/backup/master.conf.dirvish
+++ b/examples/backup/master.conf.dirvish
@@ -6,12 +6,13 @@
bank:
/srv/dirvish/virt-man-01.backbone
- /srv/dirvish/virt-man-02.backbone
- /srv/dirvish/virt-man-03.backbone
+# /srv/dirvish/virt-man-02.backbone
+# /srv/dirvish/virt-man-03.backbone
/srv/dirvish/tjener.intern
/srv/dirvish/disklserver.intern
- /srv/dirvish/ltspserver00.intern
- /srv/dirvish/contentserver.intern
+ /srv/dirvish/faiserver.intern
+# /srv/dirvish/ltspserver00.intern
+# /srv/dirvish/contentserver.intern
image-perm: 700
meta-perm: 600
@@ -29,26 +30,38 @@ exclude:
_NO-BACKUP_
Runall:
virt-man-01.backbone_rootfs 22:00
- virt-man-02.backbone_rootfs 22:00
- virt-man-03.backbone_rootfs 22:00
+# virt-man-02.backbone_rootfs 22:00
+# virt-man-03.backbone_rootfs 22:00
tjener.intern_rootfs 22:00
tjener.intern_boot 22:00
tjener.intern_usr 22:00
tjener.intern_var 22:00
+ tjener.intern_var+log 22:00
tjener.intern_skole+tjener+home0 22:00
tjener.intern_skole+tjener+home1 22:00
tjener.intern_skole+tjener+group0 22:00
tjener.intern_skole+tjener+group1 22:00
tjener.intern_skole+tjener+transfer 22:00
disklserver.intern_rootfs 22:00
+ disklserver.intern_boot 22:00
+ disklserver.intern_usr 22:00
+ disklserver.intern_var 22:00
disklserver.intern_srv 22:00
- ltspserver00.intern_rootfs 22:00
- ltspserver00.intern_boot 22:00
- ltspserver00.intern_usr 22:00
- ltspserver00.intern_var 22:00
- ltspserver00.intern_opt 22:00
- contentserver.intern_rootfs 22:00
- contentserver.intern_srv 22:00
+ faiserver.intern_rootfs 22:00
+ faiserver.intern_boot 22:00
+ faiserver.intern_usr 22:00
+ faiserver.intern_var 22:00
+ faiserver.intern_srv 22:00
+# ltspserver00.intern_rootfs 22:00
+# ltspserver00.intern_boot 22:00
+# ltspserver00.intern_usr 22:00
+# ltspserver00.intern_var 22:00
+# ltspserver00.intern_opt 22:00
+# contentserver.intern_rootfs 22:00
+# contentserver.intern_boot 22:00
+# contentserver.intern_usr 22:00
+# contentserver.intern_var 22:00
+# contentserver.intern_srv 22:00
expire-default: +15 days
expire-rule:
diff --git a/examples/disklserver/README.tftp b/examples/disklserver/README.tftp
deleted file mode 100644
index 30b2265..0000000
--- a/examples/disklserver/README.tftp
+++ /dev/null
@@ -1,10 +0,0 @@
-This folder contains a PXE boot environments that provides the
-boot menu for diskless workstations as provided by a standalone
-Debian Edu based diskless chroot image server (aka disklserver).
-
-Installation steps:
-
- 1. Untar these files to disklserver:/srv/tftp
-
- $ tar xvz -C /srv -f disklserver-tftp.tar.gz
-
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_background.svg b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_background.svg
new file mode 100644
index 0000000..e3c6580
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_background.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.0"
+ width="361.04999"
+ height="271.92001"
+ viewBox="0 0 361.244 270.933"
+ id="svg2"
+ xml:space="preserve"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="bg-anim.svg"><metadata
+ id="metadata30"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1598"
+ inkscape:window-height="879"
+ id="namedview28"
+ showgrid="false"
+ inkscape:zoom="2"
+ inkscape:cx="132.20018"
+ inkscape:cy="132.38275"
+ inkscape:window-x="0"
+ inkscape:window-y="19"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <defs
+ id="defs4"><inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 135.96001 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="361.04999 : 135.96001 : 1"
+ inkscape:persp3d-origin="180.52499 : 90.640004 : 1"
+ id="perspective32" /><linearGradient
+ id="linearGradient2802"><stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0"
+ id="stop2804" /><stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop2806" /></linearGradient><linearGradient
+ id="linearGradient2852"><stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0"
+ id="stop2854" /><stop
+ style="stop-color:#6699ff;stop-opacity:0"
+ offset="1"
+ id="stop2856" /></linearGradient><linearGradient
+ id="linearGradient2844"><stop
+ style="stop-color:#deeaed;stop-opacity:1"
+ offset="0"
+ id="stop2846" /><stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="1"
+ id="stop2848" /></linearGradient><linearGradient
+ id="linearGradient1948"><stop
+ style="stop-color:#b2856b;stop-opacity:0.4235808;"
+ offset="0"
+ id="stop1950" /><stop
+ style="stop-color:#6699ff;stop-opacity:0"
+ offset="1"
+ id="stop1952" /></linearGradient>
+ <style
+ type="text/css"
+ id="style6" />
+ <linearGradient
+ x1="202.494"
+ y1="135.464"
+ x2="207.00999"
+ y2="135.464"
+ id="id0"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0"
+ id="stop9" />
+ <stop
+ style="stop-color:#6e707f;stop-opacity:1"
+ offset="1"
+ id="stop11" />
+ </linearGradient>
+
+
+
+
+
+
+
+
+
+ <linearGradient
+ x1="202.494"
+ y1="135.464"
+ x2="207.00999"
+ y2="135.464"
+ id="linearGradient1942"
+ xlink:href="#id0"
+ gradientUnits="userSpaceOnUse" /><linearGradient
+ x1="107.24445"
+ y1="268.11078"
+ x2="107.64762"
+ y2="207.717"
+ id="linearGradient1954"
+ xlink:href="#linearGradient1948"
+ gradientUnits="userSpaceOnUse" /><linearGradient
+ x1="278.59366"
+ y1="-49.590809"
+ x2="133.85397"
+ y2="120.54888"
+ id="linearGradient2808"
+ xlink:href="#linearGradient2802"
+ gradientUnits="userSpaceOnUse" /></defs>
+
+
+ <rect
+ style="fill:#800000;fill-opacity:1"
+ id="hintergrund"
+ height="270.92899"
+ width="361.23801"
+ y="0.00456294"
+ x="-361.23801"
+ class="fil0"
+ transform="scale(-1,1)">
+ <animateColor
+ attributeName="fill"
+ attributeType="XML"
+ from="#000000"
+ to="#246ed8"
+ begin="0s"
+ dur="4s"
+ fill="freeze"
+ id="animateColor24" />
+ </rect>
+
+
+ <path
+ d="M 162.557,0.0045 L 0,0.0045 L 0,57.8027 C 0,146.6071 334.145,182.1287 334.145,270.9327 L 334.145,270.9327 C 334.145,182.1283 162.557,88.8087 162.557,0.0037 L 162.557,0.0045 z "
+ style="fill:url(#linearGradient2808);fill-opacity:1"
+ id="path19" />
+
+
+</svg> \ No newline at end of file
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_start b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_start
new file mode 100755
index 0000000..6165817
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_start
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Copyright (C) 2010-2019 by X2Go project, https://wiki.x2go.org
+# Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+# X2Go is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# X2Go is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# make sure pulseaudio can be reached via TCP from the X2Go Server side...
+/usr/bin/pactl 'load-module' 'module-native-protocol-tcp' 'auth-ip-acl=127.0.0.1;::1'
+
+/usr/lib/x2go/x2goclient --no-menu \
+ --maximize \
+ --link=lan \
+ --kbd-type=auto \
+ --set-kbd=1 \
+ --geometry=fullscreen \
+ --read-exports-from=~/export \
+ --no-session-edit \
+ --close-disconnect \
+ --session=X2Go.Example \
+ --add-to-known-hosts
+
+#/usr/libx/x2go/x2goclient --no-menu \
+# --maximize \
+# --link=lan \
+# --kbd-type=auto \
+# --set-kbd=1 \
+# --geometry=fullscreen \
+# --read-exports-from=~/export \
+# --broker-url=https://x2gobroker.intern:8080/plain/zeroconf \
+# --broker-autologoff \
+# --add-to-known-hosts
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init
new file mode 100755
index 0000000..0e56c95
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Copyright (C) 2007-2019 X2Go Project - https://wiki.x2go.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Copyright (C) 2011-2019 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+set -e
+
+run-parts /etc/x2go/x2gothinclient_init.d/
+
+exit 0
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/005_x2gothinclient-wipe-home b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/005_x2gothinclient-wipe-home
new file mode 100755
index 0000000..ebf08b1
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/005_x2gothinclient-wipe-home
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Copyright (C) 2010-2019 by X2Go project, https://wiki.x2go.org
+# Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+# X2Go is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# X2Go is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+if [ -z "$X2GO_HANDLE_DAEMON" ]; then
+ if [ -d ~x2gothinclient ]; then
+ find ~x2gothinclient -mindepth 1 -type f | egrep -v "(\.Xauthority|.dmrc)" | while read file; do
+ rm -vf "$file"
+ done
+ find ~x2gothinclient -mindepth 1 -type d -delete
+ fi
+fi
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/010_x2gothinclient-fresh-home b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/010_x2gothinclient-fresh-home
new file mode 100755
index 0000000..2417a24
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/010_x2gothinclient-fresh-home
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Copyright (C) 2010-2019 by X2Go project, https://wiki.x2go.org
+# Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+# X2Go is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# X2Go is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+if [ -z "$X2GO_HANDLE_DAEMON" ]; then
+ mkdir -p ~x2gothinclient
+ mkdir -p ~x2gothinclient/.x2goclient
+ if [ -e /etc/x2go/x2gothinclient_sessions ]; then
+ cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions
+ fi
+ if [ -e /etc/x2go/freerdp/known_hosts ]; then
+ mkdir -p ~x2gothinclient/.freerdp
+ cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts
+ fi
+ if [ -e /etc/x2go/freerdp/known_hosts2 ]; then
+ mkdir -p ~x2gothinclient/.config/freerdp
+ cp /etc/x2go/freerdp/known_hosts2 ~x2gothinclient/.config/freerdp/known_hosts2
+ fi
+ if [ -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ]; then
+ mkdir -p ~x2gothinclient/Desktop
+ cp /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/
+ chmod 0700 ~x2gothinclient/Desktop/x2gothinclient-minidesktop.desktop
+ fi
+ mkdir -p ~x2gothinclient/.kde
+ mkdir -p ~x2gothinclient/.kde/socket-`hostname`
+ mkdir -p ~x2gothinclient/mounts
+ mkdir -p ~x2gothinclient/.gnupg
+ echo -e "pinentry-program /usr/bin/pinentry-x2go\nenable-ssh-support">~x2gothinclient/.gnupg/gpg-agent.conf
+ mkdir -p ~x2gothinclient/export
+ mkdir -p ~x2gothinclient/logins
+ mkdir -p ~x2gothinclient/.ssh
+ mkdir -p ~x2gothinclient/.x2go
+ chown x2gothinclient:x2gothinclient ~x2gothinclient -Rf
+ chmod go-rwx ~x2gothinclient -Rf
+fi
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/950_x2gothinclient-minidesktop b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/950_x2gothinclient-minidesktop
new file mode 100755
index 0000000..023e210
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/950_x2gothinclient-minidesktop
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Copyright (C) 2010-2019 by X2Go project, https://wiki.x2go.org
+# Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+# X2Go is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# X2Go is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+if [ -d "/lib/live/config" ] || [ -e "/usr/share/doc/x2gothinclient-minidesktop" ]; then
+ . /etc/X11/Xsession
+fi
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_sessions b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_sessions
new file mode 100644
index 0000000..750a5c4
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_sessions
@@ -0,0 +1,66 @@
+[20100623163928371]
+defsndport = false
+useiconv = false
+iconvfrom = ISO8859-15
+height = 768
+export =
+speed = 4
+fullscreen = true
+width = 1024
+quality = 9
+xdmcpserver = localhost
+soundtunnel = 1
+rdpoptions =
+soundsystem = pulse
+print = 1
+type = auto
+sndport = 4713
+usekbd = true
+fstunnel = true
+applications = OFFICE, WWWBROWSER, MAILCLIENT, TERMINAL
+host = 192.168.0.254
+link = ADSL
+user = <USER>
+key =
+startsoundsystem = false
+icon =
+sound = true
+rootless = false
+name = X2Go.EXAMPLE
+iconvto = UTF-8
+rdpserver =
+useexports = true
+command = MATE
+dpi = 96
+sshport = 22
+setdpi = false
+pack = 16m-jpeg
+
+[20120607130604224872]
+height = 768
+export =
+fullscreen = true
+useexports = 1
+width = 1024
+speed = 4
+rdpoptions =
+soundsystem = pulse
+print = true
+type = auto
+sndport = 4713
+usekbd = true
+host = rdpserver.your-intranet.local
+multidisp=false
+sound=false
+rootless=false
+name=DirectRDP.Example
+command=RDP
+dpi=96
+published=false
+setdpi=false
+user=<USER>
+maxdim=false
+rdpclient=xfreerdpnew
+directrdpsettings=/d:YOUR-DOMAIN /sound:sys:pulse /cert-ignore
+rdpport=3389
+directrdp=true
diff --git a/examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg b/examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg
deleted file mode 100644
index 87bc738..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# German
-LABEL localboot-generic
- MENU LABEL Von Festplatte ^starten
- localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/localboot-mswin.cfg b/examples/disklserver/tftp/_common_/debian-edu/localboot-mswin.cfg
deleted file mode 100644
index dc38819..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/localboot-mswin.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# German
-LABEL localboot-mswin
- MENU LABEL MS ^Windows starten
- localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg
deleted file mode 100644
index 359c59c..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL ltsp-diskless-jessie
- MENU LABEL ^Diskless Workstation (Debian Edu 8.0) [NFS]
- MENU DEFAULT
- KERNEL ltsp/i386+jessie/vmlinuz
- APPEND initrd=ltsp/i386+jessie/initrd.img init=/sbin/init-ltsp nfsroot=/opt/ltsp/i386+jessie,v3,tcp,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet ipappend 2
diff --git a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg
deleted file mode 100644
index 3a2d71a..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-LABEL ltsp-diskless-stretch
- MENU LABEL ^Diskless Workstation (Debian Edu 9.0) [NFS]
-# MENU DEFAULT
- KERNEL ltsp/amd64+stretch/vmlinuz
- APPEND initrd=ltsp/amd64+stretch/initrd.img init=/sbin/init-ltsp nfsroot=/opt/ltsp/amd64+stretch,v3,tcp,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet splash ipappend
-
-LABEL ltsp-diskless-stretch-NBD
- MENU LABEL ^Diskless Workstation (Debian Edu 9.0) [NBD]
-# MENU DEFAULT
- KERNEL ltsp/amd64+stretch/vmlinuz
- APPEND append ro initrd=ltsp/amd64+stretch/initrd.img init=/sbin/init-ltsp quiet root=/dev/nbd0 nbdroot=/opt/ltsp/amd64_stretch splash
- IPAPPEND 3
-
diff --git a/examples/disklserver/tftp/_common_/debian-edu/memtest.cfg b/examples/disklserver/tftp/_common_/debian-edu/memtest.cfg
deleted file mode 100644
index 8bf162a..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/memtest.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-LABEL memtest86+
- MENU LABEL Speichertest (memtest86+)
- kernel debian-edu/memtest86+.bin
-LABEL memtest86
- MENU LABEL Speichertest (memtest86)
- kernel debian-edu/memtest86.bin
diff --git a/examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg b/examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg
deleted file mode 100644
index ed5660d..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL mint-workstation
- MENU LABEL Linux Mint
- localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg b/examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg
deleted file mode 100644
index 798b022..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL skolelinux-workstation
- MENU LABEL Debian Edu/Skolelinux Arbeitsstation
- localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg b/examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg
deleted file mode 100644
index 11dc813..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL ubuntu-workstation
- MENU LABEL Ubuntu GNU/Linux
- localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg
deleted file mode 100644
index 18ccd4c..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-LABEL x2go-tce
- MENU LABEL ^X2Go Thin Client (i486)
- KERNEL x2go/i386/vmlinuz
- APPEND initrd=x2go/i386/initrd.img nfsroot=/opt/x2gothinclient/chroot,v3,tcp,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet
diff --git a/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/initrd.img b/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/initrd.img
deleted file mode 120000
index cd8993f..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/initrd.img
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/amd64+stretch/initrd.img \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/vmlinuz b/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/vmlinuz
deleted file mode 120000
index f063f8e..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/amd64+stretch/vmlinuz \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386+jessie/initrd.img b/examples/disklserver/tftp/_common_/ltsp/i386+jessie/initrd.img
deleted file mode 120000
index 1e57586..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/i386+jessie/initrd.img
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/i386+jessie/boot/initrd.img \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386+jessie/vmlinuz b/examples/disklserver/tftp/_common_/ltsp/i386+jessie/vmlinuz
deleted file mode 120000
index 46cc704..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/i386+jessie/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/i386+jessie/boot/vmlinuz \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/pxelinux/jessie/pxelinux.0 b/examples/disklserver/tftp/_common_/pxelinux/jessie/pxelinux.0
deleted file mode 120000
index f723d02..0000000
--- a/examples/disklserver/tftp/_common_/pxelinux/jessie/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/pxelinux/stretch/pxelinux.0 b/examples/disklserver/tftp/_common_/pxelinux/stretch/pxelinux.0
deleted file mode 120000
index f723d02..0000000
--- a/examples/disklserver/tftp/_common_/pxelinux/stretch/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/syslinux/jessie/syslinux b/examples/disklserver/tftp/_common_/syslinux/jessie/syslinux
deleted file mode 120000
index 7bea767..0000000
--- a/examples/disklserver/tftp/_common_/syslinux/jessie/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/syslinux/stretch/syslinux b/examples/disklserver/tftp/_common_/syslinux/stretch/syslinux
deleted file mode 120000
index 7bea767..0000000
--- a/examples/disklserver/tftp/_common_/syslinux/stretch/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/x2go/i386/initrd.img b/examples/disklserver/tftp/_common_/x2go/i386/initrd.img
deleted file mode 120000
index 4f0f0b5..0000000
--- a/examples/disklserver/tftp/_common_/x2go/i386/initrd.img
+++ /dev/null
@@ -1 +0,0 @@
-/opt/x2gothinclient/chroot/boot/initrd.img \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/x2go/i386/vmlinuz b/examples/disklserver/tftp/_common_/x2go/i386/vmlinuz
deleted file mode 120000
index 74fb488..0000000
--- a/examples/disklserver/tftp/_common_/x2go/i386/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-/opt/x2gothinclient/chroot/boot/vmlinuz \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index 88a684c..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-include debian-edu/localboot-generic.cfg
-MENU SEPARATOR
-include debian-edu/ltsp-diskless-stretch.cfg
-include debian-edu/ltsp-diskless-jessie.cfg
-#include debian-edu/x2go-tce.cfg
-MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout localboot-generic
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg
deleted file mode 120000
index 08a2e34..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/localboot-generic.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg
deleted file mode 120000
index 209d4f9..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/ltsp-diskless-jessie.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-stretch.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-stretch.cfg
deleted file mode 120000
index 7cf19dd..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-stretch.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/ltsp-diskless-stretch.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest.cfg
deleted file mode 100644
index 7da6b48..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL memtest86+
- MENU LABEL Speichertest (memtest86+)
- kernel debian-edu/memtest86+.bin
-LABEL memtest86
- MENU LABEL Speichertest (memtest86)
- kernel debian-edu/memtest86.bin
-
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/ltsp b/examples/disklserver/tftp/diskless+localdisk+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0 b/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux b/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/diskless+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index bc7b885..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-include debian-edu/ltsp-diskless-stretch.cfg
-include debian-edu/ltsp-diskless-jessie.cfg
-MENU SEPARATOR
-#include debian-edu/x2go-tce.cfg
-#MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout ltsp-diskless-jessie
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-jessie.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-jessie.cfg
deleted file mode 120000
index 209d4f9..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-jessie.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/ltsp-diskless-jessie.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-stretch.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-stretch.cfg
deleted file mode 120000
index 7cf19dd..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-stretch.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/ltsp-diskless-stretch.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/ltsp b/examples/disklserver/tftp/diskless+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/diskless+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/pxelinux.0 b/examples/disklserver/tftp/diskless+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/diskless+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/diskless+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/diskless+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/syslinux b/examples/disklserver/tftp/diskless+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/diskless+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/mint+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index 97b819a..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-include debian-edu/mint-workstation.cfg
-MENU SEPARATOR
-#include debian-edu/x2go-tce.cfg
-#MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout mint-workstation \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/mint-workstation.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/mint-workstation.cfg
deleted file mode 120000
index aefcc8b..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/mint-workstation.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/mint-workstation.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/ltsp b/examples/disklserver/tftp/mint+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/mint+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/pxelinux.0 b/examples/disklserver/tftp/mint+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/mint+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/mint+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/mint+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/syslinux b/examples/disklserver/tftp/mint+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/mint+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index 4f887d3..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-include debian-edu/skolelinux-workstation.cfg
-MENU SEPARATOR
-#include debian-edu/x2go-tce.cfg
-#MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout skolelinux-workstation \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg
deleted file mode 120000
index e018427..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/skolelinux-workstation.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/ltsp b/examples/disklserver/tftp/skolelinux+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0 b/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/skolelinux+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/syslinux b/examples/disklserver/tftp/skolelinux+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index a88e510..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-include debian-edu/ubuntu-workstation.cfg
-MENU SEPARATOR
-#include debian-edu/x2go-tce.cfg
-#MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout ubuntu-workstation \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg
deleted file mode 120000
index 993f00a..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/ubuntu-workstation.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/ltsp b/examples/disklserver/tftp/ubuntu+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0 b/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/ubuntu+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/syslinux b/examples/disklserver/tftp/ubuntu+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/windows+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index 30f1cef..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-include debian-edu/localboot-mswin.cfg
-MENU SEPARATOR
-#include debian-edu/x2go-tce.cfg
-#MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout localboot-mswin \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/localboot-mswin.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/localboot-mswin.cfg
deleted file mode 120000
index ad6b28d..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/localboot-mswin.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/localboot-mswin.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/ltsp b/examples/disklserver/tftp/windows+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/windows+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/pxelinux.0 b/examples/disklserver/tftp/windows+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/windows+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/windows+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/windows+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/syslinux b/examples/disklserver/tftp/windows+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/windows+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/x2go-tce/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg b/examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg
deleted file mode 100644
index 4013474..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-include debian-edu/x2go-tce.cfg
-MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 30
-ontimeout x2go-tce
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg b/examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin b/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86.bin b/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/ltsp b/examples/disklserver/tftp/x2go-tce/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/x2go-tce/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/pxelinux.0 b/examples/disklserver/tftp/x2go-tce/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/x2go-tce/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/pxelinux.cfg/default b/examples/disklserver/tftp/x2go-tce/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/x2go-tce/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/syslinux b/examples/disklserver/tftp/x2go-tce/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/x2go-tce/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/x2gothinclient-settings.conf b/examples/disklserver/x2gothinclient-settings.conf
new file mode 100644
index 0000000..42115dd
--- /dev/null
+++ b/examples/disklserver/x2gothinclient-settings.conf
@@ -0,0 +1,61 @@
+# Copyright (C) 2010-2021 by X2Go project, http://wiki.x2go.org
+# Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
+# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+# X2Go is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# X2Go is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# select the TCE flavour (classical: "displaymanager", minimal MATE desktop shell: "minidesktop")
+TC_FLAVOUR="minidesktop"
+
+# Distro codename to use...
+TC_DISTRO_CODENAME="bullseye"
+
+# Architecture of the chroot...
+TC_DISTRO_ARCH="amd64"
+
+# path to X2Go thin client chroot
+TC_CHROOT="/srv/ltsp/x2go-${TC_FLAVOUR}+${TC_DISTRO_ARCH}+${TC_DISTRO_CODENAME}"
+
+# path to the X2Go thin client configuration
+TC_CONFIG="/etc/ltsp/settings_x2go-${TC_FLAVOUR}+${TC_DISTRO_ARCH}+${TC_DISTRO_CODENAME}"
+
+# shell to use when maintaining X2Go thin client chroot manually
+TC_SHELL="bash"
+
+# Use a http/ftp proxy during debootstrap (leave empty if direct connections to http/ftp are allowed)
+#TC_HTTP_PROXY="http://webcache.intern:3128"
+#TC_HTTPS_PROXY="http://webcache.intern:3128"
+#TC_FTP_PROXY="http://webcache.intern:3128"
+TC_HTTP_PROXY="http://faiserver:8000"
+TC_HTTPS_PROXY="http://faiserver:8000"
+TC_FTP_PROXY="http://faiserver:8000"
+
+echo "X2Go Thin Client Environment:"
+echo "============================="
+echo "The X2Go Thin Client Environment is using the following"
+echo "settings:"
+echo
+echo "TC_FLAVOUR=$TC_FLAVOUR"
+echo "TC_DISTRO_CODENAME=$TC_DISTRO_CODENAME"
+echo "TC_DISTRO_ARCH=$TC_DISTRO_ARCH"
+echo "TC_CHROOT=$TC_CHROOT"
+echo "TC_CONFIG=$TC_CONFIG"
+echo "TC_SHELL=$TC_SHELL"
+echo "TC_HTTP_PROXY=$TC_HTTP_PROXY"
+echo "TC_HTTPS_PROXY=$TC_HTTPS_PROXY"
+echo "TC_FTP_PROXY=$TC_FTP_PROXY"
+echo
diff --git a/examples/displayserver/README.tftp b/examples/displayserver/README.tftp
deleted file mode 100644
index 22221b3..0000000
--- a/examples/displayserver/README.tftp
+++ /dev/null
@@ -1,10 +0,0 @@
-This folder contains a PXE boot environment that provides the
-boot menu for display systems as provided by a standalone
-ITZkS Substitute Teacher Schedule Display Server (aka displayserver).
-
-Installation steps:
-
- 1. Untar these files to displayserver:/srv/tftp
-
- $ tar xvz -C /srv -f displayserver-tftp.tar.gz
-
diff --git a/examples/displayserver/tftp/_common_/debian-edu/display.cfg b/examples/displayserver/tftp/_common_/debian-edu/display.cfg
deleted file mode 100644
index 01af6ba..0000000
--- a/examples/displayserver/tftp/_common_/debian-edu/display.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL vplan
- MENU LABEL ^Vertretungsplan / Info-Terminal
- MENU DEFAULT
- KERNEL display/amd64/vmlinuz
- APPEND initrd=ltsp/amd64.jessie/initrd.img init=/sbin/init-ltsp nfsroot=/opt/ltsp/amd64.jessie,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet ipappend 2
diff --git a/examples/displayserver/tftp/_common_/debian-edu/memtest.cfg b/examples/displayserver/tftp/_common_/debian-edu/memtest.cfg
deleted file mode 100644
index 8bf162a..0000000
--- a/examples/displayserver/tftp/_common_/debian-edu/memtest.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-LABEL memtest86+
- MENU LABEL Speichertest (memtest86+)
- kernel debian-edu/memtest86+.bin
-LABEL memtest86
- MENU LABEL Speichertest (memtest86)
- kernel debian-edu/memtest86.bin
diff --git a/examples/displayserver/tftp/_common_/display/amd64/initrd.img b/examples/displayserver/tftp/_common_/display/amd64/initrd.img
deleted file mode 120000
index b19c163..0000000
--- a/examples/displayserver/tftp/_common_/display/amd64/initrd.img
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/amd64.jessie/initrd.img \ No newline at end of file
diff --git a/examples/displayserver/tftp/_common_/display/amd64/vmlinuz b/examples/displayserver/tftp/_common_/display/amd64/vmlinuz
deleted file mode 120000
index 49f9a5f..0000000
--- a/examples/displayserver/tftp/_common_/display/amd64/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/amd64.jessie/vmlinuz \ No newline at end of file
diff --git a/examples/displayserver/tftp/_common_/pxelinux/jessie/pxelinux.0 b/examples/displayserver/tftp/_common_/pxelinux/jessie/pxelinux.0
deleted file mode 120000
index f723d02..0000000
--- a/examples/displayserver/tftp/_common_/pxelinux/jessie/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file
diff --git a/examples/displayserver/tftp/_common_/syslinux/jessie/syslinux b/examples/displayserver/tftp/_common_/syslinux/jessie/syslinux
deleted file mode 120000
index 7bea767..0000000
--- a/examples/displayserver/tftp/_common_/syslinux/jessie/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios \ No newline at end of file
diff --git a/examples/displayserver/tftp/debian-edu/debian-edu-splash.png b/examples/displayserver/tftp/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/displayserver/tftp/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/displayserver/tftp/debian-edu/default-menu.cfg b/examples/displayserver/tftp/debian-edu/default-menu.cfg
deleted file mode 100644
index 4697e25..0000000
--- a/examples/displayserver/tftp/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-include debian-edu/display.cfg
-MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 30
diff --git a/examples/displayserver/tftp/debian-edu/display.cfg b/examples/displayserver/tftp/debian-edu/display.cfg
deleted file mode 120000
index 5d11f72..0000000
--- a/examples/displayserver/tftp/debian-edu/display.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/debian-edu/display.cfg \ No newline at end of file
diff --git a/examples/displayserver/tftp/debian-edu/memtest.cfg b/examples/displayserver/tftp/debian-edu/memtest.cfg
deleted file mode 120000
index 953ea54..0000000
--- a/examples/displayserver/tftp/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/displayserver/tftp/debian-edu/memtest86+.bin b/examples/displayserver/tftp/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/displayserver/tftp/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/displayserver/tftp/debian-edu/memtest86.bin b/examples/displayserver/tftp/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/displayserver/tftp/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/displayserver/tftp/display b/examples/displayserver/tftp/display
deleted file mode 120000
index e94a655..0000000
--- a/examples/displayserver/tftp/display
+++ /dev/null
@@ -1 +0,0 @@
-./_common_/display \ No newline at end of file
diff --git a/examples/displayserver/tftp/pxelinux.0 b/examples/displayserver/tftp/pxelinux.0
deleted file mode 120000
index d23a196..0000000
--- a/examples/displayserver/tftp/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-./_common_/pxelinux/jessie/pxelinux.0 \ No newline at end of file
diff --git a/examples/displayserver/tftp/pxelinux.cfg/default b/examples/displayserver/tftp/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/displayserver/tftp/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/displayserver/tftp/syslinux b/examples/displayserver/tftp/syslinux
deleted file mode 120000
index f6725ad..0000000
--- a/examples/displayserver/tftp/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-./_common_/syslinux/jessie/syslinux \ No newline at end of file
diff --git a/examples/mainserver/README.tftp b/examples/mainserver/README.tftp
deleted file mode 100644
index dbfe561..0000000
--- a/examples/mainserver/README.tftp
+++ /dev/null
@@ -1,17 +0,0 @@
-This folder contains a PXE Bootenvironment that provides the
-Debian Edu installer (in German) on the Debian Edu main server.
-
-Installation steps:
-
- 1. Untar these files to tjener:/srv/tftp
-
- $ tar xvz -C /srv -f mainserver-tftp.tar.gz
-
- 2. Preserve Debian Edu's original of /var/lib/tftpboot
-
- $ mv /var/lib/tftpboot /var/lib/tftpboot.orig
-
- 3. Symlink /var/lib/tftpboot -> /srv/tftp
-
- $ ln -s /srv/tftp /var/lib/tftpboot
-
diff --git a/examples/mainserver/tftp/debian-edu/debian-edu-splash.png b/examples/mainserver/tftp/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/mainserver/tftp/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/mainserver/tftp/debian-edu/default-menu.cfg b/examples/mainserver/tftp/debian-edu/default-menu.cfg
deleted file mode 100644
index ebcdb9e..0000000
--- a/examples/mainserver/tftp/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-include debian-edu/localboot.cfg
-MENU SEPARATOR
-include debian-edu/install-de9.cfg
-MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout localboot \ No newline at end of file
diff --git a/examples/mainserver/tftp/debian-edu/install-de8.cfg b/examples/mainserver/tftp/debian-edu/install-de8.cfg
deleted file mode 100644
index 706344e..0000000
--- a/examples/mainserver/tftp/debian-edu/install-de8.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-LABEL neteduboot-amd64
- MENU LABEL Installiere Debian Edu 8.0 (MATE/^amd64)
- kernel debian-installer/amd64.jessie/linux
- append initrd=debian-installer/amd64.jessie/initrd.gz auto url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern locale=de_DE.UTF-8 keymap=de desktop=mate --- quiet
- ipappend 2
-include menupassword.cfg
-
-LABEL neteduboot-i386
- MENU LABEL Installiere Debian Edu 8.0 (MATE/^i386)
- kernel debian-installer/i386.jessie/linux
- append initrd=debian-installer/i386.jessie/initrd.gz auto url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern locale=de_DE.UTF-8 keymap=de desktop=mate --- quiet
- ipappend 2
-include menupassword.cfg
diff --git a/examples/mainserver/tftp/debian-edu/install-de9.cfg b/examples/mainserver/tftp/debian-edu/install-de9.cfg
deleted file mode 100644
index 67c5289..0000000
--- a/examples/mainserver/tftp/debian-edu/install-de9.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-LABEL neteduboot-amd64
- MENU LABEL Installiere Debian Edu 9.0 (MATE/^amd64)
- kernel debian-installer/amd64.stretch/linux
- append initrd=debian-installer/amd64.stretch/initrd.gz auto url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern locale=de_DE.UTF-8 keymap=de desktop=mate --- quiet
- ipappend 2
-include menupassword.cfg
-
-LABEL neteduboot-i386
- MENU LABEL Installiere Debian Edu 9.0 (MATE/^i386)
- kernel debian-installer/i386.stretch/linux
- append initrd=debian-installer/i386.stretch/initrd.gz auto url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern locale=de_DE.UTF-8 keymap=de desktop=mate --- quiet
- ipappend 2
-include menupassword.cfg
diff --git a/examples/mainserver/tftp/debian-edu/localboot.cfg b/examples/mainserver/tftp/debian-edu/localboot.cfg
deleted file mode 100644
index bf74f87..0000000
--- a/examples/mainserver/tftp/debian-edu/localboot.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL localboot
- MENU LABEL Von ^Festplatte starten
- MENU DEFAULT
- localboot 0
-
diff --git a/examples/mainserver/tftp/debian-edu/memtest.cfg b/examples/mainserver/tftp/debian-edu/memtest.cfg
deleted file mode 100644
index c8e0df2..0000000
--- a/examples/mainserver/tftp/debian-edu/memtest.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-LABEL memtest86
- MENU LABEL Speichertest (memtest86)
- kernel debian-edu/memtest86.bin
-
-LABEL memtest86+
- MENU LABEL Speichertest (memtest86+)
- kernel debian-edu/memtest86+.bin
-
diff --git a/examples/mainserver/tftp/debian-edu/memtest86+.bin b/examples/mainserver/tftp/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/mainserver/tftp/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/mainserver/tftp/debian-edu/memtest86.bin b/examples/mainserver/tftp/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/mainserver/tftp/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/mainserver/tftp/debian-installer/amd64.stretch b/examples/mainserver/tftp/debian-installer/amd64.stretch
deleted file mode 120000
index accc0dc..0000000
--- a/examples/mainserver/tftp/debian-installer/amd64.stretch
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/debian-installer/images/9/amd64/text/debian-installer/amd64 \ No newline at end of file
diff --git a/examples/mainserver/tftp/debian-installer/i386.stretch b/examples/mainserver/tftp/debian-installer/i386.stretch
deleted file mode 120000
index 43ce00f..0000000
--- a/examples/mainserver/tftp/debian-installer/i386.stretch
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/debian-installer/images/9/i386/text/debian-installer/i386 \ No newline at end of file
diff --git a/examples/mainserver/tftp/pxelinux.0 b/examples/mainserver/tftp/pxelinux.0
deleted file mode 120000
index f723d02..0000000
--- a/examples/mainserver/tftp/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file
diff --git a/examples/mainserver/tftp/pxelinux.cfg/default b/examples/mainserver/tftp/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/mainserver/tftp/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/mainserver/tftp/syslinux b/examples/mainserver/tftp/syslinux
deleted file mode 120000
index 7bea767..0000000
--- a/examples/mainserver/tftp/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios \ No newline at end of file
diff --git a/man/diskless-workstation-shell.jessie.8 b/man/diskless-workstation-shell.bookworm.8
index b0d3e15..b0d3e15 120000
--- a/man/diskless-workstation-shell.jessie.8
+++ b/man/diskless-workstation-shell.bookworm.8
diff --git a/man/diskless-workstation-shell.stretch.8 b/man/diskless-workstation-shell.bullseye.8
index b0d3e15..b0d3e15 120000
--- a/man/diskless-workstation-shell.stretch.8
+++ b/man/diskless-workstation-shell.bullseye.8
diff --git a/man/e2guardian-update-shallalists.8 b/man/e2guardian-update-blacklists.8
index 3bca2f8..61a30b8 100644
--- a/man/e2guardian-update-shallalists.8
+++ b/man/e2guardian-update-blacklists.8
@@ -5,18 +5,20 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH e2guardian-update-shalllists 8 "April 2019" "Version 2019.04.04.2" "IT-Zukunft Schule"
+.TH e2guardian-update-blacklists 8 "March 2023" "Version 2023.03.07.1" "IT-Zukunft Schule"
.SH NAME
-e2guardian-update-shalllists \- Update content filter blacklists provided by Shalla Secure Services KG
+e2guardian-update-blacklists \- Update content filter blacklists provided by University of Toulouse
.SH SYNOPSIS
'nh
.fi
.ad l
-.B e2guardian-update-shalllists
+.B e2guardian-update-blacklists
.SH DESCRIPTION
This script is to be installed as a CRON job. It can be used to regularly
-install/update URL blacklists provided by Shalla Secure Services KG.
+install/update URL blacklists provided by University of Toulouse at
+ftp://ftp.ut-capitole.fr/pub/reseau/cache/squidguard_contrib/blacklists.tar.gz
+
.PP
The blacklists will be downloaded and installed to /var/lib/e2guardian/blacklists.
.PP
@@ -24,8 +26,10 @@ To make these lists available to e2guardian, make sure to include those
list via /etc/e2guardian/lists/bannedurllist and
/etc/e2guardian/lists/bannedsitelist.
.PP
+The backlists also contain sets of whitelists that can also be integrated in
+the e2guardian configuration.
.SH OPTIONS
-\fBe2guardian-update-shalllists\fR has no known options.
+\fBe2guardian-update-blacklists\fR has no known options.
.PP
.SH AUTHOR
This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the IT-Zukunft Schule project
diff --git a/sbin/diskless-workstation-shell b/sbin/diskless-workstation-shell
index d775138..45c512f 120000
--- a/sbin/diskless-workstation-shell
+++ b/sbin/diskless-workstation-shell
@@ -1 +1 @@
-diskless-workstation-shell.stretch \ No newline at end of file
+diskless-workstation-shell.bullseye \ No newline at end of file
diff --git a/sbin/diskless-workstation-shell.stretch b/sbin/diskless-workstation-shell.bookworm
index a6e0063..6381f84 100755
--- a/sbin/diskless-workstation-shell.stretch
+++ b/sbin/diskless-workstation-shell.bookworm
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2011 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
+# Copyright (C) 2011-2021 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
# This script is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,9 @@ set -e
VERSION=0.3
DLW_SHELL="bash"
-CHROOT="/srv/ltsp/amd64+stretch/"
+CHROOT="/srv/ltsp/dlw+amd64+bookworm/"
+
+export TMPDIR=/tmp
test -e "$CHROOT" || {
echo "ERROR: Diskless workstation chroot does not exist at $CHROOT."
diff --git a/sbin/diskless-workstation-shell.jessie b/sbin/diskless-workstation-shell.bullseye
index cb2bfb0..ec9acc8 100755
--- a/sbin/diskless-workstation-shell.jessie
+++ b/sbin/diskless-workstation-shell.bullseye
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2011 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
+# Copyright (C) 2011-2021 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
# This script is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,9 @@ set -e
VERSION=0.3
DLW_SHELL="bash"
-CHROOT="/srv/ltsp/i386.jessie/"
+CHROOT="/srv/ltsp/dlw+amd64+bullseye/"
+
+export TMPDIR=/tmp
test -e "$CHROOT" || {
echo "ERROR: Diskless workstation chroot does not exist at $CHROOT."
diff --git a/sbin/diskless-workstation-shell.buster b/sbin/diskless-workstation-shell.buster
index a0c3b79..64dab61 100755
--- a/sbin/diskless-workstation-shell.buster
+++ b/sbin/diskless-workstation-shell.buster
@@ -21,7 +21,9 @@ set -e
VERSION=0.3
DLW_SHELL="bash"
-CHROOT="/srv/ltsp/amd64+buster/"
+CHROOT="/srv/ltsp/dlw+amd64+buster/"
+
+export TMPDIR=/tmp
test -e "$CHROOT" || {
echo "ERROR: Diskless workstation chroot does not exist at $CHROOT."
diff --git a/sbin/e2guardian-update-blacklists b/sbin/e2guardian-update-blacklists
new file mode 100755
index 0000000..c58c96b
--- /dev/null
+++ b/sbin/e2guardian-update-blacklists
@@ -0,0 +1,147 @@
+#!/bin/bash
+
+# Copyright (C) 2016 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This script is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+set -e
+
+unset http_proxy
+unset https_proxy
+unset ftp_proxy
+
+BLACKLIST_URL="http://dsi.ut-capitole.fr/blacklists/download/blacklists_for_dansguardian.tar.gz"
+
+function update_blacklists() {
+ mkdir -p /var/lib/e2guardian/
+ curl "${BLACKLIST_URL}" 1> /var/lib/e2guardian/blacklists.tar.gz 2>/dev/null
+
+ if [ -e /var/lib/e2guardian/.blacklists.new ]; then
+ rm -Rf /var/lib/e2guardian/.blacklists.new
+ fi
+
+ mkdir -p /var/lib/e2guardian/.blacklists.new
+
+ cd /var/lib/e2guardian/.blacklists.new
+ tar xzf /var/lib/e2guardian/blacklists.tar.gz
+
+ mv blacklists/* .
+ rmdir blacklists/
+
+ cd - 1>/dev/null
+
+ if [ -e /var/lib/e2guardian/blacklists.old ]; then
+ rm -Rf /var/lib/e2guardian/blacklists.old
+ fi
+
+ if [ -d /var/lib/e2guardian/blacklists ]; then
+ mv /var/lib/e2guardian/blacklists /var/lib/e2guardian/blacklists.old
+ fi
+
+ if [ ! -e /var/lib/e2guardian/blacklists ]; then
+ mv /var/lib/e2guardian/.blacklists.new /var/lib/e2guardian/blacklists
+
+ LANG=C date 1> /var/lib/e2guardian/last-updated.txt
+
+ chown root:root -Rf /var/lib/e2guardian/blacklists
+ chmod -Rf a+r /var/lib/e2guardian/blacklists
+ cd /var/lib/e2guardian/blacklists
+ find * -type d | while read dir; do
+ chmod a+x "${dir}"
+ done
+ cd - 1> /dev/null
+
+ fi
+
+ if [ -e /var/lib/e2guardian/blacklists.tar.gz ]; then
+ rm -f /var/lib/e2guardian/blacklists.tar.gz
+ fi
+}
+
+function update_whitelists() {
+ if [ -d /var/lib/e2guardian/whitelists.old ]; then
+ rm -Rf /var/lib/e2guardian/whitelists.old
+ fi
+ if [ -d /var/lib/e2guardian/whitelists ]; then
+ mv /var/lib/e2guardian/whitelists /var/lib/e2guardian/whitelists.old
+ fi
+
+ mkdir -p /var/lib/e2guardian/whitelists
+ find /var/lib/e2guardian/blacklists/*/usage | while read usage; do
+ # skip symlinked dirs
+ if [ -h "$(dirname "${usage}")" ]; then
+ continue
+ fi
+ if grep -q "white" < "${usage}" && ! grep -q "black" < "${usage}"; then
+ mv "$(dirname "${usage}")" /var/lib/e2guardian/whitelists
+ fi
+ done
+}
+
+function init_config() {
+ if [ ! -e "/etc/debian-edu/e2guardian_blacklisted_categories" ]; then
+ find /var/lib/e2guardian/blacklists/* -maxdepth 1 -type d| cut -d "/" -f6 >> /etc/debian-edu/e2guardian_blacklisted_categories
+ fi
+ if [ ! -e "/etc/debian-edu/e2guardian_whitelisted_categories" ]; then
+ find /var/lib/e2guardian/whitelists/* -maxdepth 1 -type d| cut -d "/" -f6 >> /etc/debian-edu/e2guardian_whitelisted_categories
+ fi
+}
+
+function rearrange_lists() {
+ cat "/etc/debian-edu/e2guardian_whitelisted_categories" | while read whitelisted; do
+ if [ -d "/var/lib/e2guardian/blacklists/${whitelisted}" ] && \
+ [ ! -h "/var/lib/e2guardian/blacklists/${whitelisted}" ]; then
+ mv "/var/lib/e2guardian/blacklists/${whitelisted}" /var/lib/e2guardian/whitelists
+ fi
+ done
+
+ cat "/etc/debian-edu/e2guardian_blacklisted_categories" | while read blacklisted; do
+ if [ -d "/var/lib/e2guardian/whitelists/${blacklisted}" ] && \
+ [ ! -h "/var/lib/e2guardian/whitelists/${blacklisted}" ]; then
+ mv "/var/lib/e2guardian/whitelists/${blacklisted}" /var/lib/e2guardian/blacklists
+ fi
+ done
+}
+
+function update_lists() {
+ action=${1}
+ type="${2}"
+ list="${3}"
+
+ sed -i "/etc/e2guardian/lists/${list}" -Ee "/(#|).Include<.*\/${action}s\/.*>$/d"
+
+ find /var/lib/e2guardian/${action}s/*/${type} -type f -maxdepth 1 2>/dev/null | sort | while read path; do
+ # ignore symlinks pointing to another category dir
+ if [ ! -h "$(echo $path | cut -d "/" -f 1-6)" ]; then
+ echo "#.Include<${path}>" >> "/etc/e2guardian/lists/${list}"
+ fi
+ done
+
+ cat /etc/debian-edu/e2guardian_${action}ed_categories | grep -v "^#" | while read category; do
+ sed -i "/etc/e2guardian/lists/${list}" -Ee "s/#(.Include<.*\/${category}\/${type})/\1/"
+ done
+}
+
+update_blacklists
+update_whitelists
+init_config
+rearrange_lists
+update_lists blacklist domains bannedsitelist
+update_lists blacklist urls bannedurllist
+update_lists blacklist expressions bannedregexpurllist
+update_lists whitelist domains exceptionsitelist
+update_lists whitelist urls exceptionurllist
+#invoke-rc.d e2guardian restart 1>/dev/null 2>/dev/null
diff --git a/sbin/e2guardian-update-shallalists b/sbin/e2guardian-update-shallalists
deleted file mode 100755
index 756e83c..0000000
--- a/sbin/e2guardian-update-shallalists
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2016 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
-
-# This script is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This script is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-set -e
-
-unset http_proxy
-unset https_proxy
-unset ftp_proxy
-
-SHALLA_BLACKLIST_URL="http://www.shallalist.de/Downloads/shallalist.tar.gz"
-
-mkdir -p /var/lib/e2guardian/
-curl "$SHALLA_BLACKLIST_URL" 1> /var/lib/e2guardian/blacklists.tar.gz 2>/dev/null
-
-if [ -e /var/lib/e2guardian/.blacklists.new ]; then
- rm -Rf /var/lib/e2guardian/.blacklists.new
-fi
-
-mkdir -p /var/lib/e2guardian/.blacklists.new
-
-cd /var/lib/e2guardian/.blacklists.new
-tar xzf /var/lib/e2guardian/blacklists.tar.gz
-
-mv BL/* .
-rmdir BL/
-
-cd - 1>/dev/null
-
-if [ -e /var/lib/e2guardian/blacklists.old ]; then
- rm -Rf /var/lib/e2guardian/blacklists.old
-fi
-
-if [ -d /var/lib/e2guardian/blacklists ]; then
- mv /var/lib/e2guardian/blacklists /var/lib/e2guardian/blacklists.old
-fi
-
-if [ ! -e /var/lib/e2guardian/blacklists ]; then
- mv /var/lib/e2guardian/.blacklists.new /var/lib/e2guardian/blacklists
-
- LANG=C date 1> /var/lib/e2guardian/last-updated.txt
-
- chown root:root -Rf /var/lib/e2guardian/blacklists
- chmod -Rf a+r /var/lib/e2guardian/blacklists
- cd /var/lib/e2guardian/blacklists
- find * -type d | while read dir; do
- chmod a+x "${dir}"
- done
- cd - 1> /dev/null
-
- invoke-rc.d e2guardian restart 1>/dev/null 2>/dev/null
-fi
-
-if [ -e /var/lib/e2guardian/blacklists.tar.gz ]; then
- rm -f /var/lib/e2guardian/blacklists.tar.gz
-fi
-
diff --git a/sbin/itzks-check-ldap-group-not-in-correct-ou b/sbin/itzks-check-ldap-group-not-in-correct-ou
new file mode 100755
index 0000000..5a1057f
--- /dev/null
+++ b/sbin/itzks-check-ldap-group-not-in-correct-ou
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# Copyright (C) 2023 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This script is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+OUTPUT_CMD=${OUTPUT_CMD:-cat}
+
+set -e
+
+ldapsearch -xLLL "(&(uid=*)(objectClass=posixAccount)(!(objectClass=gosaUserTemplate)))" \
+ dn uid 2>/dev/null | perl -p0e 's/\n //g' | \
+while read KEY VALUE ; do
+ case "$KEY" in
+ dn:) UID=; USERDN="$VALUE" ;;
+ dn::) UID=; USERDN="$(echo $VALUE | base64 -d)" ;;
+ uid:) UID="$VALUE" ;;
+ "")
+ ldapsearch -xLLL "(&(cn=$UID)(objectClass=posixGroup))" \
+ dn 2>/dev/null | perl -p0e 's/\n //g' | \
+ while read G_KEY G_VALUE ; do
+ case "$G_KEY" in
+ dn:) GROUPDN="$G_VALUE" ;;
+ dn::) GROUPDN="$(echo $G_VALUE | base64 -d)" ;;
+ "")
+ U_BASEDN=$(echo $USERDN | cut -d"," -f3-)
+ G_BASEDN=$(echo $GROUPDN | cut -d"," -f3-)
+
+ if [ "${U_BASEDN}" != "${G_BASEDN}" ]; then
+ (
+ echo "${USERDN}"; \
+ echo "${GROUPDN} -> ${U_BASEDN}"; \
+ echo; ) | ${OUTPUT_CMD}
+
+ fi
+
+ ;;
+ esac
+ done
+ ;;
+ esac
+done
+
+exit 0
diff --git a/sbin/itzks-diskless-re-partition-dlw b/sbin/itzks-diskless-re-partition-dlw
new file mode 100755
index 0000000..a34d0a0
--- /dev/null
+++ b/sbin/itzks-diskless-re-partition-dlw
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# Copyright (C) 2022 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
+
+# This script is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This script is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# This scripts turns a storage device into a two-partitioned
+# storage, first partition containing 16GB swap space, second
+# partition containing a scratch partition for local storage.
+
+#!/bin/bash
+
+DEV="$1" # pick your disk device
+p=""
+
+if [ -z "${DEV}" ]; then
+ echo "no device given"
+ exit 1
+fi
+
+if [ ! -e ${DEV} ]; then
+ echo "no such device"
+ exit 1
+fi
+
+if echo ${DEV} | grep -E "\/dev\/nvme.*"; then
+ p="p"
+fi
+
+wipefs -a ${DEV} # recommended if you want to swap partition table types
+
+# partitioning for 16G swapfs and rest as a scratch disk
+SWAP_SIZE=16384
+
+echo "label: gpt
+device: ${DEV}
+unit: sectors
+
+${DEV}${p}1 : size=${SWAP_SIZE}MiB, type=0657FD6D-A4AB-43C4-84E5-0933C84B4F4F
+${DEV}${p}2 : type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, name=DLW_SCRATCH
+" | sfdisk ${DEV}
+
+mkswap ${DEV}${p}1
+mkfs.ext4 -L DLW_SCRATCH ${DEV}${p}2
diff --git a/sbin/itzks-display-shell b/sbin/itzks-display-shell
index 4e6f770..5985f92 100755
--- a/sbin/itzks-display-shell
+++ b/sbin/itzks-display-shell
@@ -21,7 +21,7 @@ set -e
VERSION=0.1
DISPLAY_SHELL="bash"
-CHROOT="/srv/ltsp/amd64/"
+CHROOT="/srv/ltsp/display+amd64+bullseye/"
test -e "$CHROOT" || {
echo "ERROR: ITZkS display system chroot does not exist at $CHROOT."
diff --git a/sbin/itzks-prepare-reinstall b/sbin/itzks-prepare-reinstall
new file mode 100755
index 0000000..4e7945f
--- /dev/null
+++ b/sbin/itzks-prepare-reinstall
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Copyright (C) 2023 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+unset http_proxy
+unset https_proxy
+
+DOMAIN="intern"
+HOSTNAME="$(hostname -f)"
+PUPPET_SERVER="puppetserver.intern"
+TJENER_SERVER="tjener.intern"
+
+PUPPET_CLIENT_CN="${1}"
+if [ -z "${PUPPET_CLIENT_CN}" ]; then
+ echo "usage: $(basename $0) <computer>"
+ exit -2
+fi
+
+if [ "${HOSTNAME}" != "${PUPPET_SERVER}" ] && [ "${HOSTNAME}" != "${TJENER_SERVER}" ]; then
+ echo "$(basename $0): Error: This script may only be run on 'tjener.intern' or 'puppetserver.intern'."
+ exit -1
+fi
+
+if ! echo ${PUPPET_CLIENT_CN} | grep -qE "\."; then
+ PUPPET_CLIENT_CN="${PUPPET_CLIENT_CN}.${DOMAIN}"
+elif ! echo ${PUPPET_CLIENT_CN} | grep -qE "^[-_a-z0-9]+\.${DOMAIN}\$"; then
+ echo "$(basename $0): Error: Hostname '${PUPPET_CLIENT_CN}' is not in domain .${DOMAIN}."
+ exit -3
+fi
+
+if [ -z "$(dig ${PUPPET_CLIENT_CN} +short | head -n1)" ]; then
+ echo "$(basename $0): Error: Hostname '${PUPPET_CLIENT_CN}' unknown. Mistyped the hostname?"
+ exit -4
+fi
+
+### Puppet 5.x et al. (until Debian 11)
+
+# strip domain name
+hostname_short="$(echo ${PUPPET_CLIENT_CN} | cut -d '.' -f1)"
+
+## lookup host and see if it exists in LDAP:
+ldapsystem=`ldapsearch -xLLL "(&(cn=${hostname_short})(|(objectClass=GOHard)(|(objectClass=ipHost))))" cn 2>/dev/null | perl -p00e 's/\r?\n //g' | grep -E '^cn:' | sed -e 's/^cn: //g'`
+
+if [ -n "${ldapsystem}" ]; then
+
+ source /etc/os-release
+
+ if [ "${ID}" = "debian" ] && \
+ ([ "${VERSION_CODENAME}" == "stretch" ] || \
+ [ "${VERSION_CODENAME}" == "buster" ] || \
+ [ "${VERSION_CODENAME}" == "bullseye" ]); then
+
+ # yes, we should clean this host CRT/KEY, but the puppet 5.x way
+ puppet cert clean "${PUPPET_CLIENT_CN}"
+
+ else
+
+ # yes, we should clean this host CRT/KEY, but the puppet 7++ way
+ puppetserver ca clean --certname "${PUPPET_CLIENT_CN}"
+
+ fi
+
+fi
diff --git a/sbin/itzks-puppet-autosign-new-host-certificates b/sbin/itzks-puppet-autosign-new-host-certificates
new file mode 100755
index 0000000..4fbf678
--- /dev/null
+++ b/sbin/itzks-puppet-autosign-new-host-certificates
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# Copyright (C) 2022 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+unset http_proxy
+unset https_proxy
+
+HOSTNAME="$(hostname -f)"
+PUPPET_SERVER="$(dig puppet.intern +short | head -n1)"
+
+if [ "${HOSTNAME}." != "${PUPPET_SERVER}" ]; then
+ exit 0
+fi
+
+source /etc/os-release
+
+if [ "${ID}" = "debian" ] && \
+ ([ "${VERSION_CODENAME}" == "stretch" ] || \
+ [ "${VERSION_CODENAME}" == "buster" ] || \
+ [ "${VERSION_CODENAME}" == "bullseye" ]); then
+
+ ### Puppet 5.x et al. (until Debian 11)
+
+ # obtain list of puppet host certificate signing requests
+ NEW_PUPPET_SIGNING_REQUESTS="$(puppet cert list 2>/dev/null | awk '{ print $1 }' | sed 's/\"//g')"
+
+ # if any, iterate over them individually
+ if [ -n "${NEW_PUPPET_SIGNING_REQUESTS}" ]; then
+
+ echo "${NEW_PUPPET_SIGNING_REQUESTS}" | while read host_csr; do
+
+ # strip domain name
+ hostname_short="$(echo $host_csr | cut -d '.' -f1)"
+
+ ## lookup host and see if it exists in LDAP:
+ ldapsystem=`ldapsearch -xLLL "(&(cn=${hostname_short})(|(objectClass=GOHard)(|(objectClass=ipHost))))" cn 2>/dev/null | perl -p00e 's/\r?\n //g' | grep -E '^cn:' | sed -e 's/^cn: //g'`
+
+ if [ -n "${ldapsystem}" ]; then
+
+ # yes, we should sign this host CSR
+ puppet cert sign "${host_csr}"
+
+ fi
+
+ done
+
+ fi
+
+else
+
+ # Puppet 7.x and newer... (Debian 12 and beyond)
+
+ # obtain list of puppet host certificate signing requests
+ NEW_PUPPET_SIGNING_REQUESTS="$(puppetserver ca list 2>/dev/null | awk '{ print $1 }' | sed 's/\"//g')"
+
+ # if any, iterate over them individually
+ if [ -n "${NEW_PUPPET_SIGNING_REQUESTS}" ]; then
+
+ echo "${NEW_PUPPET_SIGNING_REQUESTS}" | while read host_csr; do
+
+ # strip domain name
+ hostname_short="$(echo $host_csr | cut -d '.' -f1)"
+
+ ## lookup host and see if it exists in LDAP:
+ ldapsystem=`ldapsearch -xLLL "(&(cn=${hostname_short})(|(objectClass=GOHard)(|(objectClass=ipHost))))" cn 2>/dev/null | perl -p00e 's/\r?\n //g' | grep -E '^cn:' | sed -e 's/^cn: //g'`
+
+ if [ -n "${ldapsystem}" ]; then
+
+ # yes, we should sign this host CSR
+ puppetserver ca sign --certname "${host_csr}"
+
+ fi
+
+ done
+
+ fi
+
+fi
diff --git a/sbin/itzks-puppet-refresh-ssl b/sbin/itzks-puppet-refresh-ssl
new file mode 100755
index 0000000..babebfb
--- /dev/null
+++ b/sbin/itzks-puppet-refresh-ssl
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm /var/lib/puppet/ssl/certs/ca.pem
+find /var/lib/puppet/ssl/ -name "$HOSTNAME.pem" -delete
+puppet agent --test
+puppet agent --enable
+systemctl enable puppet
+systemctl start puppet
diff --git a/sbin/itzks-switch-back-to-networkmanager b/sbin/itzks-switch-back-to-networkmanager
deleted file mode 100755
index 1cab9d4..0000000
--- a/sbin/itzks-switch-back-to-networkmanager
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2017 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
-
-# This script is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This script is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-WIFIDEV=${WIFIDEV:-wlan0}
-
-apt-get install --download -y network-manager
-apt-get install --download -y resolvconf
-
-# rm /etc/resolv.conf
-
-export DEBIAN_FRONTEND=noninteractive
-apt-get install -q -y --force-yes resolvconf network-manager
-
-systemctl stop systemd-networkd.service
-systemctl stop systemd-resolved.service
-systemctl disable wpa_supplicant@$WIFIDEV.service
-systemctl disable systemd-networkd.service
-systemctl disable systemd-resolved.service
-
-systemctl daemon-reload
-
-rm /etc/systemd/system/wpa_supplicant@.service
-rm /etc/wpa_supplicant/wpa_supplicant-$WIFIDEV.conf
-
-rm /etc/systemd/network/20-dhcp.network
-rm /etc/systemd/network/21-dhcp-wireless.network
-
-systemctl enable wpa_supplicant.service
-systemctl enable networking
-systemctl enable NetworkManager
-systemctl start networking
-systemctl start NetworkManager
-
-echo "Please reboot your system now." \ No newline at end of file
diff --git a/sbin/itzks-switch-to-systemd-networkd b/sbin/itzks-switch-to-systemd-networkd
deleted file mode 100755
index 7f44e4f..0000000
--- a/sbin/itzks-switch-to-systemd-networkd
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2015 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
-
-# This script is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This script is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-WIFIDEV=${WIFIDEV:-wlan0}
-
-export DEBIAN_FRONTEND=noninteractive
-apt-get remove -q -y --purge resolvconf
-
-systemctl disable NetworkManager
-systemctl enable systemd-networkd.service
-systemctl enable systemd-resolved.service
-systemctl start systemd-resolved.service
-rm /etc/resolv.conf
-ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
-
-cat > /etc/systemd/network/20-dhcp.network << EOF
-[Match]
-Name=eth*
-
-[Network]
-DHCP=yes
-EOF
-
-cat > /etc/systemd/network/21-dhcp-wireless.network << EOF
-[Match]
-Name=$WIFIDEV
-
-[Network]
-DHCP=yes
-EOF
-
-cat > /etc/systemd/system/wpa_supplicant@.service << EOF
-[Unit]
-Description=WPA supplicant daemon (interface-specific version)
-Requires=sys-subsystem-net-devices-%i.device
-After=sys-subsystem-net-devices-%i.device
-Before=network.target
-Wants=network.target
-
-# NetworkManager users will probably want the dbus version instead.
-
-[Service]
-Type=simple
-ExecStart=/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
-
-[Install]
-Alias=multi-user.target.wants/wpa_supplicant@%i.service
-EOF
-
-touch /etc/wpa_supplicant/wpa_supplicant-$WIFIDEV.conf
-chmod go-rwx /etc/wpa_supplicant/wpa_supplicant-$WIFIDEV.conf
-
-systemctl enable wpa_supplicant@$WIFIDEV.service
-systemctl disable networking
-systemctl disable wpa_supplicant.service
-
-echo "Please restart your system now." \ No newline at end of file
diff --git a/sbin/itzks-systems.do_preseed b/sbin/itzks-systems.do_preseed
index 87b1b21..69c8482 100755
--- a/sbin/itzks-systems.do_preseed
+++ b/sbin/itzks-systems.do_preseed
@@ -49,4 +49,3 @@ do_preseed ocsinventory-agent ocsinventory-agent/tag string $CUSTOMER
do_preseed ocsinventory-agent ocsinventory-agent/method select http
do_preseed ocsinventory-agent ocsinventory-agent/server string inventory.it-zukunft-schule.de
do_reconfigure ocsinventory-agent
-
diff --git a/sbin/itzks-update-disklserver-squashfs-images b/sbin/itzks-update-disklserver-squashfs-images
index bc77854..966484b 100755
--- a/sbin/itzks-update-disklserver-squashfs-images
+++ b/sbin/itzks-update-disklserver-squashfs-images
@@ -1,5 +1,7 @@
#!/bin/bash
+set -e
+
# Copyright (C) 2018 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
#
# This script is free software; you can redistribute it and/or modify
@@ -17,31 +19,154 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+if [ $(id -u) -gt 0 ]; then
+ echo "ERROR: This script has to run as super-user root."
+ exit 1
+fi
+
LTSP_OPT="/srv/ltsp"
-ltsp_chroots=$(ls $LTSP_OPT | while read chroot_dir; do test ! -h $LTSP_OPT/$chroot_dir -a -x $LTSP_OPT/$chroot_dir/bin/bash && echo -n "$chroot_dir "; done)
+# work around libpam-tmpdir not working for the
+# root user and /tmp being too small anyway...
+TMPDIR="/srv/tmp"
+export TMPDIR
+mkdir -p ${TMPDIR}/
+chown root:root ${TMPDIR}
+chmod 1777 ${TMPDIR}
+
+# Prep LTSP configuration
+if [ -e "/etc/ltsp/ltsp.conf.itzks-systems-disklserver.in" ] && cat "/etc/ltsp/ltsp.conf.itzks-systems-disklserver.in" | grep -v "#" | grep -q "@rootpw@"; then
+
+ # Drop previous ltsp.conf (yes, we want to do that!)
+ rm -f /etc/ltsp/ltsp.conf
+ touch /etc/ltsp/ltsp.conf
+ chown root:root /etc/ltsp/ltsp.conf
+ chmod 0600 /etc/ltsp/ltsp.conf
+
+ echo "# THIS FILE IS RE-CREATED DAILY FROM /etc/ltsp/ltsp.conf.itzks-systems-disklserver.in - DON'T EDIT THIS FILE" >> /etc/ltsp/ltsp.conf
+ echo >> /etc/ltsp/ltsp.conf
+
+ # configure LTSP before creating ltsp.img and iPXE config
+ host_rootpw=$(cat /etc/shadow | grep -E "^root:" | cut -d":" -f2)
+ [ "$host_rootpw" ] && export host_rootpw && perl -p -e "s/\@rootpw\@/\$ENV{host_rootpw}/g" "/etc/ltsp/ltsp.conf.itzks-systems-disklserver.in" >> "/etc/ltsp/ltsp.conf"
+ unset host_rootpw
+fi
+
+# Prep X2Go configuration (and pre the chroot, as well)
+if [ -e "/etc/ltsp/x2gothinclient-settings.conf" ]; then
+ . "/etc/ltsp/x2gothinclient-settings.conf"
+
+ # FIXME: check for more than one chroot...
+ TC_FLAVOUR="${TC_FLAVOUR:-minidesktop}"
+ TC_DISTRO_CODENAME="${TC_DISTRO_CODENAME:-bullseye}"
+ TC_DISTRO_ARCH="${TC_DISTRO_ARCH:-amd64}"
+ TC_CHROOT="${TC_CHROOT:-/srv/ltsp/x2go-${TC_FLAVOUR}+${TC_DISTRO_ARCH}+${TC_DISTRO_CODENAME}}"
+ TC_CONFIG="${TC_CONFIG:-/etc/ltsp/settings_x2go-${TC_FLAVOUR}+${TC_DISTRO_ARCH}+${TC_DISTRO_CODENAME}}"
+
+ if [ -e "${TC_CHROOT}" ]; then
+
+ echo "Installing X2Go TCE configuration into chroot environment..."
+
+ mkdir -p "$TC_CHROOT/etc/x2go/"
+
+ ls "$TC_CONFIG/x2gothinclient_init.d/" | while read init_part; do
+ mkdir -p "$TC_CHROOT/etc/x2go/x2gothinclient_init.d/"
+ if test -f "$TC_CONFIG/x2gothinclient_init.d/$init_part"; then
+ cp -v "$TC_CONFIG/x2gothinclient_init.d/$init_part" "$TC_CHROOT/etc/x2go/x2gothinclient_init.d/"
+ chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_init.d/$init_part"
+ fi
+ done
+
+ if test -f "$TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_start"; then
+ cp -v "$TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_start" "$TC_CHROOT/etc/x2go/x2gothinclient-${TC_FLAVOUR}_start"
+ chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient-${TC_FLAVOUR}_start"
+ fi
+
+ if test -f "$TC_CONFIG/x2gothinclient_sessions"; then
+ cp -v "$TC_CONFIG/x2gothinclient_sessions" "$TC_CHROOT/etc/x2go/x2gothinclient_sessions"
+ chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_sessions"
+ fi
+
+ if test -f "$TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_background.svg"; then
+ rm "$TC_CHROOT/etc/x2go/x2gothinclient-${TC_FLAVOUR}_background.svg"
+ cp -v "$TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_background.svg" "$TC_CHROOT/etc/x2go/x2gothinclient-${TC_FLAVOUR}_background.svg"
+ ln -sf "/etc/x2go/x2gothinclient-${TC_FLAVOUR}_background.svg" "$TC_CHROOT/etc/x2go/x2gothinclient-background.svg"
+ fi
+
+ if test -f "$TC_CONFIG/freerdp/known_hosts" || test -f "$TC_CONFIG/freerdp/known_hosts2" ; then
+ mkdir -p "$TC_CHROOT/etc/x2go/freerdp/"
+ cp -v "$TC_CONFIG"/freerdp/known_hosts* "$TC_CHROOT/etc/x2go/freerdp/"
+ fi
+ fi
+fi
+
+# update (rebuild) squashfs images
+ltsp_chroots="$(ls "${LTSP_OPT}" | while read chroot_dir; do test ! -h "${LTSP_OPT}/${chroot_dir}" -a -x "${LTSP_OPT}/${chroot_dir}/bin/bash" && echo -n "${chroot_dir} " || true; done)"
+ltsp_chroots="${ltsp_chroots%%?*( )}"
for chroot in ${ltsp_chroots}; do
- if [ -e $LTSP_OPT/$chroot/chroot-upgrade-in-process ]; then
- echo "Chroot $LTSP_OPT/$chroot is currently being upgraded. Skipping..."
+ if [ -e "${LTSP_OPT}/${chroot}/chroot-upgrade-in-process" ]; then
+ echo "Chroot ${LTSP_OPT}/${chroot} is currently being upgraded. Skipping..."
continue
fi
- latest_upgrade=$(ls $LTSP_OPT/$chroot | grep -E 'chroot-updated_[0-9]{8}$' | sort | tail -n1)
+ latest_upgrade=$(ls ${LTSP_OPT}/${chroot} | grep -E 'chroot-updated_[0-9]{8}$' | sort | tail -n1)
if [ -z "${latest_upgrade}" ]; then
- echo "chroot $LTSP_OPT/$chroot lacks the chroot-updated_<date> file. Can't proceeed. Skipping..."
+ echo "chroot ${LTSP_OPT}/${chroot} lacks the chroot-updated_<date> file. Can't proceeed. Skipping..."
continue
fi
- if [ -e "$LTSP_OPT/$chroot/${latest_upgrade}.squashfs-created" ]; then
- echo "chroot $LTSP_OPT/$chroot's squashfs image is up-to-date. Skipping..."
+ # several chroot preparations (also helpful when directly booting the nfsroot)...
+
+ # These preparations run with every script execution (i.e. daily via CRON) to make sure the
+ # NFS chroot is updated.
+
+ # Copy an appropriate SSH secret key for DLWs to ${LTSP_OPT}/${chroot}/root/.ssh/id_<crypto>.
+ # Currently we prefer disklserver:/root/.ssh/id_<crypto>.DLW and fall back to the host's private key file
+ # (i.e. disklserver:/root/.ssh/id_<crypto>).
+ for priv_key_file in id_ecdsa id_ecdsa_sk id_ed25519 id_ed25519_sk id_rsa; do
+
+ if [ -e "/root/.ssh/${priv_key_file}.DLW" ] && [ ! -e "${LTSP_OPT}/${chroot}/root/.ssh/${priv_key_file}" ]; then
+ mkdir -p "${LTSP_OPT}/${chroot}/root/.ssh/"
+ cp "/root/.ssh/${priv_key_file}.DLW" "${LTSP_OPT}/${chroot}/root/.ssh/${priv_key_file}"
+ elif [ -e "/root/.ssh/${priv_key_file}" ] && [ ! -e "${LTSP_OPT}/${chroot}/root/.ssh/${priv_key_file}" ]; then
+ mkdir -p "${LTSP_OPT}/${chroot}/root/.ssh/"
+ cp "/root/.ssh/${priv_key_file}" "${LTSP_OPT}/${chroot}/root/.ssh/${priv_key_file}"
+ fi
+
+ done
+
+ # Copy the host's SSH host keys to the LTSP client chroot if it doesn't have any host keys
+ host_keys="$(find /etc/ssh/ssh_host_*)"
+ if [ -n "${host_keys}" ]; then
+ for host_key in ${host_keys}; do
+ cp "${host_key}" "${LTSP_OPT}/${chroot}/etc/ssh/"
+ done
+ fi
+
+ # Copy the SSH authorized_keys file for DLWs to ${LTSP_OPT}/${chroot}/root/.ssh/authorized_keys (e.g. disklserver:/root/.ssh/authorized_keys)
+ # Use host's authorized_keys file for granting DLW access via SSH as root without password
+ if [ -e "/root/.ssh/authorized_keys" ] && [ ! -e "${LTSP_OPT}/${chroot}/root/.ssh/authorized_keys" ]; then
+ mkdir -p "${LTSP_OPT}/${chroot}/root/.ssh/"
+ cp "/root/.ssh/authorized_keys" "${LTSP_OPT}/${chroot}/root/.ssh/authorized_keys"
+ fi
+
+ # Create the SquashFS image (if an update is required)
+ if [ -e "${LTSP_OPT}/${chroot}/${latest_upgrade}.squashfs-created" ]; then
+ echo "chroot ${LTSP_OPT}/${chroot}'s squashfs image is up-to-date. Skipping..."
else
- if ltsp-update-image $chroot; then
- rm -f $LTSP_OPT/$chroot/chroot-updated_*.squashfs-created
- touch $LTSP_OPT/$chroot/${latest_upgrade}.squashfs-created
+ if ltsp image "${LTSP_OPT}/${chroot}"; then
+ rm -f "${LTSP_OPT}/${chroot}/chroot-updated_*.squashfs-created"
+ touch "${LTSP_OPT}/${chroot}/${latest_upgrade}.squashfs-created"
fi
fi
done
+
+# let's update kernel images, ltsp.img (LTSP initrd) and LTSP's iPXE
+# boot menu configuration, just in case...
+ALL_IMAGES=1 ltsp kernel
+ltsp initrd
+ltsp ipxe
diff --git a/share/debian-edu-config/tools/gosa-create-host-itzks b/share/debian-edu-config/tools/gosa-create-host-itzks
new file mode 100755
index 0000000..40dcd2e
--- /dev/null
+++ b/share/debian-edu-config/tools/gosa-create-host-itzks
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+HOST="${1}"
+
+# call Debian Edu's gosa-create-host
+/usr/share/debian-edu-config/tools/gosa-create-host ${@}
+
+# During creation of a host, we should ideally call update-dlw-krb5-keytabs-itzks
+# here already. However, it is not possible to add a NIS netgroup tab to a
+# GOsa² system before the system object (and the additional DNS bits) has/have
+# been created. So, calling the update-dlw-krb5-keytabs-itzks script
+# makes no sense here...
+
+# FIXME: And: it would be really helpful to have POST-action hooks available for
+# NIS netgroups... In case people don't edit hosts individually, but prefer
+# mass-adding hosts to the diskless-workstation-hosts NIS netgroup.
+
+# ITZkS: assure that host keytabs are readable by puppet
+chown :puppet /var/lib/debian-edu/host-keytabs/*.keytab
+chmod 0640 /var/lib/debian-edu/host-keytabs/*.keytab
+
+exit 0
diff --git a/share/debian-edu-config/tools/gosa-modify-host-itzks b/share/debian-edu-config/tools/gosa-modify-host-itzks
new file mode 100755
index 0000000..af053fb
--- /dev/null
+++ b/share/debian-edu-config/tools/gosa-modify-host-itzks
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+HOST="${1}"
+
+# FIXME: bluntly assuming domain .intern here...
+
+# call Debian Edu's gosa-create-host
+if ! LANG=C kadmin.local -q "get_principal host/$HOST.intern" 2>/dev/null | grep -q "^Principal: host/$HOST.intern@.*" && \
+ ! LANG=C kadmin.local -q "get_principal nfs/$HOST.intern" 2>/dev/null | grep -q "^Principal: nfs/$HOST.intern@.*"; then
+
+ /usr/share/debian-edu-config/tools/gosa-modify-host ${@}
+
+fi
+
+# call DLW keytabs' update script (delay execution for 10s because GOsa² needs
+# to write the NIS netgroup information first (this hook gets called between
+# saving the host object to LDAP, but before updating the NIS netgroup settings).
+( sleep 2; /usr/share/debian-edu-config/tools/update-dlw-krb5-keytabs-itzks ${@} ) &
+
+# ITZkS: assure that host keytabs are readable by puppet
+chown :puppet /var/lib/debian-edu/host-keytabs/*.keytab
+chmod 0640 /var/lib/debian-edu/host-keytabs/*.keytab
+
+exit 0
diff --git a/share/debian-edu-config/tools/update-dlw-krb5-keytabs-itzks b/share/debian-edu-config/tools/update-dlw-krb5-keytabs-itzks
new file mode 100755
index 0000000..cc8fc68
--- /dev/null
+++ b/share/debian-edu-config/tools/update-dlw-krb5-keytabs-itzks
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+set -e
+
+# clear caching daemon's NIS netgroup cache
+nscd -i netgroup
+
+DOMAIN="intern"
+DLW_KRB5_KEYTABS_DIR="/var/lib/debian-edu/dlw-keytabs"
+DLW_HOSTS_NETGROUP=$(netgroup diskless-workstation-hosts | grep -E "\.${DOMAIN}$")
+
+DLW_HOSTS=""
+
+SPECIAL_USER="debian-edu"
+
+# obtain DLW_HOSTS from NIS Netgroup or from the command line
+if [ -z "$1" ]; then
+ DLW_HOSTS="${DLW_HOSTS_NETGROUP}"
+else
+ logger -t update-dlw-krb5-keytabs -p notice "Called with command line: ${@}"
+
+ while [ -n "${1}" ]; do
+ if echo ${DLW_HOSTS_NETGROUP} | grep -q "${1}.${DOMAIN}"; then
+ DLW_HOSTS="${DLW_HOSTS} ${1}.${DOMAIN}"
+ else
+ echo "WARNING: Host ${1} not a diskless workstation"
+ logger -t update-dlw-krb5-keytabs -p warning "Host '${1}' is not a diskless workstation."
+ fi
+ shift
+ done
+fi
+
+mkdir -p "${DLW_KRB5_KEYTABS_DIR}"
+chown "root:${SPECIAL_USER}" "${DLW_KRB5_KEYTABS_DIR}"
+chmod 0710 "${DLW_KRB5_KEYTABS_DIR}"
+
+for dlw_host in ${DLW_HOSTS}; do
+
+ DLW_KRB5_KEYTAB="${DLW_KRB5_KEYTABS_DIR}/${dlw_host}.keytab"
+
+ host_found="false"
+ ldap_cn=$(echo ${dlw_host} | cut -d"." -f1)
+
+ ldap_host=""
+
+ while read KEY VALUE; do
+ case "$KEY" in
+ dn:)
+ ldap_host=""
+ ;;
+ cn:)
+ ldap_host="$VALUE"
+ if [ "${ldap_host}.${DOMAIN}" = "${dlw_host}" ]; then
+ host_found="true"
+ else
+ continue
+ fi
+
+ if LANG=C kadmin.local -q "get_principal host/${dlw_host}" 2>/dev/null | grep -q "^Principal: host/${dlw_host}@.*" &&
+ LANG=C kadmin.local -q "get_principal nfs/${dlw_host}" 2>/dev/null | grep -q "^Principal: nfs/${dlw_host}@.*" ; then
+
+
+ kadmin.local -q "ktadd -k ${DLW_KRB5_KEYTAB}.new host/${dlw_host}"
+ kadmin.local -q "ktadd -k ${DLW_KRB5_KEYTAB}.new nfs/${dlw_host}"
+
+ chown "root:${SPECIAL_USER}" "${DLW_KRB5_KEYTAB}.new"
+ chmod 0640 "${DLW_KRB5_KEYTAB}.new"
+ mv -v "${DLW_KRB5_KEYTAB}.new" "${DLW_KRB5_KEYTAB}"
+ cp -av "${DLW_KRB5_KEYTAB}" "${DLW_KRB5_KEYTAB/.${DOMAIN}/}"
+ else
+ echo "WARNING: Diskless workstation '${dlw_host}' is missing a host (host/${dlw_host}) or service (nfs/${dlw_host}) principal in the Kerberos database."
+ logger -t update-dlw-krb5-keytabs -p warning "Diskless workstation '${dlw_host}' is missing a host (host/${dlw_host}) or service (nfs/${dlw_host}) principal in the Kerberos database."
+ fi
+ break
+ ;;
+ *)
+ ;;
+ esac
+ done <<< `ldapsearch -xLLL "(&(cn=$ldap_cn)(|(objectClass=GOHard)(objectClass=ipHost)))" cn 2>/dev/null | perl -p00e 's/\r?\n //g'`
+
+ if [ "$host_found" != "true" ]; then
+
+ # if we land here,three things might have happened:
+ #
+ # 1. this script is called from gosa-remove-host (and we need to clean up the keytab file)
+ # 2. this script has been called with a wrong hostname (one that does not exist in LDAP)
+ # 3. this script has found a DLW entry in NIS netgroup 'diskless-workstation-hosts' that
+ # does not exist in LDAP (any more). Manual tidying up required in that case.
+
+ if [ -f "${DLW_KRB5_KEYTAB}" ]; then
+ logger -t update-dlw-krb5-keytabs -p info "Cleaning up DLW keytab file of host '${dlw_host}'."
+ rm -v "${DLW_KRB5_KEYTAB}"
+ rm -v "${DLW_KRB5_KEYTAB/.${DOMAIN}/}"
+ elif [ -f "${DLW_KRB5_KEYTAB/.${DOMAIN}/}" ]; then
+ logger -t update-dlw-krb5-keytabs -p info "Cleaning up leftover DLW keytab file of host '${dlw_host}' (without domain part)."
+ rm -v "${DLW_KRB5_KEYTAB/.${DOMAIN}/}"
+ else
+
+ echo "WARNING: Hostname '${dlw_host}' listed in NIS netgorup 'diskless-workstation-hosts', but not found as a host entry in Debian Edu LDAP."
+ logger -t update-dlw-krb5-keytabs -p warning "Hostname '${dlw_host}' listed in NIS netgorup 'diskless-workstation-hosts', but not found as a host entry in Debian Edu LDAP."
+
+ fi
+
+ fi
+
+done
+
+# FIXME: count updated files / hosts
+logger -t update-dlw-krb5-keytabs -p notice "Diskless workstation Krb5 keytab files updated."
+
+exit 0
diff --git a/share/glib-2.0/schemas/90_itzks+gnome-tablet.gschema.override b/share/glib-2.0/schemas/90_itzks+gnome-tablet.gschema.override
new file mode 100644
index 0000000..e741564
--- /dev/null
+++ b/share/glib-2.0/schemas/90_itzks+gnome-tablet.gschema.override
@@ -0,0 +1,2 @@
+[org.gnome.shell]
+favorite-apps=[ 'chromium.desktop', 'org.gnome.Nautilus.desktop' ]
diff --git a/share/glib-2.0/schemas/90_itzks+mate.gschema.override b/share/glib-2.0/schemas/90_itzks+mate.gschema.override
index 0b1a2db..3fa72e8 100644
--- a/share/glib-2.0/schemas/90_itzks+mate.gschema.override
+++ b/share/glib-2.0/schemas/90_itzks+mate.gschema.override
@@ -1,30 +1,29 @@
[org.mate.panel]
default-layout="itzks"
+# FIXME: drop for Debian Edu bookworm
[org.mate.screensaver]
lock-delay=5
logout-delay=40
logout-enabled=true
logout-command='/usr/bin/itzks-goodbye-user-session'
+# FIXME: drop for Debian Edu bookworm
[org.mate.session]
idle-delay=15
-[org.mate.interface]
-icon-theme='menta'
-gtk-theme='Menta'
-
-[org.mate.Marco.general]
-theme='Menta'
-
-[org.mate.peripherals-mouse]
-cursor-theme='menta'
-
+# FIXME: drop for Debian Edu bookworm
[org.mate.peripherals-touchpad]
disable-while-typing=false
+# FIXME: drop for Debian Edu bookworm
[org.mate.SettingsDaemon.plugins.media-keys]
logout='<Alt>l'
+# FIXME: drop for Debian Edu bookworm
[org.mate.session]
logout-timeout=10
+
+# FIXME: drop for Debian Edu bookworm
+[org.mate.screensaver]
+picture-filename='/usr/share/images/desktop-base/desktop-background'