Changeset 1674 for branches


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

Legend:

Unmodified
Added
Removed
  • branches/fc13-dev

    • Property svn:mergeinfo changed
      /trunkremoved
  • branches/fc13-dev/locker/bin

  • branches/fc13-dev/locker/bin/scripts-remove

  • branches/fc13-dev/locker/bin/signup-minimal

  • branches/fc13-dev/locker/bin/signup-sql

  • 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

  • branches/fc13-dev/server/common/oursrc/execsys/execsys-binfmt

  • branches/fc13-dev/server/common/oursrc/php_scripts/php_scripts-config.m4

  • branches/fc13-dev/server/doc/install-ldap

    r1673 r1674  
    66  root# env NSS_NONLOCAL_IGNORE=1 useradd -r -d /var/lib/dirsrv fedora-ds
    77- root# yum install -y policycoreutils-python
    8 - Temporarily move away the existing slapd-scripts folder
    9   root# mv /etc/dirsrv/slapd-scripts{,.bak}
    108- root# /usr/sbin/setup-ds.pl
    119    - Choose a typical install
     
    1614    - Input directory manager password
    1715      (this can be found in  ~/.ldapvirc)
    18 - Move the schema back
    19   root# cp -R /etc/dirsrv/slapd-scripts.bak/{.svn,*} /etc/dirsrv/slapd-scripts
    20   root# rm -Rf /etc/dirsrv/slapd-scripts.bak
     16        [XXX: Got error: sh: semanage: command not found; turns out this is in
     17        policycoreutils-python.  Don't know if this will cause problems.]
    2118- yum install ldapvi
    2219- Check if dirsrv starts: /sbin/service dirsrv start
    23   then turn it back off: service dirsrv stop
    2420- Apply the following configuration changes.  If you're editing
    2521  dse.ldif, you don't want dirsrv to be on, otherwise it will
     
    4541nsSaslMapFilterTemplate: (objectClass=posixAccount)
    4642
     43- /sbin/service dirsrv stop
     44- Add the scripts schemas to /var/lib/dirsrv/slapd-scripts [XXX: I don't
     45  know how to do this, but placing them in /etc might be sufficient?]
    4746- Put LDAP keytab (ldap/hostname.mit.edu) in /etc/dirsrv/keytab.  Make
    4847  sure you chown/chgrp it to be readable by fedora-ds
    4948- Uncomment and modify in /etc/sysconfig/dirsrv: KRB5_KTNAME=/etc/dirsrv/keytab ; export KRB5_KTNAME
     49- mkdir -p /var/run/dirsrv
    5050- chown fedora-ds:fedora-ds /var/run/dirsrv
    5151- chmod 755 /var/run/dirsrv
    52 - /sbin/service dirsrv start
    53 - Use ldapvi -b cn=config to add these indexes (8 of them):
     52- /sbin/service dirsrv restart
     53- Use ldapvi -b cn=config to add these indexes:
    5454
    5555add cn=apacheServerName, cn=index, cn=userRoot, cn=ldbm database, cn=plugins, cn=config
     
    191191nsDS5ReplicaBindDN: uid=ldap/whole-enchilada.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
    192192nsDS5ReplicaBindDN: uid=ldap/real-mccoy.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
    193 nsDS5ReplicaBindDN: uid=ldap/better-mousetrap.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
    194 nsDS5ReplicaBindDN: uid=ldap/old-faithful.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
    195193# ADD SERVERS HERE AS YOU ADD NEW SERVERS
    196194nsds5ReplicaPurgeDelay: 604800
     
    202200        weren't we going to replicate from only one server?  That is
    203201        correct, however, simply binding won't mean we will receive
    204         updates; we have to setup the $MASTER to send data $SLAVE.
     202        updates; we have to setup the $MASTER to send data $SALVE.
    205203
    206204    3. Although we allowed those uids to bind, that user information
     
    242240nsDS5ReplicaTimeout: 120
    243241
    244     4. Reboot the server `service dirsrv restart`, then run the
    245     replication. (Don't fold this into the previous step!  You might
    246     nuke your database!)
     242    4. Run the replication. (you could fold this into the previous step)
    247243
    248244# under cn="GSSAPI Replication to $SLAVE", cn=replica, cn="dc=scripts,dc=mit,dc=edu", cn=mapping tree, cn=config
  • 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.