Changeset 1675 for branches/fc13-dev

Timestamp:

Sep 26, 2010, 3:24:23 PM (14 years ago)

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc13-dev

Files:

• . (modified) (1 prop)
• locker/bin (modified) (1 prop)
• locker/bin/scripts-remove (modified) (1 prop)
• locker/bin/signup-minimal (modified) (1 prop)
• locker/bin/signup-sql (modified) (1 prop)
• locker/deploy/bin (modified) (1 prop)
• locker/deploy/bin/trac (modified) (1 prop)
• locker/doc/cluedump (copied) (copied from trunk/locker/doc/cluedump)
• locker/sbin/rpm-master.sh (copied) (copied from trunk/locker/sbin/rpm-master.sh)
• locker/sbin/rpmlist.sh (copied) (copied from trunk/locker/sbin/rpmlist.sh)
• locker/sql/bin/save-password (modified) (1 prop)
• server/common/oursrc/execsys/execsys-binfmt (modified) (1 prop)
• server/common/oursrc/php_scripts/php_scripts-config.m4 (modified) (1 prop)
• server/fedora/config/etc/hosts (modified) (1 diff)
• server/fedora/config/etc/nagios/check_ldap_mmr.real (modified) (5 diffs)
• server/fedora/config/etc/sudoers (modified) (1 diff)
• server/fedora/config/etc/sysconfig/network-scripts/route-eth1 (modified) (1 diff)

branches/fc13-dev/server/fedora/config/etc/hosts

@@ -10 +10 @@
 18.181.0.229    scripts-test.mit.edu scripts-test
 
+18.181.0.57     better-mousetrap.mit.edu better-mousetrap scripts1.mit.edu scripts1
 18.181.0.53     old-faithful.mit.edu old-faithful scripts2.mit.edu scripts2
-18.181.0.57     better-mousetrap.mit.edu better-mousetrap scripts1.mit.edu scripts1
 18.181.0.167    bees-knees.mit.edu bees-knees sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3
 18.181.0.228    cats-whiskers.mit.edu cats-whiskers scripts4.mit.edu scripts4
+18.181.0.236    whole-enchilada.mit.edu whole-enchilada scripts5.mit.edu scripts5
 18.181.0.237    pancake-bunny.mit.edu pancake-bunny scripts6.mit.edu scripts6
 18.181.0.234    busy-beaver.mit.edu busy-beaver scripts7.mit.edu scripts7
 18.181.0.235    real-mccoy.mit.edu real-mccoy scripts8.mit.edu scripts8
 
+172.21.0.57     better-mousetrap.mit.edu
 172.21.0.53     old-faithful.mit.edu
-172.21.0.57     better-mousetrap.mit.edu
 172.21.0.167    bees-knees.mit.edu
 172.21.0.228    cats-whiskers.mit.edu
+172.21.0.236    whole-enchilada.mit.edu
 172.21.0.237    pancake-bunny.mit.edu
 172.21.0.234    busy-beaver.mit.edu

branches/fc13-dev/server/fedora/config/etc/nagios/check_ldap_mmr.real

@@ -6 +6 @@
 use Net::LDAP;
 use strict;
+
+my $nl  = $ENV{'USE_NEWLINES'} ? "\n" : "";
+my $tab = $ENV{'USE_NEWLINES'} ? "  " : "";
 
 # Nagios codes
@@ -25 +28 @@
 my $replicaErrors = 0;
 my $conflictErrors = 0;
-my $errorstring = "Replication error(s): ";
+my $errorstring = "Replication error(s): $nl";
 foreach my $entr ( @entries ) {
     my $servername=$entr->get_value($server);
@@ -35 +38 @@
     $serverlaststart =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
     $serverlastend =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
-    print "Replication to $servername last operation $serverlaststart ";
-    print "Status: $serverstatus.     ";
+    print "Replication to $servername last operation $serverlaststart $nl";
+    print $tab . "Status: $serverstatus.     $nl";
     if ($statuscode) {
         $replicaErrors++;
@@ -42 +45 @@
     }
 }
+print "$nl";
 
 $result=LDAPSearch($ldap,"nsds5ReplConflict=*",["nsds5ReplConflict"],$replicatedBase);
@@ -48 +52 @@
     my $conflictingDN=$entr->dn();
     my $conflictDesc=$entr->get_value("nsds5ReplConflict");
-    print "Conflict found for DN $conflictingDN ";
-    print "Reason: $conflictDesc.     ";
+    print "Conflict found for DN $conflictingDN $nl";
+    print $tab . "Reason: $conflictDesc.     $nl";
     $conflictErrors++;
     $errorstring = $errorstring . $conflictDesc . ", ";
 }
+print "$nl";
 
 if ($conflictErrors > 0) {

branches/fc13-dev/server/fedora/config/etc/sudoers

@@ -56 +56 @@
 Defaults    env_keep += "LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE"
 Defaults    env_keep += "LC_TIME LC_ALL LANGUAGE LINGUAS _XKB_CHARSET XAUTHORITY"
+Defaults    env_keep += "USE_NEWLINES"
 
 ## Next comes the main part: which users can run what software on 

branches/fc13-dev/server/fedora/config/etc/sysconfig/network-scripts/route-eth1

@@ -2 +2 @@
 18.181.0.56 via 172.21.0.56
 18.181.0.52 via 172.21.0.52
+18.181.0.57 via 172.21.0.57
 18.181.0.53 via 172.21.0.53
-18.181.0.57 via 172.21.0.57
 18.181.0.167 via 172.21.0.167
 18.181.0.228 via 172.21.0.228
+18.181.0.236 via 172.21.0.236
+18.181.0.237 via 172.21.0.237
 18.181.0.234 via 172.21.0.234
 18.181.0.235 via 172.21.0.235
-18.181.0.237 via 172.21.0.237