Ignore:
Timestamp:
Sep 26, 2010, 3:23:31 PM (14 years ago)
Author:
ezyang
Message:
Undo merge.
Location:
branches/fc13-dev
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/fc13-dev

    • Property svn:mergeinfo changed
      /trunkremoved

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

    r1673 r1674  
    101018.181.0.229    scripts-test.mit.edu scripts-test
    1111
     1218.181.0.53     old-faithful.mit.edu old-faithful scripts2.mit.edu scripts2
    121318.181.0.57     better-mousetrap.mit.edu better-mousetrap scripts1.mit.edu scripts1
    13 18.181.0.53     old-faithful.mit.edu old-faithful scripts2.mit.edu scripts2
    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
    16 18.181.0.236    whole-enchilada.mit.edu whole-enchilada scripts5.mit.edu scripts5
    171618.181.0.237    pancake-bunny.mit.edu pancake-bunny scripts6.mit.edu scripts6
    181718.181.0.234    busy-beaver.mit.edu busy-beaver scripts7.mit.edu scripts7
    191818.181.0.235    real-mccoy.mit.edu real-mccoy scripts8.mit.edu scripts8
    2019
     20172.21.0.53     old-faithful.mit.edu
    2121172.21.0.57     better-mousetrap.mit.edu
    22 172.21.0.53     old-faithful.mit.edu
    2322172.21.0.167    bees-knees.mit.edu
    2423172.21.0.228    cats-whiskers.mit.edu
    25 172.21.0.236    whole-enchilada.mit.edu
    2624172.21.0.237    pancake-bunny.mit.edu
    2725172.21.0.234    busy-beaver.mit.edu

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

    r1673 r1674  
    66use Net::LDAP;
    77use strict;
    8 
    9 my $nl  = $ENV{'USE_NEWLINES'} ? "\n" : "";
    10 my $tab = $ENV{'USE_NEWLINES'} ? "  " : "";
    118
    129# Nagios codes
    … …  
    2825my $replicaErrors = 0;
    2926my $conflictErrors = 0;
    30 my $errorstring = "Replication error(s): $nl";
     27my $errorstring = "Replication error(s): ";
    3128foreach my $entr ( @entries ) {
    3229    my $servername=$entr->get_value($server);
    … …  
    3835    $serverlaststart =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
    3936    $serverlastend =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
    40     print "Replication to $servername last operation $serverlaststart $nl";
    41     print $tab . "Status: $serverstatus.     $nl";
     37    print "Replication to $servername last operation $serverlaststart ";
     38    print "Status: $serverstatus.     ";
    4239    if ($statuscode) {
    4340        $replicaErrors++;
    … …  
    4542    }
    4643}
    47 print "$nl";
    4844
    4945$result=LDAPSearch($ldap,"nsds5ReplConflict=*",["nsds5ReplConflict"],$replicatedBase);
    … …  
    5248    my $conflictingDN=$entr->dn();
    5349    my $conflictDesc=$entr->get_value("nsds5ReplConflict");
    54     print "Conflict found for DN $conflictingDN $nl";
    55     print $tab . "Reason: $conflictDesc.     $nl";
     50    print "Conflict found for DN $conflictingDN ";
     51    print "Reason: $conflictDesc.     ";
    5652    $conflictErrors++;
    5753    $errorstring = $errorstring . $conflictDesc . ", ";
    5854}
    59 print "$nl";
    6055
    6156if ($conflictErrors > 0) {

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

    r1673 r1674  
    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"
    58 Defaults    env_keep += "USE_NEWLINES"
    5958
    6059## Next comes the main part: which users can run what software on

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

    r1673 r1674  
    2218.181.0.56 via 172.21.0.56
    3318.181.0.52 via 172.21.0.52
     418.181.0.53 via 172.21.0.53
    4518.181.0.57 via 172.21.0.57
    5 18.181.0.53 via 172.21.0.53
    6618.181.0.167 via 172.21.0.167
    7718.181.0.228 via 172.21.0.228
    8 18.181.0.236 via 172.21.0.236
    9 18.181.0.237 via 172.21.0.237
    10818.181.0.234 via 172.21.0.234
    11918.181.0.235 via 172.21.0.235
     1018.181.0.237 via 172.21.0.237

  • branches/fc13-dev/server/fedora/config/etc/syslog-ng/d_zroot.pl

    r1673 r1674  
    101101        } elsif ($message =~ m|^Postponed keyboard-interactive|) {
    102102        } elsif ($message =~ m|^Failed keyboard-interactive/pam|) {
    103         } elsif ($message =~ m|^Did not receive identification string from|) {
    104103        } elsif ($message =~ m|^fatal: Read from socket failed: Connection reset by peer$|) {
    105104        } elsif ($message =~ m|^reverse mapping checking getaddrinfo|) {
Note: See TracChangeset for help on using the changeset viewer.