[debian-edu-commits] r82336 - in branches/wheezy/debian-edu-config: . cf debian etc etc/nbd-server etc/nbd-server/conf.d

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-09-03 10:02:46 +0000 (Tue, 03 Sep 2013)
New Revision: 82336

Added:
   branches/wheezy/debian-edu-config/etc/nbd-server/
   branches/wheezy/debian-edu-config/etc/nbd-server/conf.d/
   branches/wheezy/debian-edu-config/etc/nbd-server/conf.d/debian-edu.conf
Modified:
   branches/wheezy/debian-edu-config/Makefile
   branches/wheezy/debian-edu-config/cf/cf.ltsp
   branches/wheezy/debian-edu-config/debian/changelog
Log:
* Fix nbd server setup:
  - cf/cf.ltsp: Adjust swapfile directory ownership to user and group
    nbd.
  - Add configuration snippet debian-edu.conf to nbd-server/conf.d:
    setting default swap file size 64MB, allow all clients to connect
    by omitting value for 'authfile' as wildcards like 10.0.0.0/8 don't
    seem to be allowed in such a file.

Modified: branches/wheezy/debian-edu-config/Makefile
===================================================================
--- branches/wheezy/debian-edu-config/Makefile	2013-09-02 17:49:18 UTC (rev 82335)
+++ branches/wheezy/debian-edu-config/Makefile	2013-09-03 10:02:46 UTC (rev 82336)
@@ -173,8 +173,9 @@
 	nagios3/debian-edu/timeperiods.cfg \
 	munin/debian-edu-munin-node.conf \
 	polkit-1/localauthority.conf.d/80-edu-admin.conf \
-	powerdns/pdns.d/pdns-debian-edu.conf\
-	dbus-1/system.d/hal-debian-edu.conf
+	powerdns/pdns.d/pdns-debian-edu.conf \
+	dbus-1/system.d/hal-debian-edu.conf \
+	nbd-server/conf.d/debian-edu.conf
 
 LIBFILES = \
 	mime/packages/debian-edu-mailcap

Modified: branches/wheezy/debian-edu-config/cf/cf.ltsp
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.ltsp	2013-09-02 17:49:18 UTC (rev 82335)
+++ branches/wheezy/debian-edu-config/cf/cf.ltsp	2013-09-03 10:02:46 UTC (rev 82336)
@@ -14,7 +14,7 @@
 directories:
   debian.ltspserver::
       #correct ownership for nbd-server.
-      /var/opt/ltsp/swapfiles  mode=700 owner=nobody group=nogroup
+      /var/opt/ltsp/swapfiles  mode=700 owner=nbd group=nbd
 
 files:
   debian.ltspserver|debian.workstation|debian.standalone::

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-09-02 17:49:18 UTC (rev 82335)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-09-03 10:02:46 UTC (rev 82336)
@@ -1,3 +1,15 @@
+debian-edu-config (1.716~svn82XXX) UNRELEASED; urgency=low
+
+  * Fix nbd server setup:
+    - cf/cf.ltsp: Adjust swapfile directory ownership to user and group
+      nbd.
+    - Add configuration snippet debian-edu.conf to nbd-server/conf.d:
+      setting default swap file size 64MB, allow all clients to connect
+      by omitting value for 'authfile' as wildcards like 10.0.0.0/8 don't
+      seem to be allowed in such a file.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 03 Sep 2013 11:49:01 +0200
+
 debian-edu-config (1.715) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Added: branches/wheezy/debian-edu-config/etc/nbd-server/conf.d/debian-edu.conf
===================================================================
--- branches/wheezy/debian-edu-config/etc/nbd-server/conf.d/debian-edu.conf	                        (rev 0)
+++ branches/wheezy/debian-edu-config/etc/nbd-server/conf.d/debian-edu.conf	2013-09-03 10:02:46 UTC (rev 82336)
@@ -0,0 +1,6 @@
+[swap]
+exportname = /var/opt/ltsp/swapfiles/%s
+filesize = 67108864
+prerun = nbdswapd %s
+postrun = rm -f %s
+authfile =