[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: Adjust sbin/debian-edu-ltsp-install. (Closes: #993935)

[Wolfgang Schweer (@schweer-guest)]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
7215fff6 by Wolfgang Schweer at 2021-09-08T23:06:13+02:00
Adjust sbin/debian-edu-ltsp-install. (Closes: #993935)

 Extend main server related exclude list.
 Add slapd and xrdp-sesman to the list of masked services.
 Ensure home directory access after above changes.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
6d78f3dc by Wolfgang Schweer at 2021-09-08T23:08:02+02:00
Add changelog entry for last commit

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


2 changed files:

- debian/changelog
- sbin/debian-edu-ltsp-install


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+debian-edu-config (2.12.2) UNRELEASED; urgency=medium
+
+  * Adjust sbin/debian-edu-ltsp-install. (Closes: #993935)
+    Thanks to Dominik George for spotting and reporting the issue.
+    - Extend main server related exclude list.
+    - Add slapd and xrdp-sesman to the list of masked services.
+    - Ensure home directory access after above changes.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 08 Sep 2021 22:58:14 +0200
+
 debian-edu-config (2.12.1) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
sbin/debian-edu-ltsp-install
=====================================
@@ -17,7 +17,7 @@
 # Author/Copyright:	Wolfgang Schweer <wschweer at arcor.de>
 # Licence:		GPL2+
 # first edited:	2019-11-21
-# last edited:	2021-04-26
+# last edited:	2021-09-08
 
 set -e
 
@@ -197,6 +197,24 @@ fi
 # FIXME: On the main server even more additional excludes might be useful.
 if echo "$PROFILE" | grep -Eq 'Main-Server' ; then
 	cat <<EOF >> /etc/ltsp/image-local.excludes
+etc/apache2
+etc/bind
+etc/dbconfig-common
+etc/dovecot
+etc/etckeeper
+etc/gosa
+etc/freeradius
+etc/icinga
+etc/icinga2
+etc/icingaweb2
+etc/krb5kdc
+etc/mysql
+etc/nagios
+etc/nagios-plugins
+etc/nagios3
+etc/samba
+etc/slbackup
+etc/slbackup-php
 usr/lib/apache2
 usr/lib/exim4
 usr/lib/icinga
@@ -219,9 +237,12 @@ var/lib/dhcp/*
 var/lib/dpkg/*
 var/lib/exim4/*
 var/lib/icinga/*
+var/lib/ldap/*
 var/lib/munin/*
 var/lib/munin-node/*
 var/lib/nfs/*
+var/lib/samba/*
+var/log/apache2/*
 var/log/cfengine/*
 var/log/installer/*
 var/log/munin/*
@@ -470,10 +491,11 @@ if [ "yes" == "$diskless_workstation"  ] ; then
 		# is disabled, but it is needed for diskless workstations.
 		# OTOH some services need to be disabled, i.e. 'masked'.
 		cat <<EOF >> /etc/ltsp/ltsp.conf
+PRE_INIT_AUTOFS="echo 'LDAPURI=ldap://ldap' >> /etc/default/autofs"
 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 isc-dhcp-server"
+icinga2 nmbd slapd smbd systemd-journald xrdp xrdp-sesman krb5-kdc mariadb cfengine3 isc-dhcp-server"
 EOF
 	else
 		cat <<EOF >> /etc/ltsp/ltsp.conf
@@ -500,6 +522,7 @@ EOF
 	fi
 	# Clean up ltsp.conf from specific items.
 	sed -i '/PRE_INIT_MAIN/d' /etc/ltsp/ltsp.conf
+	sed -i '/PRE_INIT_AUTOFS/d' /etc/ltsp/ltsp.conf
 	sed -i '/MASK_SYSTEM/d' /etc/ltsp/ltsp.conf
 fi
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/75944ab25ab4c7d7fe450b7cb021749f47348f0f...6d78f3dce0ccbd57e03ad12750abcc6e3978576a

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/75944ab25ab4c7d7fe450b7cb021749f47348f0f...6d78f3dce0ccbd57e03ad12750abcc6e3978576a
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/20210908/f9f53494/attachment-0001.htm>