Ignore:
Timestamp:
Oct 23, 2010, 8:07:08 AM (12 years ago)
Author:
ezyang
Message:
Merge Fedora 13 development back to trunk.
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/server/fedora

    • Property svn:ignore set to
      .dload
      download_stamp
      rpmbuild
  • trunk/server/fedora/config/etc

  • trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf

    r1267 r1693  
    11ServerName scripts.mit.edu
    2 ServerAlias scripts 18.181.0.43 scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 scripts-test.mit.edu scripts-test 18.181.0.229 better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 localhost 127.0.0.1 ::1
     2ServerAlias scripts 18.181.0.43 scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 scripts-test.mit.edu scripts-test 18.181.0.229 better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 w-e whole-enchilada w-e.mit.edu whole-enchilada.mit.edu 18.181.0.236 localhost 127.0.0.1 ::1
  • trunk/server/fedora/config/etc/postfix/main.cf

    r1443 r1693  
    1717recipient_delimiter = +
    1818inet_interfaces = all
    19 readme_directory = /usr/share/doc/postfix-2.5.6/README_FILES
    20 sample_directory = /usr/share/doc/postfix-2.5.6/samples
     19readme_directory = /usr/share/doc/postfix-2.7.0/README_FILES
     20sample_directory = /usr/share/doc/postfix-2.7.0/samples
    2121sendmail_path = /usr/sbin/sendmail
    2222html_directory = no
  • trunk/server/fedora/config/etc/ssh/sshd_config

    r1267 r1693  
    55GSSAPIAuthentication yes
    66GSSAPICleanupCredentials yes
     7GSSAPIStrictAcceptorCheck no
    78UsePAM yes
    89AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
  • trunk/server/fedora/config/etc/sysconfig/openafs

    r1259 r1693  
    1212          Leonidas)
    1313            /usr/bin/fs sysname 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
     14          Goddard)
     15            /usr/bin/fs sysname 'amd64_fedora13_scripts' 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora13' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
    1416          *)
    1517            echo "Warning: unknown platform. AFS sysname not set."
  • trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl

    r1584 r1693  
    115115        } elsif ($message =~ m|^ *nrpe .* COMMAND=/etc/nagios/check_ldap_mmr.real$|) {
    116116        } elsif ($message =~ m|^ *root : TTY=|) {
     117        } elsif ($message =~ m|^Set /proc/self/oom_adj to 0|) {
    117118        } else {
    118119            sendmsg($message, "scripts-spew");
  • trunk/server/fedora/config/etc/yum.repos.d/scripts.repo

    r1424 r1693  
    11[scripts]
    22name=Scripts
    3 baseurl=http://web.mit.edu/scripts/rpm-fc11/
     3baseurl=http://web.mit.edu/scripts/rpm-fc13/
    44enabled=1
    55gpgcheck=0
     
    77[scripts-testing]
    88name=Scripts Testing
    9 baseurl=http://web.mit.edu/scripts/rpm-fc11-testing/
     9baseurl=http://web.mit.edu/scripts/rpm-fc13-testing/
    1010enabled=0
    1111gpgcheck=0
Note: See TracChangeset for help on using the changeset viewer.