Changeset 2246 for trunk/server/fedora/config

Timestamp:

Jun 27, 2012, 10:29:47 PM (13 years ago)

Author:

ezyang

Message:

Reintegrate Fedora 17 development branch into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• server/fedora/config/etc/default (copied) (copied from branches/fc17-dev/server/fedora/config/etc/default)
• server/fedora/config/etc/hosts (modified) (2 diffs)
• server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf (modified) (1 diff)
• server/fedora/config/etc/mock/scripts-fc17-i386.cfg (copied) (copied from branches/fc17-dev/server/fedora/config/etc/mock/scripts-fc17-i386.cfg)
• server/fedora/config/etc/mock/scripts-fc17-x86_64.cfg (copied) (copied from branches/fc17-dev/server/fedora/config/etc/mock/scripts-fc17-x86_64.cfg)
• server/fedora/config/etc/modules-load.d/binfmt_misc.conf (copied) (copied from branches/fc17-dev/server/fedora/config/etc/modules-load.d/binfmt_misc.conf)
• server/fedora/config/etc/scripts/allowed-filecaps.list (modified) (1 diff)
• server/fedora/config/etc/scripts/allowed-setugid.list (modified) (1 diff)
• server/fedora/config/etc/sysconfig/dirsrv (copied) (copied from branches/fc17-dev/server/fedora/config/etc/sysconfig/dirsrv)
• server/fedora/config/etc/sysconfig/dirsrv-scripts (copied) (copied from branches/fc17-dev/server/fedora/config/etc/sysconfig/dirsrv-scripts)
• server/fedora/config/etc/sysconfig/network-scripts/route-eth1 (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/hosts

@@ -20 +20 @@
 18.181.0.135    shining-armor.mit.edu shining-armor scripts9.mit.edu scripts9
 18.181.0.141    golden-egg.mit.edu golden-egg scripts10.mit.edu scripts10
+18.181.0.203    miracle-cure.mit.edu miracle-cure scripts11.mit.edu scripts11
+18.181.0.204    lucky-star.mit.edu lucky-star scripts12.mit.edu scripts12
 
 172.21.0.57     better-mousetrap.mit.edu
@@ -31 +33 @@
 172.21.0.135    shining-armor.mit.edu
 172.21.0.141    golden-egg.mit.edu
+172.21.0.203    miracle-cure.mit.edu
+172.21.0.204    lucky-star.mit.edu

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

@@ -14 +14 @@
     shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 \
     golden-egg.mit.edu golden-egg g-e.mit.edu g-e scripts10.mit.edu scripts10 18.181.0.141 \
+    miracle-cure.mit.edu miracle-cure m-c.mit.edu m-c scripts11.mit.edu scripts11 18.181.0.203 \
+    lucky-star.mit.edu lucky-star l-s.mit.edu l-s scripts12.mit.edu scripts12 18.181.0.204 \
     localhost 127.0.0.1 ::1

trunk/server/fedora/config/etc/scripts/allowed-filecaps.list

@@ -1 @@
-/bin/ping
-/bin/ping6
+/usr/bin/ping
+/usr/bin/ping6
 /usr/sbin/fping
 /usr/sbin/fping6

trunk/server/fedora/config/etc/scripts/allowed-setugid.list

@@ -1 @@
-/sbin/pam_timestamp_check
-/sbin/unix_chkpwd
+/usr/sbin/pam_timestamp_check
+/usr/sbin/unix_chkpwd
 /usr/bin/at
 /usr/bin/crontab

trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1

@@ -14 +14 @@
 18.181.0.141 via 172.21.0.141
 18.181.0.199 via 172.21.0.199
+18.181.0.203 via 172.21.0.203
+18.181.0.204 via 172.21.0.204

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

@@ -136 +136 @@
         } elsif ($message =~ m|^Set /proc/self/oom_score_adj to |) {
         } elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) {
+        } elsif ($message =~ m|^selinux sandbox not useful \[preauth\]$|) {
         } 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/yum-repos/rpm-fc15/
+baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17/
 enabled=1
 gpgcheck=0
@@ -7 +7 @@
 [scripts-testing]
 name=Scripts Testing
-baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15-testing/
+baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17-testing/
 enabled=0
 gpgcheck=0