Index: anches/fc13-dev/locker/sbin/rpm-master.sh =================================================================== --- /branches/fc13-dev/locker/sbin/rpm-master.sh (revision 1673) +++ (revision ) @@ -1,35 +1,0 @@ -#!/bin/sh - -echo "Entering correct directory..." -mkdir -p /mit/scripts/cron_scripts/rpm-sync/ -cd /mit/scripts/cron_scripts/rpm-sync/ - -echo "Cleaning up environment..." -rm -rf *.rpmlist *.diff rpmlist.master missing.rpms - -servers=`finger @scripts-director.mit.edu | grep "\->" | grep EDU | awk '{print $2}' | cut -d: -f1 | sort | uniq` - -for server in $servers; do - echo "Connecting to $server..." - { ssh $server /mit/scripts/sbin/rpmlist.sh 2>&1 >&3 | grep -Fxv 'If you have trouble logging in, see http://scripts.mit.edu/faq/41/.'; } 3>&1 >&2 -done - -echo "Creating master package list..." -cat *.rpmlist | sort | uniq > rpmlist.master - -echo "Comparing scripts servers to overall rpm list..." -touch missing.rpms -for server in *.rpmlist; do - diff -U3 $server rpmlist.master > $server.diff - serverPretty=`basename $server .rpmlist` - echo "Server $serverPretty is missing:" >> missing.rpms - grep "^+[^+]" $server.diff | cut -b 1 --complement >> missing.rpms - echo >> missing.rpms -done - -if [ `egrep -c -v '(missing)|(^$)' missing.rpms` -gt 0 ]; then - echo "Sending email..." - cat missing.rpms | mail -s "scripts.mit.edu servers are out of sync" root@scripts.mit.edu -else - echo "No email needs to be sent! scripts.mit.edu is up to date." -fi Index: anches/fc13-dev/locker/sbin/rpmlist.sh =================================================================== --- /branches/fc13-dev/locker/sbin/rpmlist.sh (revision 1673) +++ (revision ) @@ -1,10 +1,0 @@ -#!/bin/sh - -copyTo='/mit/scripts/cron_scripts/rpm-sync/' -packages=`mktemp --tmpdir rpmlist.XXXXXX` -rpm -qa --queryformat '%{NAME}.%{ARCH}\n' | sort | uniq > $packages - -host=`hostname` -extension='.rpmlist' -file="$copyTo/$host$extension" -mv $packages $file Index: /branches/fc13-dev/server/doc/install-ldap =================================================================== --- /branches/fc13-dev/server/doc/install-ldap (revision 1673) +++ /branches/fc13-dev/server/doc/install-ldap (revision 1674) @@ -6,6 +6,4 @@ root# env NSS_NONLOCAL_IGNORE=1 useradd -r -d /var/lib/dirsrv fedora-ds - root# yum install -y policycoreutils-python -- Temporarily move away the existing slapd-scripts folder - root# mv /etc/dirsrv/slapd-scripts{,.bak} - root# /usr/sbin/setup-ds.pl - Choose a typical install @@ -16,10 +14,8 @@ - Input directory manager password (this can be found in ~/.ldapvirc) -- Move the schema back - root# cp -R /etc/dirsrv/slapd-scripts.bak/{.svn,*} /etc/dirsrv/slapd-scripts - root# rm -Rf /etc/dirsrv/slapd-scripts.bak + [XXX: Got error: sh: semanage: command not found; turns out this is in + policycoreutils-python. Don't know if this will cause problems.] - yum install ldapvi - Check if dirsrv starts: /sbin/service dirsrv start - then turn it back off: service dirsrv stop - Apply the following configuration changes. If you're editing dse.ldif, you don't want dirsrv to be on, otherwise it will @@ -45,11 +41,15 @@ nsSaslMapFilterTemplate: (objectClass=posixAccount) +- /sbin/service dirsrv stop +- Add the scripts schemas to /var/lib/dirsrv/slapd-scripts [XXX: I don't + know how to do this, but placing them in /etc might be sufficient?] - Put LDAP keytab (ldap/hostname.mit.edu) in /etc/dirsrv/keytab. Make sure you chown/chgrp it to be readable by fedora-ds - Uncomment and modify in /etc/sysconfig/dirsrv: KRB5_KTNAME=/etc/dirsrv/keytab ; export KRB5_KTNAME +- mkdir -p /var/run/dirsrv - chown fedora-ds:fedora-ds /var/run/dirsrv - chmod 755 /var/run/dirsrv -- /sbin/service dirsrv start -- Use ldapvi -b cn=config to add these indexes (8 of them): +- /sbin/service dirsrv restart +- Use ldapvi -b cn=config to add these indexes: add cn=apacheServerName, cn=index, cn=userRoot, cn=ldbm database, cn=plugins, cn=config @@ -191,6 +191,4 @@ nsDS5ReplicaBindDN: uid=ldap/whole-enchilada.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu nsDS5ReplicaBindDN: uid=ldap/real-mccoy.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu -nsDS5ReplicaBindDN: uid=ldap/better-mousetrap.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu -nsDS5ReplicaBindDN: uid=ldap/old-faithful.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu # ADD SERVERS HERE AS YOU ADD NEW SERVERS nsds5ReplicaPurgeDelay: 604800 @@ -202,5 +200,5 @@ weren't we going to replicate from only one server? That is correct, however, simply binding won't mean we will receive - updates; we have to setup the $MASTER to send data $SLAVE. + updates; we have to setup the $MASTER to send data $SALVE. 3. Although we allowed those uids to bind, that user information @@ -242,7 +240,5 @@ nsDS5ReplicaTimeout: 120 - 4. Reboot the server `service dirsrv restart`, then run the - replication. (Don't fold this into the previous step! You might - nuke your database!) + 4. Run the replication. (you could fold this into the previous step) # under cn="GSSAPI Replication to $SLAVE", cn=replica, cn="dc=scripts,dc=mit,dc=edu", cn=mapping tree, cn=config Index: /branches/fc13-dev/server/fedora/config/etc/hosts =================================================================== --- /branches/fc13-dev/server/fedora/config/etc/hosts (revision 1673) +++ /branches/fc13-dev/server/fedora/config/etc/hosts (revision 1674) @@ -10,18 +10,16 @@ 18.181.0.229 scripts-test.mit.edu scripts-test +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.53 old-faithful.mit.edu old-faithful scripts2.mit.edu scripts2 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.53 old-faithful.mit.edu 172.21.0.57 better-mousetrap.mit.edu -172.21.0.53 old-faithful.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 Index: /branches/fc13-dev/server/fedora/config/etc/nagios/check_ldap_mmr.real =================================================================== --- /branches/fc13-dev/server/fedora/config/etc/nagios/check_ldap_mmr.real (revision 1673) +++ /branches/fc13-dev/server/fedora/config/etc/nagios/check_ldap_mmr.real (revision 1674) @@ -6,7 +6,4 @@ use Net::LDAP; use strict; - -my $nl = $ENV{'USE_NEWLINES'} ? "\n" : ""; -my $tab = $ENV{'USE_NEWLINES'} ? " " : ""; # Nagios codes @@ -28,5 +25,5 @@ my $replicaErrors = 0; my $conflictErrors = 0; -my $errorstring = "Replication error(s): $nl"; +my $errorstring = "Replication error(s): "; foreach my $entr ( @entries ) { my $servername=$entr->get_value($server); @@ -38,6 +35,6 @@ $serverlaststart =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/; $serverlastend =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/; - print "Replication to $servername last operation $serverlaststart $nl"; - print $tab . "Status: $serverstatus. $nl"; + print "Replication to $servername last operation $serverlaststart "; + print "Status: $serverstatus. "; if ($statuscode) { $replicaErrors++; @@ -45,5 +42,4 @@ } } -print "$nl"; $result=LDAPSearch($ldap,"nsds5ReplConflict=*",["nsds5ReplConflict"],$replicatedBase); @@ -52,10 +48,9 @@ my $conflictingDN=$entr->dn(); my $conflictDesc=$entr->get_value("nsds5ReplConflict"); - print "Conflict found for DN $conflictingDN $nl"; - print $tab . "Reason: $conflictDesc. $nl"; + print "Conflict found for DN $conflictingDN "; + print "Reason: $conflictDesc. "; $conflictErrors++; $errorstring = $errorstring . $conflictDesc . ", "; } -print "$nl"; if ($conflictErrors > 0) { Index: /branches/fc13-dev/server/fedora/config/etc/sudoers =================================================================== --- /branches/fc13-dev/server/fedora/config/etc/sudoers (revision 1673) +++ /branches/fc13-dev/server/fedora/config/etc/sudoers (revision 1674) @@ -56,5 +56,4 @@ 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 Index: /branches/fc13-dev/server/fedora/config/etc/sysconfig/network-scripts/route-eth1 =================================================================== --- /branches/fc13-dev/server/fedora/config/etc/sysconfig/network-scripts/route-eth1 (revision 1673) +++ /branches/fc13-dev/server/fedora/config/etc/sysconfig/network-scripts/route-eth1 (revision 1674) @@ -2,10 +2,9 @@ 18.181.0.56 via 172.21.0.56 18.181.0.52 via 172.21.0.52 +18.181.0.53 via 172.21.0.53 18.181.0.57 via 172.21.0.57 -18.181.0.53 via 172.21.0.53 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 Index: /branches/fc13-dev/server/fedora/config/etc/syslog-ng/d_zroot.pl =================================================================== --- /branches/fc13-dev/server/fedora/config/etc/syslog-ng/d_zroot.pl (revision 1673) +++ /branches/fc13-dev/server/fedora/config/etc/syslog-ng/d_zroot.pl (revision 1674) @@ -101,5 +101,4 @@ } elsif ($message =~ m|^Postponed keyboard-interactive|) { } elsif ($message =~ m|^Failed keyboard-interactive/pam|) { - } elsif ($message =~ m|^Did not receive identification string from|) { } elsif ($message =~ m|^fatal: Read from socket failed: Connection reset by peer$|) { } elsif ($message =~ m|^reverse mapping checking getaddrinfo|) {