Changeset 1693 for trunk/server/fedora/config/etc

Timestamp:

Oct 23, 2010, 8:07:08 AM (14 years ago)

Author:

ezyang

Message:

Merge Fedora 13 development back to trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• server/fedora (modified) (1 prop)
• server/fedora/config/etc (modified) (1 prop)
• server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf (modified) (1 diff)
• server/fedora/config/etc/postfix/main.cf (modified) (1 diff)
• server/fedora/config/etc/ssh/sshd_config (modified) (1 diff)
• server/fedora/config/etc/sysconfig/openafs (modified) (1 diff)
• server/fedora/config/etc/syslog-ng/d_zroot.pl (modified) (1 diff)
• server/fedora/config/etc/yum.repos.d/scripts.repo (modified) (2 diffs)

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

@@ -1 +1 @@
 ServerName scripts.mit.edu
-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
+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 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

@@ -17 +17 @@
 recipient_delimiter = +
 inet_interfaces = all
-readme_directory = /usr/share/doc/postfix-2.5.6/README_FILES
-sample_directory = /usr/share/doc/postfix-2.5.6/samples
+readme_directory = /usr/share/doc/postfix-2.7.0/README_FILES
+sample_directory = /usr/share/doc/postfix-2.7.0/samples
 sendmail_path = /usr/sbin/sendmail
 html_directory = no

trunk/server/fedora/config/etc/ssh/sshd_config

@@ -5 +5 @@
 GSSAPIAuthentication yes
 GSSAPICleanupCredentials yes
+GSSAPIStrictAcceptorCheck no
 UsePAM yes
 AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES

trunk/server/fedora/config/etc/sysconfig/openafs

@@ -12 +12 @@
           Leonidas)
             /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' ;;
+          Goddard)
+            /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' ;;
           *)
             echo "Warning: unknown platform. AFS sysname not set."

trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl

@@ -115 +115 @@
         } elsif ($message =~ m|^ *nrpe .* COMMAND=/etc/nagios/check_ldap_mmr.real$|) {
         } elsif ($message =~ m|^ *root : TTY=|) {
+        } elsif ($message =~ m|^Set /proc/self/oom_adj to 0|) {
         } else {
             sendmsg($message, "scripts-spew");

trunk/server/fedora/config/etc/yum.repos.d/scripts.repo

@@ -1 +1 @@
 [scripts]
 name=Scripts
-baseurl=http://web.mit.edu/scripts/rpm-fc11/
+baseurl=http://web.mit.edu/scripts/rpm-fc13/
 enabled=1
 gpgcheck=0
@@ -7 +7 @@
 [scripts-testing]
 name=Scripts Testing
-baseurl=http://web.mit.edu/scripts/rpm-fc11-testing/
+baseurl=http://web.mit.edu/scripts/rpm-fc13-testing/
 enabled=0
 gpgcheck=0