[debian-edu-commits] debian-edu/ 01/01: shutdown-at-night/client-generator: Use same NIS netgroup "namespace" for all shutdown-at-night NIS netgroups.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu-config.

commit 1ba4c9bd155f94186536486577f5cce19974a8fa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 14 11:16:00 2015 +0200

    shutdown-at-night/client-generator: Use same NIS netgroup "namespace" for all shutdown-at-night NIS netgroups.
    
      Use same NIS netgroup "namespace" for all shutdown-at-night NIS netgroups:
      - shutdown-at-night-hosts (unchanged)
      - shutdown-at-night-hosts-blacklist (renamed)
      - shutdown-at-night-wakeup-hosts (renamed)
      - shutdown-at-night-wakeup-hosts-blacklist (renamed)
---
 debian/changelog                        | 6 ++++++
 etc/shutdown-at-night/clients-generator | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0138869..796de0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,12 @@ debian-edu-config (1.819) UNRELEASED; urgency=low
   * gosa-sync: Test if a given user account actually is a Kerberos account. If
     not, don't try to set the Kerberos password for this account. (Closes:
     #798435).
+  * shutdown-at-night/client-generator: Use same NIS netgroup "namespace"
+    for all shutdown-at-night NIS netgroups:
+    - shutdown-at-night-hosts (unchanged)
+    - shutdown-at-night-hosts-blacklist (renamed)
+    - shutdown-at-night-wakeup-hosts (renamed)
+    - shutdown-at-night-wakeup-hosts-blacklist (renamed)
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 16 May 2015 23:12:06 +0200
 
diff --git a/etc/shutdown-at-night/clients-generator b/etc/shutdown-at-night/clients-generator
index e5d11a3..b8d028e 100755
--- a/etc/shutdown-at-night/clients-generator
+++ b/etc/shutdown-at-night/clients-generator
@@ -11,9 +11,9 @@ use vars qw(%hostmap);
 $ENV{PATH} .= ':/usr/sbin';
 
 my @host_whitelist = `netgroup -h shutdown-at-night-hosts 2>/dev/null || true`;
-my @host_blacklist = `netgroup -h no-shutdown-at-night-hosts 2>/dev/null || true`;
+my @host_blacklist = `netgroup -h shutdown-at-night-hosts-blacklist 2>/dev/null || true`;
 
-my @wakeup_host_whitelist = `netgroup -h wakeup-in-the-morning-hosts 2>/dev/null || printf "NETGROUP-NOT-FOUND" `;
+my @wakeup_host_whitelist = `netgroup -h shutdown-at-night-wakeup-hosts 2>/dev/null || printf "NETGROUP-NOT-FOUND" `;
 if((exists $wakeup_host_whitelist[0]) && ($wakeup_host_whitelist[0] ne "NETGROUP-NOT-FOUND")) {
     @host_whitelist = @wakeup_host_whitelist;
     # when wakeup-in-the-morning-hosts netgroup is used, expect its own blacklist pendant (i.e., netgroup no-wakeup-in-the-morning-hosts)
@@ -21,7 +21,7 @@ if((exists $wakeup_host_whitelist[0]) && ($wakeup_host_whitelist[0] ne "NETGROUP
 }
 
 # only use the no-wakeup-in-the-morning
-my @wakeup_host_blacklist = `netgroup -h no-wakeup-in-the-morning-hosts 2>/dev/null || printf "NETGROUP-NOT-FOUND"`;
+my @wakeup_host_blacklist = `netgroup -h shutdown-at-night-wakeup-hosts-blacklist 2>/dev/null || printf "NETGROUP-NOT-FOUND"`;
 if((exists $wakeup_host_blacklist[0]) && ($wakeup_host_blacklist[0] ne "NETGROUP-NOT-FOUND")) {
     @host_blacklist = @wakeup_host_blacklist;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git