[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 4 commits: ldap-bootstrap/gosa-server.ldif: Adjust LTSP related DHCP options and statements
Wolfgang Schweer
gitlab at salsa.debian.org
Mon May 25 23:29:06 BST 2020
Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config
Commits:
e8a488dc by Wolfgang Schweer at 2020-05-26T00:22:35+02:00
ldap-bootstrap/gosa-server.ldif: Adjust LTSP related DHCP options and statements
(root-path, filename).
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
e2a8fbc5 by Wolfgang Schweer at 2020-05-26T00:24:42+02:00
ldap-bootstrap/autofs.ldif: Drop deprecated NFS4 mount option 'intr'.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
e783be25 by Wolfgang Schweer at 2020-05-26T00:26:05+02:00
Adjust share/debian-edu-config/tools/edu-ltsp-install.
Improve inline documentation.
Drop dnsmasq package installation and setup.
Adjust interfaces configuration to match the use of ISC DHCP server.
Use FQDN for the main server to enable LTSP diskless client use on the
backbone network.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
9d03dca0 by Wolfgang Schweer at 2020-05-26T00:27:30+02:00
Add changelog entries for last commits.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
4 changed files:
- debian/changelog
- ldap-bootstrap/autofs.ldif
- ldap-bootstrap/gosa-server.ldif
- share/debian-edu-config/tools/edu-ltsp-install
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+debian-edu-config (2.11.26) UNRELEASED; urgency=medium
+
+ * Improve LTSP client setup, provide a full iPXE menu for both the backbone
+ and the dedicated LTSP network, use ISC DHCP server instead of dnsmasq.
+ - ldap-bootstrap/gosa-server.ldif: Adjust LTSP related DHCP options and
+ statements (root-path, filename).
+ - ldap-bootstrap/autofs.ldif: Drop deprecated NFS4 mount option 'intr'.
+ - share/debian-edu-config/tools/edu-ltsp-install:
+ + Improve inline documentation.
+ + Drop dnsmasq package installation and setup.
+ + Adjust interfaces configuration to match the use of ISC DHCP server.
+ + Use FQDN for the main server to enable LTSP diskless client use on the
+ backbone network.
+
+ -- Wolfgang Schweer <wschweer at arcor.de> Tue, 26 May 2020 00:00:29 +0200
+
debian-edu-config (2.11.25) unstable; urgency=medium
[ Wolfgang Schweer ]
=====================================
ldap-bootstrap/autofs.ldif
=====================================
@@ -40,4 +40,4 @@ ou: auto.tjener
dn: cn=/,ou=auto.tjener,ou=automount,dc=skole,dc=skolelinux,dc=no
objectClass: automount
cn: /
-automountInformation: -fstype=nfs4,sec=krb5i,tcp,rw,intr,hard,nodev,nosuid tjener.intern:/&
+automountInformation: -fstype=nfs4,sec=krb5i,tcp,rw,hard,nodev,nosuid tjener.intern:/&
=====================================
ldap-bootstrap/gosa-server.ldif
=====================================
@@ -257,7 +257,6 @@ dhcpOption: routers ltspserver00.subnet00
dhcpOption: domain-name "intern"
dhcpOption: subnet-mask 255.255.255.0
dhcpOption: broadcast-address 192.168.0.255
-dhcpOption: root-path "/opt/ltsp/$LTSPARCH"
dhcpOption: ntp-servers ntp
dhcpOption: wpad-url "http://wpad/wpad.dat"
dhcpOption: smtp-server postoffice
@@ -270,6 +269,7 @@ dhcpStatements: authoritative
dhcpStatements: allow unknown-clients
dhcpStatements: allow bootp
dhcpStatements: allow booting
+dhcpStatements: if exists ipxe.menu { filename "ltsp/ltsp.ipxe"; } elsif option arch = 00:00 { filename "ltsp/undionly.kpxe"; } elsif option arch = 00:07 { filename "ltsp/snponly.efi"; } elsif option arch = 00:09 { filename "ltsp/snponly.efi"; } else { filename "ltsp/unmatched-client"; }
cn: subnet00.intern
objectClass: top
objectClass: dhcpSharedNetwork
@@ -296,12 +296,12 @@ dhcpOption: smtp-server postoffice
dhcpOption: domain-name-servers 10.0.2.2
dhcpStatements: default-lease-time 432000
dhcpStatements: max-lease-time 432000
-dhcpStatements: filename "/var/lib/tftpboot/ltsp/$LTSPARCH/pxelinux.0"
dhcpStatements: next-server ltspserver01.subnet01
dhcpStatements: authoritative
dhcpStatements: allow unknown-clients
dhcpStatements: allow bootp
dhcpStatements: allow booting
+dhcpStatements: if exists ipxe.menu { filename "ltsp/ltsp.ipxe"; } elsif option arch = 00:00 { filename "ltsp/undionly.kpxe"; } elsif option arch = 00:07 { filename "ltsp/snponly.efi"; } elsif option arch = 00:09 { filename "ltsp/snponly.efi"; } else { filename "ltsp/unmatched-client"; }
cn: subnet01.intern
objectClass: top
objectClass: dhcpSharedNetwork
=====================================
share/debian-edu-config/tools/edu-ltsp-install
=====================================
@@ -13,7 +13,7 @@
# Author/Copyright: Wolfgang Schweer <wschweer at arcor.de>
# Licence: GPL2+
# first edited: 2019-11-21
-# last edited: 2020-04-11
+# last edited: 2020-05-25
#
# 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
@@ -56,10 +56,11 @@ workstations and thin clients.
desktop: x2gothinclient running in minidesktop mode.
Example 1: '/path/to/edu-ltsp-install --arch amd64' creates diskless workstation support.
-Example 2: '/path/to/edu-ltsp-install --arch amd64' --dist bullseye --thin_type bare'
- creates diskless workstation and thin client support; boot defaults to diskless ws.
+Example 2: '/path/to/edu-ltsp-install --arch amd64 --dist bullseye --thin_type bare'
+ creates diskless workstation and thin client support; the default LTSP
+ client boot defaults to diskless workstation.
-This script applies to a system with two NICs, located inside the internal backbone network.
+This script applies to a system with two NICs on the internal backbone network.
EOF
exit 0
@@ -100,15 +101,8 @@ if [ "i386" == "$arch" ] ; then
kernel_arch="686"
fi
-# FIXME: dnsmasq (restricted to eth1), comes in handy for easy LTSP setup. Maybe
-# it would be better to use isc-dhcp-server (config in LDAP) everywhere.
-DEBIAN_FRONTEND=noninteractive apt -yq install dnsmasq
-
-# Modify /etc/default/dnsmasq to be compliant with the resolvconf package.
-sed -i 's%#IGNORE_RE%IGNORE_RE%' /etc/default/dnsmasq
-
# Common Debian Edu specific configuration (dirs and HERE documents), only minor
-# difference for thin and diskless (in ltsp.conf), see below.
+# difference for thin clients and diskless workstation (in ltsp.conf), see below.
if [ ! -d /etc/ltsp/client ] ; then
mkdir -p /etc/ltsp/client/init
@@ -422,6 +416,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"
+POST_INIT_USE_FQDN="sed -i '/10.0.2.2/ s/server/tjener.intern tjener/' /etc/hosts"
MASK_SYSTEM_SERVICES="apache2 named cups dovecot etckeeper exim4 squid tftpd-hpa \
icinga2 nmbd smbd systemd-journald xrdp krb5-kdc mariadb cfengine3"
EOF
@@ -462,44 +457,29 @@ fi
# Tweak network interfaces file to match the use case.
if echo "$PROFILE" | grep -Eq 'Main-Server' ; then
cat <<EOF > /etc/network/interfaces
-auto eth0
+auto eth0 eth1
iface eth0 inet static
address 10.0.2.2
gateway 10.0.0.1
dns-search intern
-allow-hotplug eth1
iface eth1 inet static
- address 192.168.67.1
+ address 192.168.0.254
EOF
else
cat <<EOF > /etc/network/interfaces
-auto eth0
+auto eth0 eth1
iface eth0 inet dhcp
post-up /usr/sbin/update-hostname-from-ip
-allow-hotplug eth1
iface eth1 inet static
- address 192.168.67.1
+ address 192.168.0.254
EOF
fi
# Configure NFS
ltsp nfs
-# Restrict dnsmasq to the eth1, i.e. LTSP network interface.
-cat <<EOF > /etc/dnsmasq.d/99-debian-edu.conf
-interface=eth1
-bind-interfaces
-EOF
-
-# Use tftpd-hpa on the main server (-t0 disables dnsmasq's tftpd feature)
-if echo "$PROFILE" | grep -Eq 'Main-Server' ; then
- ltsp dnsmasq -d0 -p0 -t0 --dns-server="$dns_server"
-else
- ltsp dnsmasq -d0 -p0 --dns-server="$dns_server"
-fi
-
# Next line is needed upon upgrade from LTSP5.
sed -i '/ltsp/d' /etc/exports
@@ -508,3 +488,4 @@ sed -i '/ltsp/d' /etc/exports
if [ ! -x /sbin/start-stop-daemon.REAL ] ; then
exportfs -rav
fi
+
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/185fc675729fcff90a82849309688fa23eef19d5...9d03dca07dcea29b5678d7b5891614f6067f981d
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/185fc675729fcff90a82849309688fa23eef19d5...9d03dca07dcea29b5678d7b5891614f6067f981d
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/20200525/6e61dace/attachment-0001.html>
More information about the debian-edu-commits
mailing list