diff options
27 files changed, 39 insertions, 39 deletions
diff --git a/README.backup b/README.backup index 4f778fe..6762653 100644 --- a/README.backup +++ b/README.backup @@ -1,5 +1,5 @@ IT-Zukunft Schule: backup hosts (backup-XX.backbone) ------------------- +------------------ This package pulls in software required for running a Debian system as backup server within an ITZkS network diff --git a/README.diskless b/README.diskless index 93c91d9..d789ddd 100644 --- a/README.diskless +++ b/README.diskless @@ -1,5 +1,5 @@ IT-Zukunft Schule: Diskless Workstation Chroot Images ------------------- +------------------ This package pulls in software required for running a Debian system as a diskless workstation. diff --git a/README.disklserver b/README.disklserver index 96d1d58..24571aa 100644 --- a/README.disklserver +++ b/README.disklserver @@ -1,5 +1,5 @@ IT-Zukunft Schule: Diskless Workstation Server (disklserver.intern) ------------------- +------------------ This package pulls in software required for running a Debian system as diskless workstation server. diff --git a/README.display b/README.display index 1c0a3cd..29252f6 100644 --- a/README.display +++ b/README.display @@ -1,5 +1,5 @@ IT-Zukunft Schule: Substitue Teacher Schedule Display Chroot Images ------------------- +------------------ This package pulls in software required for running a ITZkS Diskless Display. diff --git a/README.displayserver b/README.displayserver index 0376b2c..d303bde 100644 --- a/README.displayserver +++ b/README.displayserver @@ -1,5 +1,5 @@ IT-Zukunft Schule: Diskless Workstation Server (disklserver.intern) ------------------- +------------------ This package pulls in software required for running a ITZkS server providing Substitute Teacher Schedule Displays. diff --git a/README.filter b/README.filter index 8dbfd89..6a0961c 100644 --- a/README.filter +++ b/README.filter @@ -1,5 +1,5 @@ IT-Zukunft Schule: Content Filter Server ------------------- +------------------ This package pulls in software required for running a Debian system as a content filter. diff --git a/README.itzks-common b/README.itzks-common index f5621a8..757cf72 100644 --- a/README.itzks-common +++ b/README.itzks-common @@ -1,5 +1,5 @@ IT-Zukunft Schule: Common file add-ons for Debian Edu machines ------------------- +------------------ This package pulls in config files and other files for Debian Edu machines running in the ITZkS context. diff --git a/README.mainserver b/README.mainserver index 01f087a..09440fc 100644 --- a/README.mainserver +++ b/README.mainserver @@ -1,5 +1,5 @@ IT-Zukunft Schule: Add-On Software and Features for TJENER ------------------- +------------------ The Debian Edu main server (TJENER) mainly gets installed via the Debian Edu main server bootstrap. diff --git a/README.terminalserver b/README.terminalserver index 2efc87c..fd29966 100644 --- a/README.terminalserver +++ b/README.terminalserver @@ -1,5 +1,5 @@ IT-Zukunft Schule: Terminal Servers ------------------- +------------------ This package pulls in software required for running a Debian system as a terminal server. diff --git a/README.virtman b/README.virtman index 1b1fd81..b7334d9 100644 --- a/README.virtman +++ b/README.virtman @@ -1,5 +1,5 @@ IT-Zukunft Schule: KVM hosts (virt-man-XX.backbone) ------------------- +------------------ This package pulls in software required for running a Debian system as virtual machine host system. diff --git a/README.workstation b/README.workstation index 605f968..3079476 100644 --- a/README.workstation +++ b/README.workstation @@ -1,5 +1,5 @@ IT-Zukunft Schule: Workstation System ------------------- +------------------ This package pulls in software required for running a Debian system as a (Skolelinux) workstation. diff --git a/debian/changelog b/debian/changelog index 41d8f9d..e4e1092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -853,7 +853,7 @@ itzks-systems (2013.08.07.1) squeeze-backports; urgency=low * /debian/control: - Add archive keyring packages to dependencies (all bin:packages). - - Add Adblock+ to dependencies of all X session based systems. + - Add Adblock+ to dependencies of all X session based systems. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 Aug 2013 13:43:50 +0200 @@ -1029,7 +1029,7 @@ itzks-systems (2012.08.30.1) squeeze-backports; urgency=low educational systems. * /debian/itzks-systems-backup.examples: + Provide dirvish config skeleton appropriate for ITZkS setups. - + Provide template for dirvish's master.conf. + + Provide template for dirvish's master.conf. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 30 Aug 2012 17:03:34 +0200 diff --git a/debian/control b/debian/control index 81aa99f..f9599c5 100644 --- a/debian/control +++ b/debian/control @@ -1134,7 +1134,7 @@ Depends: rawtherapee, reportbug, scratch, - sm, + sm, sqlite3, stunnel4, subversion, diff --git a/debian/itzks-systems-smartboard.postinst b/debian/itzks-systems-smartboard.postinst index 13704f2..ff935b6 100755 --- a/debian/itzks-systems-smartboard.postinst +++ b/debian/itzks-systems-smartboard.postinst @@ -123,7 +123,7 @@ case "$1" in if [ -d "$SMARTBOARD_CHROOT" ]; then cd /usr/share/itzks-systems-smartboard find * -type f | while read path; do - ln -fs /usr/share/itzks-systems-smartboard/$path /usr/share/$path + ln -fs /usr/share/itzks-systems-smartboard/$path /usr/share/$path done cd - 1>/dev/null diff --git a/etc/debian-edu/itzks.config b/etc/debian-edu/itzks.config index 032f609..fc188d8 100644 --- a/etc/debian-edu/itzks.config +++ b/etc/debian-edu/itzks.config @@ -1,6 +1,6 @@ ####################################### # -# resource control +# resource control # of IT-Zukunft Schule server scripts # ####################################### @@ -87,13 +87,13 @@ function script_header () { xterm|linux) exec_type="ITZkS script (direct call)" ;; - dumb) + dumb) exec_type="cronlog-entry (dumb terminal)" ;; - cron) + cron) exec_type="cronlog-entry" ;; - *) + *) exec_type="ITZkS script (unknown exec origin)" ;; esac @@ -142,7 +142,7 @@ function check_root () { if [ ! "`id 2>&1 | egrep 'uid=0' | cut -d '(' -f1`" = "uid=0" ]; then echo "Enter root's password here..." OMMAND="`absolute_scriptpath $0` $@" - su -c "$COMMAND" + su -c "$COMMAND" exit 0 fi @@ -179,7 +179,7 @@ function finish_script () { function absolute_scriptpath () { # this is buggy for "./bin/script.sh" (per) - case $0 in + case $0 in /*) echo "$0" ;; *) echo "`pwd`/$0" ;; esac diff --git a/etc/firefox-esr/itzks_caching.js b/etc/firefox-esr/itzks_caching.js index 2f0ba55..929ea31 100644 --- a/etc/firefox-esr/itzks_caching.js +++ b/etc/firefox-esr/itzks_caching.js @@ -1,2 +1,2 @@ -pref("browser.cache.disk.enable", "false"); +pref("browser.cache.disk.enable", "false"); pref("browser.cache.memory.enable", "true"); diff --git a/etc/schroot/slxdesktop.ITZkS/fstab b/etc/schroot/slxdesktop.ITZkS/fstab index 74d0949..d4c7a02 100644 --- a/etc/schroot/slxdesktop.ITZkS/fstab +++ b/etc/schroot/slxdesktop.ITZkS/fstab @@ -9,7 +9,7 @@ /dev/pts /dev/pts none rw,bind 0 0 /home /home none rw,bind 0 0 /tmp /tmp none rw,bind 0 0 -/srv /srv none rw,bind 0 0 +/srv /srv none rw,bind 0 0 /skole /skole none rw,rbind 0 0 /media /media none rw,rbind 0 0 diff --git a/examples/backup/README.dirvish b/examples/backup/README.dirvish index 0bc9f17..927e7b0 100644 --- a/examples/backup/README.dirvish +++ b/examples/backup/README.dirvish @@ -6,4 +6,4 @@ Installation steps: 1. Untar these files to backup-XX:/srv/dirvish $ tar xvz -C /srv -f backup-dirvish.tar.gz - + diff --git a/examples/disklserver/README.tftp b/examples/disklserver/README.tftp index 8b22f68..30b2265 100644 --- a/examples/disklserver/README.tftp +++ b/examples/disklserver/README.tftp @@ -7,4 +7,4 @@ Installation steps: 1. Untar these files to disklserver:/srv/tftp $ tar xvz -C /srv -f disklserver-tftp.tar.gz - + diff --git a/examples/displayserver/README.tftp b/examples/displayserver/README.tftp index 9a7648e..22221b3 100644 --- a/examples/displayserver/README.tftp +++ b/examples/displayserver/README.tftp @@ -7,4 +7,4 @@ 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 index 36d4b67..01af6ba 100644 --- a/examples/displayserver/tftp/_common_/debian-edu/display.cfg +++ b/examples/displayserver/tftp/_common_/debian-edu/display.cfg @@ -1,4 +1,4 @@ -LABEL vplan +LABEL vplan MENU LABEL ^Vertretungsplan / Info-Terminal MENU DEFAULT KERNEL display/amd64/vmlinuz diff --git a/examples/mainserver/README.tftp b/examples/mainserver/README.tftp index ca21b47..dbfe561 100644 --- a/examples/mainserver/README.tftp +++ b/examples/mainserver/README.tftp @@ -6,7 +6,7 @@ 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 diff --git a/man/diskless-workstation-shell.8 b/man/diskless-workstation-shell.8 index faf260b..d322ee0 100644 --- a/man/diskless-workstation-shell.8 +++ b/man/diskless-workstation-shell.8 @@ -12,7 +12,7 @@ diskless-workstation-shell \- Opens a shell within the ITZkS Diskless Workstatio 'nh .fi .ad l -\fBdiskless-workstation-shell\fR +\fBdiskless-workstation-shell\fR .SH DESCRIPTION This helper script opens a shell within the ITZkS diskless workstation chroot environment. diff --git a/sbin/diskless-workstation-shell b/sbin/diskless-workstation-shell index 627e96d..baaa1fe 100755 --- a/sbin/diskless-workstation-shell +++ b/sbin/diskless-workstation-shell @@ -23,13 +23,13 @@ VERSION=0.1 DLW_SHELL="bash" CHROOT="/srv/ltsp/i386/" -test -e "$CHROOT" || { +test -e "$CHROOT" || { echo "ERROR: Diskless workstation chroot does not exist at $CHROOT." exit -1 } -[ "x$USER" == "xroot" ] || { - echo "ERROR: Diskless workstation management has to be performed as root." +[ "x$USER" == "xroot" ] || { + echo "ERROR: Diskless workstation management has to be performed as root." exit -2 } diff --git a/sbin/itzks-display-shell b/sbin/itzks-display-shell index db05bb8..4e6f770 100755 --- a/sbin/itzks-display-shell +++ b/sbin/itzks-display-shell @@ -23,13 +23,13 @@ VERSION=0.1 DISPLAY_SHELL="bash" CHROOT="/srv/ltsp/amd64/" -test -e "$CHROOT" || { +test -e "$CHROOT" || { echo "ERROR: ITZkS display system chroot does not exist at $CHROOT." exit -1 } -[ "x$USER" == "xroot" ] || { - echo "ERROR: ITZkS display system management has to be performed as root." +[ "x$USER" == "xroot" ] || { + echo "ERROR: ITZkS display system management has to be performed as root." exit -2 } diff --git a/sbin/itzks-switch-to-systemd-networkd b/sbin/itzks-switch-to-systemd-networkd index 99edc15..cb7a8c2 100755 --- a/sbin/itzks-switch-to-systemd-networkd +++ b/sbin/itzks-switch-to-systemd-networkd @@ -24,9 +24,9 @@ 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 +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 diff --git a/sbin/itzks-transfer-cleaner b/sbin/itzks-transfer-cleaner index 9e848fc..4bd530c 100755 --- a/sbin/itzks-transfer-cleaner +++ b/sbin/itzks-transfer-cleaner @@ -69,7 +69,7 @@ function remove_directories () { done } -# main +# main check_host "tjener" check_root |