Changeset 1675 for branches


Ignore:
Timestamp:
Sep 26, 2010, 3:24:23 PM (12 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc13-dev
Files:
14 edited
3 copied

Legend:

Unmodified
Added
Removed
  • branches/fc13-dev

  • branches/fc13-dev/locker/bin

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/bin/scripts-remove

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/bin/signup-minimal

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/bin/signup-sql

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/deploy/bin

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/deploy/bin/trac

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/locker/sql/bin/save-password

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/server/common/oursrc/execsys/execsys-binfmt

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/server/common/oursrc/php_scripts/php_scripts-config.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc13-dev/server/fedora/config/etc/hosts

    r1674 r1675  
    101018.181.0.229    scripts-test.mit.edu scripts-test
    1111
     1218.181.0.57     better-mousetrap.mit.edu better-mousetrap scripts1.mit.edu scripts1
    121318.181.0.53     old-faithful.mit.edu old-faithful scripts2.mit.edu scripts2
    13 18.181.0.57     better-mousetrap.mit.edu better-mousetrap scripts1.mit.edu scripts1
    141418.181.0.167    bees-knees.mit.edu bees-knees sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3
    151518.181.0.228    cats-whiskers.mit.edu cats-whiskers scripts4.mit.edu scripts4
     1618.181.0.236    whole-enchilada.mit.edu whole-enchilada scripts5.mit.edu scripts5
    161718.181.0.237    pancake-bunny.mit.edu pancake-bunny scripts6.mit.edu scripts6
    171818.181.0.234    busy-beaver.mit.edu busy-beaver scripts7.mit.edu scripts7
    181918.181.0.235    real-mccoy.mit.edu real-mccoy scripts8.mit.edu scripts8
    1920
     21172.21.0.57     better-mousetrap.mit.edu
    2022172.21.0.53     old-faithful.mit.edu
    21 172.21.0.57     better-mousetrap.mit.edu
    2223172.21.0.167    bees-knees.mit.edu
    2324172.21.0.228    cats-whiskers.mit.edu
     25172.21.0.236    whole-enchilada.mit.edu
    2426172.21.0.237    pancake-bunny.mit.edu
    2527172.21.0.234    busy-beaver.mit.edu
  • branches/fc13-dev/server/fedora/config/etc/nagios/check_ldap_mmr.real

    r1674 r1675  
    66use Net::LDAP;
    77use strict;
     8
     9my $nl  = $ENV{'USE_NEWLINES'} ? "\n" : "";
     10my $tab = $ENV{'USE_NEWLINES'} ? "  " : "";
    811
    912# Nagios codes
     
    2528my $replicaErrors = 0;
    2629my $conflictErrors = 0;
    27 my $errorstring = "Replication error(s): ";
     30my $errorstring = "Replication error(s): $nl";
    2831foreach my $entr ( @entries ) {
    2932    my $servername=$entr->get_value($server);
     
    3538    $serverlaststart =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
    3639    $serverlastend =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
    37     print "Replication to $servername last operation $serverlaststart ";
    38     print "Status: $serverstatus.     ";
     40    print "Replication to $servername last operation $serverlaststart $nl";
     41    print $tab . "Status: $serverstatus.     $nl";
    3942    if ($statuscode) {
    4043        $replicaErrors++;
     
    4245    }
    4346}
     47print "$nl";
    4448
    4549$result=LDAPSearch($ldap,"nsds5ReplConflict=*",["nsds5ReplConflict"],$replicatedBase);
     
    4852    my $conflictingDN=$entr->dn();
    4953    my $conflictDesc=$entr->get_value("nsds5ReplConflict");
    50     print "Conflict found for DN $conflictingDN ";
    51     print "Reason: $conflictDesc.     ";
     54    print "Conflict found for DN $conflictingDN $nl";
     55    print $tab . "Reason: $conflictDesc.     $nl";
    5256    $conflictErrors++;
    5357    $errorstring = $errorstring . $conflictDesc . ", ";
    5458}
     59print "$nl";
    5560
    5661if ($conflictErrors > 0) {
  • branches/fc13-dev/server/fedora/config/etc/sudoers

    r1674 r1675  
    5656Defaults    env_keep += "LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE"
    5757Defaults    env_keep += "LC_TIME LC_ALL LANGUAGE LINGUAS _XKB_CHARSET XAUTHORITY"
     58Defaults    env_keep += "USE_NEWLINES"
    5859
    5960## Next comes the main part: which users can run what software on
  • branches/fc13-dev/server/fedora/config/etc/sysconfig/network-scripts/route-eth1

    r1674 r1675  
    2218.181.0.56 via 172.21.0.56
    3318.181.0.52 via 172.21.0.52
     418.181.0.57 via 172.21.0.57
    4518.181.0.53 via 172.21.0.53
    5 18.181.0.57 via 172.21.0.57
    6618.181.0.167 via 172.21.0.167
    7718.181.0.228 via 172.21.0.228
     818.181.0.236 via 172.21.0.236
     918.181.0.237 via 172.21.0.237
    81018.181.0.234 via 172.21.0.234
    91118.181.0.235 via 172.21.0.235
    10 18.181.0.237 via 172.21.0.237
Note: See TracChangeset for help on using the changeset viewer.