[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 5 commits: Cope with recent bind9 package changes (bind9 -> named at various places) to fix
WolfgangSchweer
gitlab at salsa.debian.org
Sun Apr 26 23:08:06 BST 2020
WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config
Commits:
6d040ad2 by Wolfgang Schweer at 2020-04-27T00:00:15+02:00
Cope with recent bind9 package changes (bind9 -> named at various places) to fix
LDAP setup during installation and other broken configuration scripts and files.
- ldap-tools/ldap-debian-edu-install
- cf3/cf.bind
- etc/resolvconf/update.d/bind-debian-edu
- share/debian-edu-config/tools/edu-ltsp-install
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
2ee2ec83 by Wolfgang Schweer at 2020-04-27T00:02:40+02:00
Adjust testsuite components to reflect LTSP, Icinga2 and PXE installation related changes
- testsuite/{icinga,ldap-client,pxeinstall}
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
6e7a0f60 by Wolfgang Schweer at 2020-04-27T00:04:36+02:00
Adjust testsuite/samba to check if Samba is fully functional.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
35d5ff30 by Wolfgang Schweer at 2020-04-27T00:05:42+02:00
Adjust share/debian-edu-config/tools/install-task-pkgs
now that the Cinnamon desktop environment is also supported.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
1a480161 by Wolfgang Schweer at 2020-04-27T00:06:52+02:00
Add changelog entries for last commits.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
10 changed files:
- cf3/cf.bind
- debian/changelog
- etc/resolvconf/update.d/bind-debian-edu
- ldap-tools/ldap-debian-edu-install
- share/debian-edu-config/tools/edu-ltsp-install
- share/debian-edu-config/tools/install-task-pkgs
- testsuite/icinga
- testsuite/ldap-client
- testsuite/pxeinstall
- testsuite/samba
Changes:
=====================================
cf3/cf.bind
=====================================
@@ -13,7 +13,7 @@ files:
"$(bind_file)"
perms => mog("2775","root","bind");
- "/etc/default/bind9"
+ "/etc/default/named"
edit_line => bind_default;
}
=====================================
debian/changelog
=====================================
@@ -1,3 +1,21 @@
+debian-edu-config (2.11.23) UNRELEASED; urgency=medium
+
+ * Cope with recent bind9 package changes (bind9 -> named at various places) to
+ fix initial LDAP setup during installation and other broken configuration
+ scripts and files.
+ - ldap-tools/ldap-debian-edu-install
+ - cf3/cf.bind
+ - etc/resolvconf/update.d/bind-debian-edu
+ - share/debian-edu-config/tools/edu-ltsp-install
+ * Adjust testsuite components to reflect LTSP, Icinga2 and PXE installation
+ related changes:
+ - testsuite/{icinga,ldap-client,pxeinstall}
+ * Adjust testsuite/samba to check if Samba is fully functional.
+ * Adjust share/debian-edu-config/tools/install-task-pkgs now that the Cinnamon
+ desktop environment is also supported.
+
+ -- Wolfgang Schweer <wschweer at arcor.de> Sun, 26 Apr 2020 16:31:19 +0200
+
debian-edu-config (2.11.21) unstable; urgency=medium
[ Wolfgang Schweer ]
=====================================
etc/resolvconf/update.d/bind-debian-edu
=====================================
@@ -21,7 +21,7 @@ PATH=/sbin:/bin
[ -f /etc/bind/debian-edu/named.conf.options ] || exit 0
OPTS_FILE=named-debian-edu.options
-RUN_DIR=/var/run/bind
+RUN_DIR=/run/named
[ -d "$RUN_DIR" ] || mkdir --parents --mode=0755 "$RUN_DIR"
@@ -98,6 +98,5 @@ else
mv -f "$TMP_FILE" "$OPTS_FILE"
# /usr/sbin/ for invoke-rc.d
PATH=$PATH:/usr/sbin
- [ -x /etc/init.d/bind9 ] && invoke-rc.d bind9 reload > /dev/null 2>&1 || :
- [ -x /etc/init.d/bind ] && invoke-rc.d bind reload > /dev/null 2>&1 || :
+ [ -x /etc/init.d/named ] && invoke-rc.d named reload > /dev/null 2>&1 || :
fi
=====================================
ldap-tools/ldap-debian-edu-install
=====================================
@@ -189,8 +189,8 @@ dns_stop() {
# make sure to stop DNS service, to avoid hanging installer.
PID=`pidof named || /bin/true`
if [ -n "$PID" ]; then
- echo "info: stopping bind9 with pid $PID"
- service bind9 stop
+ echo "info: stopping named with pid $PID"
+ service named stop
fi
}
@@ -369,7 +369,7 @@ EOF
else
# Samba will also need DNS to bind to LDAP
- service bind9 start
+ service named start
# sync DNS from LDAP for the first time... (this has to run as uid ,,bind''!)
su -s /bin/sh -c "PATH=/usr/sbin:/sbin:/usr/bin:/bin /usr/sbin/ldap2bind" - bind
=====================================
share/debian-edu-config/tools/edu-ltsp-install
=====================================
@@ -422,7 +422,7 @@ if [ "yes" == "$diskless_workstation" ] ; then
# OTOH some services need to be disabled, i.e. 'masked'.
cat <<EOF >> /etc/ltsp/ltsp.conf
PRE_INIT_MAIN_SERVER="systemctl enable autofs"
-MASK_SYSTEM_SERVICES="apache2 bind9 cups dovecot etckeeper exim4 squid tftpd-hpa \
+MASK_SYSTEM_SERVICES="apache2 named cups dovecot etckeeper exim4 squid tftpd-hpa \
icinga2 nmbd smbd systemd-journald xrdp krb5-kdc mariadb cfengine3"
EOF
fi
=====================================
share/debian-edu-config/tools/install-task-pkgs
=====================================
@@ -205,7 +205,7 @@ for lang in $(echo $langsfull) ; do
done
done
# finally the stock desktop tasks
-for d in gnome kde mate lxde lxqt xfce ; do
+for d in cinnamon gnome kde mate lxde lxqt xfce ; do
if dpkg -l education-desktop-$d 1>/dev/null ; then
apt-get -yq install task-$d-desktop
fi
=====================================
testsuite/icinga
=====================================
@@ -1,25 +1,30 @@
#!/bin/sh
if test -r /etc/debian-edu/config ; then
- . /etc/debian-edu/config
+ . /etc/debian-edu/config
fi
# Only Main-Server got Nagios running
if echo "$PROFILE" | grep -q Main-Server ; then
- :
+ :
else
- exit 0
+ exit 0
fi
if [ -x /usr/sbin/icinga2 ] ; then
- echo "success: $0: Found /usr/sbin/icinga2 binary."
+ echo "success: $0: Found /usr/sbin/icinga2 binary."
else
- echo "error: $0: Missing /usr/sbin/icinga2."
+ echo "error: $0: Missing /usr/sbin/icinga2."
fi
-if [ -f /etc/apache2/conf-enabled/icinga2-classicui.conf ] ; then
- echo "success: $0: The icinga2-classicui web site is enabled."
+if [ -f /etc/apache2/conf-enabled/icingaweb2.conf ] ; then
+ echo "success: $0: The Icinga 2 web site is enabled."
else
- echo "error: $0: The icinga2-classicui web site is missing."
+ echo "error: $0: The Icinga 2 web site is missing."
+fi
+if [ -f /etc/icingaweb2/roles.ini ] ; then
+ echo "success: $0: The Icinga 2 web site configuration succeeded."
+else
+ echo "error: $0: The Icinga 2 web site configuration is missing."
fi
=====================================
testsuite/ldap-client
=====================================
@@ -206,9 +206,4 @@ if [ -r /etc/sssd/sssd.conf ] ; then
fi
fi
-if echo "$PROFILE" | egrep -q 'LTSP-Server' ; then
- check_file_perm \
- /opt/ltsp/*/etc/ssl/certs/debian-edu-server.crt 644
-fi
-
exit $RESULT
=====================================
testsuite/pxeinstall
=====================================
@@ -3,40 +3,27 @@
# Check the PXE setup.
if test -r /etc/debian-edu/config ; then
- . /etc/debian-edu/config
+ . /etc/debian-edu/config
fi
-# Only Main-Server should have the PXE boot setup
-if echo "$PROFILE" | grep -q Main-Server ; then
- :
+# Systems with 'LTSP-Server' or 'Main-Server' profile have the iPXE boot setup.
+if echo "$PROFILE" | grep -qE 'Main-Server|LTSP-Server' ; then
+ :
else
- exit 0
+ exit 0
fi
-file=/var/lib/tftpboot/pxelinux.0
+file=/srv/tftp/ltsp/ltsp.ipxe
if [ -f $file ] ; then
- echo "success: $0: PXE file $file is present"
+ echo "success: $0: iPXE menu file $file is present"
else
- echo "error: $0: Unable to find PXE file $file"
+ echo "error: $0: Unable to find iPXE menu file $file"
fi
-if dpkg-query -l atftpd | grep ii ; then
- if egrep -q '^tftp.*/var/lib/tftpboot' /etc/inetd.conf ; then
- echo "success: $0: tftp entry in /etc/inetd.conf is using /var/lib/tftpboot"
- else
- echo "error: $0: tftp entry in /etc/inetd.conf doesn't use /var/lib/tftpboot"
- fi
+# Verify that the tftp server is handing out the installation menu.
+file=/srv/tftp/debian-edu/install.cfg
+if [ -f $file ] ; then
+ echo "success: $0: iPXE menu component $file is present"
+else
+ echo "error: $0: Unable to find iPXE menu component $file"
fi
-
-# verify that tftp server is handing out pxelinux.0 and syslinux/ldlinux.c32
-for file in pxelinux.0 syslinux/ldlinux.c32 ; do
- tmpfile=$(tempfile)
- if echo get /var/lib/tftpboot/pxelinux.0 "$tmpfile" | tftp $(hostname) | grep -qi error || \
- [ ! -s "$tmpfile" ] ; then
- echo "error: $0: tftp server doesn't provide $file!"
- else
- echo "success: $0: tftp server provides $file."
- fi
- ls -l "$tmpfile"
- rm "$tmpfile"
-done
=====================================
testsuite/samba
=====================================
@@ -66,9 +66,9 @@ if which net >/dev/null 2>&1 ; then
fi
exec 2>/dev/null
if net time 2>&1 | grep -q $(date +%Y) ; then
- echo "success: $0: command 'net time' doesn't segfault."
+ echo "success: $0: command 'net time' is working."
else
- echo "error: $0: command 'net time' segfaults (bug #760781)."
+ echo "error: $0: command 'net time' fails, check if Samba is working."
fi
else
echo "error: $0: missing net binary."
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/0b3e1978a5cdf2baa07eb686ffd8fe406a2daa3e...1a4801613484c5f3f8d1054e55b83364da3aafc7
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/0b3e1978a5cdf2baa07eb686ffd8fe406a2daa3e...1a4801613484c5f3f8d1054e55b83364da3aafc7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20200426/32da1ede/attachment-0001.html>
More information about the debian-edu-commits
mailing list