[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 6 commits: testsuite/network: fix log message.

[WolfgangSchweer]

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


Commits:
efb70fbb by Wolfgang Schweer at 2018-08-10T10:42:32Z
testsuite/network: fix log message.

- - - - -
158212f7 by Wolfgang Schweer at 2018-08-10T10:43:17Z
testsuite/webserver: Drop etc/skel test.

The test is obsolete, now that the firefox profile is no longer generated.

- - - - -
0124b4fb by Wolfgang Schweer at 2018-08-10T10:46:22Z
Add new cfengine file cf3/cf.tftpd

The '--secure' option needs to be disabled to provide both PXE menu and LTSP.

- - - - -
c1c9adaf by Wolfgang Schweer at 2018-08-10T10:49:04Z
Adjust cf3/promises.cf to enable the tftpd configuration file.

- - - - -
20d9f1ad by Wolfgang Schweer at 2018-08-10T10:50:25Z
Adjust Makefile to reflect cfengine changes.

- - - - -
3ddb0bbd by Wolfgang Schweer at 2018-08-10T11:04:09Z
Add changelog entries for last commits.

- - - - -


6 changed files:

- Makefile
- + cf3/cf.tftpd
- cf3/promises.cf
- debian/changelog
- testsuite/network
- testsuite/webserver


Changes:

=====================================
Makefile
=====================================
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ CF3FILES = \
 	cf.squid \
 	cf.sshd \
 	cf.syslog \
+	cf.tftpd \
 	cf.xrdp \
 	edu.cf \
 	promises.cf


=====================================
cf3/cf.tftpd
=====================================
--- /dev/null
+++ b/cf3/cf.tftpd
@@ -0,0 +1,20 @@
+bundle agent tftpd
+{
+# Remove the '--secure' option to be able to provide both Debian Edu PXE menu and LTSP.
+
+files:
+
+  debian.(server|ltspserver).installation::
+
+    "/etc/default/tftpd-hpa"
+      edit_line => tftpd_conf;
+}
+
+bundle edit_line tftpd_conf
+{
+
+replace_patterns:
+
+  "TFTP_OPTIONS=\"--secure\"" replace_with => value("TFTP_OPTIONS=");
+}
+


=====================================
cf3/promises.cf
=====================================
--- a/cf3/promises.cf
+++ b/cf3/promises.cf
@@ -59,6 +59,7 @@ body common control
                           sshd,
                           syslog,
                           xrdp,
+                          tftpd,
                           pxeinstall,
                           finalize,
      };
@@ -94,6 +95,7 @@ body common control
                   "debian-edu/cf.squid",
                   "debian-edu/cf.sshd",
                   "debian-edu/cf.syslog",
+                  "debian-edu/cf.tftpd",
                   "debian-edu/cf.xrdp",
       };
 


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,18 @@
 debian-edu-config (2.10.34) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * Bump standards version to 4.2.0, no changes needed.
 
+  [ Wolfgang Schweer ]
+  * Add new cfengine file cf3/cf.tftpd; the '--secure' option (tftpd-hpa) needs
+     to be disabled to provide both PXE menu and LTSP. (tftpd-hpa is now used
+     instead of atftpd to match the ltsp-server package recommends).
+  * Adjust cf3/promises.cf to enable the tftpd configuration file.
+  * Adjust Makefile to reflect cfengine changes.
+  * testsuite/network: fix log message (nmap path).
+  * testsuite/webserver: Drop etc/skel test; the test is obsolete, now that the
+    firefox ini file is no longer generated.
+
  -- Holger Levsen <holger at debian.org>  Wed, 08 Aug 2018 09:42:21 +0200
 
 debian-edu-config (2.10.33) unstable; urgency=medium


=====================================
testsuite/network
=====================================
--- a/testsuite/network
+++ b/testsuite/network
@@ -29,7 +29,7 @@ fi
 if [ -x /usr/bin/nmap ] ; then
 	/usr/bin/nmap localhost 2>&1 | sed "s%^%info: $0: nmap: %" || true
 else
-	error "Unable to find /sbin/nmap"
+	error "Unable to find /usr/bin/nmap"
 fi
 
 # Only test if nfs-common is installed which is not the case on a


=====================================
testsuite/webserver
=====================================
--- a/testsuite/webserver
+++ b/testsuite/webserver
@@ -22,9 +22,6 @@ else
     exit 0
 fi
 
-# Only Main-Server have the debian-edu profile in the firefox setup.
-check_file_perm /etc/skel/.mozilla/firefox/profiles.ini 600
-
 server=www
 
 # Wait for 10 seconds



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/e1bd47859df22ea717bb82d8d9f8d89a7bf4bd24...3ddb0bbda83a94d720a26503b0d6c8ee52c6f36a

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/e1bd47859df22ea717bb82d8d9f8d89a7bf4bd24...3ddb0bbda83a94d720a26503b0d6c8ee52c6f36a
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/20180810/c7f15c64/attachment-0001.html>