[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 4 commits: Make sure the iPXE setup is created for PXE installations in case of a plain main server

[Wolfgang Schweer]

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


Commits:
22db044c by Wolfgang Schweer at 2021-01-03T13:50:50+01:00
Make sure the iPXE setup is created for PXE installations in case of a plain main server

Despite the used tool no LTSP setup is actually done.
The tool just comes in handy for this purpose.

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

- - - - -
d5258d01 by Wolfgang Schweer at 2021-01-03T13:53:42+01:00
Adjust share/debian-edu-config/tools/edu-icinga-setup to cope with recent changes

Some more occurencies of mysql have been replaced with mariadb (package mariadb-server).

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

- - - - -
16e6ae25 by Wolfgang Schweer at 2021-01-03T13:57:33+01:00
Make sure the first user's Samba account is created

share/debian-edu-config/tools/kerberos-kdc-init: Delay clearing the debconf
database from passwords until Samba account setup has been done.

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

- - - - -
541d201b by Wolfgang Schweer at 2021-01-03T14:22:22+01:00
Add changelog entries for last commits

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

- - - - -


4 changed files:

- debian/changelog
- share/debian-edu-config/d-i/finish-install
- share/debian-edu-config/tools/edu-icinga-setup
- share/debian-edu-config/tools/kerberos-kdc-init


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+debian-edu-config (2.11.43) UNRELEASED; urgency=medium
+
+  * share/debian-edu-config/tools/kerberos-kdc-init:
+    - Delay clearing the debconf database from passwords until the first user's
+      Samba account has been created.
+  * share/debian-edu-config/tools/edu-icinga-setup:
+    - Cope with recent mariadb-server package changes. Some leftover occurencies
+      of 'mysql' have been replaced with 'mariadb'.
+  * share/debian-edu-config/d-i/finish-install:
+    - Make sure the iPXE setup for PXE installations is created in case of a
+      plain main server. Despite the used tool no LTSP setup is actually done.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 03 Jan 2021 14:05:11 +0100
+
 debian-edu-config (2.11.42) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
share/debian-edu-config/d-i/finish-install
=====================================
@@ -33,6 +33,19 @@ preserve_network_interfaces() {
 db_get debian-edu-install/profile
 PROFILE="$RET"
 
+# Make sure the iPXE setup is created for PXE installations in case of a plain
+# main server. Note that despite the used tool no LTSP setup is actually done.
+# The tool just comes in handy for this purpose.
+if echo "$PROFILE" | grep -qE 'Main-Server' && \
+	! echo "$PROFILE" | grep -q 'LTSP-Server' && \
+	[ -d /etc/ltsp ] ; then
+	if in-target /bin/sh -c "/usr/sbin/debian-edu-ltsp-install --diskless_workstation no" ; then
+		log "info: The iPXE setup succeeded"
+	else
+		log "error: The iPXE setup failed"
+	fi
+fi
+
 # Create LTSP thin client image and iPXE setup in case of a combined server.
 if echo "$PROFILE" | grep -Eq 'Main-Server.*LTSP-Server' ; then
 	in-target /bin/sh -c "modprobe squashfs"


=====================================
share/debian-edu-config/tools/edu-icinga-setup
=====================================
@@ -183,9 +183,8 @@ setup_icinga() {
 	mysql -e "FLUSH PRIVILEGES"
 }
 
-## Check if MariaDB server is running; please note that the init script is named
-## mysql while systemd has mariadb.service; we need the init script inside d-i:
-PID=$(pidof mysqld || /bin/true)
+## Make sure the MariaDB server is running.
+PID=$(pidof mariadbd || /bin/true)
 if [ -z "$PID" ]; then
 	echo "The MariaDB server doesn't seem to be running. Trying to start it." 1>&2
 	if [ -x /sbin/start-stop-daemon.REAL ] ; then
@@ -193,11 +192,11 @@ if [ -z "$PID" ]; then
 		mv /sbin/start-stop-daemon /sbin/start-stop-daemon.FAKE
 		cp /sbin/start-stop-daemon.REAL /sbin/start-stop-daemon
 	fi
-	service mysql start
+	service mariadb start
 	mariadb_started=true
 fi
 
-PID=$(pidof mysqld || /bin/true)
+PID=$(pidof mariadbd || /bin/true)
 if [ -z "$PID" ]; then
 	echo "error: the MariaDB server is not running. Skipping Icinga 2 setup." 1>&2
 	exit 1
@@ -206,7 +205,7 @@ else
 fi
 
 if [ true = "$mariadb_started" ] ; then
-	service mysql stop
+	service mariadb stop
 	if [ -x /sbin/start-stop-daemon.REAL ] ; then
 		mv /sbin/start-stop-daemon.FAKE /sbin/start-stop-daemon
     fi


=====================================
share/debian-edu-config/tools/kerberos-kdc-init
=====================================
@@ -255,13 +255,13 @@ firstuser_post() {
     pwlen=$(echo -n "$FIRSTUSERPWD" | wc -c)
     echo "Creating Kerberos principal for $USERDN (password length $pwlen)"
     kadmin.local -q "add_principal -policy users -pw \"$FIRSTUSERPWD\" -x dn=$USERDN $FIRSTUSERNAME" 1>&2
-    db_set debian-edu-config/first-user-password ''
-    echo "First user password cleared from debconf database." 1>&2
 }
 
 firstuser_samba() {
     echo "Adding Samba account for '$FIRSTUSERNAME'"
     (echo $FIRSTUSERPWD; echo $FIRSTUSERPWD) | smbpasswd -a -s $FIRSTUSERNAME
+    db_set debian-edu-config/first-user-password ''
+    echo "First user password cleared from debconf database." 1>&2
 }
 
 ## check if there is no kdc yet:



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/261f97e39a1dd7e788b529f1aa42228e3966e71d...541d201b45bf04ee2502282f1c408111e46595cc

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/261f97e39a1dd7e788b529f1aa42228e3966e71d...541d201b45bf04ee2502282f1c408111e46595cc
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/20210103/90a73865/attachment-0001.html>