Changeset 1246


Ignore:
Timestamp:
Jul 8, 2009, 4:01:11 PM (12 years ago)
Author:
mitchb
Message:
Merge r1237:1245 from trunk to branches/fc11-dev
Location:
branches/fc11-dev
Files:
9 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/fc11-dev

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

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc11-dev/server/fedora/config/etc/hosts

    r986 r1246  
    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
     1618.181.0.237    pancake-bunny.mit.edu pancake-bunny scripts6.mit.edu scripts6
    1617
    1718172.21.0.53     old-faithful.mit.edu
     
    1920172.21.0.167    bees-knees.mit.edu
    2021172.21.0.228    cats-whiskers.mit.edu
     22172.21.0.237    pancake-bunny.mit.edu
  • branches/fc11-dev/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf

    r969 r1246  
    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 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 localhost 127.0.0.1 ::1
  • branches/fc11-dev/server/fedora/config/etc/pki/tls/certs/scripts-cert.pem

    r801 r1246  
    22    Data:
    33        Version: 3 (0x2)
    4         Serial Number: 2872 (0xb38)
     4        Serial Number:
     5            bf:ae:ff:3a:cd:d8:29:65:eb:c7:3a:7a:57:81:3e:fb
    56        Signature Algorithm: sha1WithRSAEncryption
    67        Issuer: C=US, ST=Massachusetts, O=Massachusetts Institute of Technology, OU=MIT Certification Authority
    78        Validity
    8             Not Before: Jul 23 16:00:00 2008 GMT
    9             Not After : Jul 23 16:00:00 2009 GMT
    10         Subject: C=US, ST=Massachusetts, L=Cambridge, O=Massachusetts Institute of Technology, OU=Student Information Processing Board, CN=scripts-cert.mit.edu/Email=scripts@mit.edu
     9            Not Before: Jul  6 16:00:00 2009 GMT
     10            Not After : Jul  8 16:00:00 2010 GMT
     11        Subject: C=US, ST=Massachusetts, L=Cambridge, O=Massachusetts Institute of Technology, OU=Student Information Processing Board, CN=scripts-cert.mit.edu/emailAddress=scripts@mit.edu
    1112        Subject Public Key Info:
    1213            Public Key Algorithm: rsaEncryption
     
    3435            X509v3 Subject Key Identifier:
    3536                54:11:7C:09:55:44:1C:94:45:A9:A2:76:46:2B:2C:24:26:6A:44:E8
     37            X509v3 CRL Distribution Points:
     38                URI:http://ca.mit.edu/ca/mitserver.crl
     39
    3640    Signature Algorithm: sha1WithRSAEncryption
    37         38:a3:3b:c2:d6:cb:5b:36:65:89:c4:c1:fc:c8:5f:b5:07:a2:
    38         85:0b:59:22:f7:b3:a9:97:b7:81:32:4d:3f:17:69:6c:6f:f3:
    39         64:de:75:bf:e6:16:98:88:cf:24:f2:07:10:fe:d2:e8:66:42:
    40         10:2d:42:d5:80:14:e6:55:0e:8f:c4:28:e9:39:f1:cd:a4:4a:
    41         c5:93:15:45:08:c9:b6:3e:7e:4c:e7:1f:ee:0d:53:91:37:1f:
    42         dd:e2:da:97:f0:a9:ce:98:c0:5d:46:11:12:66:5f:7f:11:fc:
    43         80:2a:36:d8:ca:68:ad:5c:3d:12:5b:32:af:1b:ad:e0:36:6d:
    44         e2:f1
     41        2b:39:ba:b0:36:13:fc:c1:bb:f5:34:95:d4:5a:0c:08:2a:db:
     42        62:a0:7b:ea:9c:3b:a2:ed:21:22:6d:49:cb:78:b9:fd:7a:de:
     43        aa:3e:19:d1:22:0a:09:f1:c8:9b:20:80:af:0c:9a:76:c6:cf:
     44        8e:d3:1c:dd:e2:32:c2:da:9f:20:62:23:17:68:d6:da:0d:6d:
     45        88:18:3e:4e:cb:2d:74:b0:af:23:38:ba:14:b5:1a:e7:8e:bd:
     46        21:be:39:07:30:76:8e:71:7c:c9:f0:ad:f0:d5:d7:69:2f:7a:
     47        ab:35:d8:4f:17:2b:ed:a7:fc:b4:1c:e2:fc:9e:00:af:51:2c:
     48        46:28
    4549-----BEGIN CERTIFICATE-----
    46 MIIDPzCCAqigAwIBAgICCzgwDQYJKoZIhvcNAQEFBQAwezELMAkGA1UEBhMCVVMx
    47 FjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxLjAsBgNVBAoTJU1hc3NhY2h1c2V0dHMg
    48 SW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kxJDAiBgNVBAsTG01JVCBDZXJ0aWZpY2F0
    49 aW9uIEF1dGhvcml0eTAeFw0wODA3MjMxNjAwMDBaFw0wOTA3MjMxNjAwMDBaMIHX
    50 MQswCQYDVQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVzZXR0czESMBAGA1UEBxMJ
    51 Q2FtYnJpZGdlMS4wLAYDVQQKEyVNYXNzYWNodXNldHRzIEluc3RpdHV0ZSBvZiBU
    52 ZWNobm9sb2d5MS0wKwYDVQQLEyRTdHVkZW50IEluZm9ybWF0aW9uIFByb2Nlc3Np
    53 bmcgQm9hcmQxHTAbBgNVBAMTFHNjcmlwdHMtY2VydC5taXQuZWR1MR4wHAYJKoZI
    54 hvcNAQkBFg9zY3JpcHRzQG1pdC5lZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
    55 AoGBALU+IU3BiWsBjEeA/rM3J3b4UkHmoj1Ldnjl8mY8D7Gt+5ePLqK2U9O2DuJm
    56 +bkLt8601fUcH28ifUj1bfAWzY5IedEUShQvL/jEvR2Hz32LXHetWCSwDqFt1grH
    57 2LwvZ2XIXdjYMcJnS0r0oaVUgq/LNAgqBH+OfEy329xqil2BAgMBAAGjdTBzMAkG
    58 A1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgXgMCcGA1UdJQQgMB4GCCsGAQUFBwMB
    59 BggrBgEFBQcDBAYIKwYBBQUHAwIwCwYDVR0PBAQDAgXgMB0GA1UdDgQWBBRUEXwJ
    60 VUQclEWponZGKywkJmpE6DANBgkqhkiG9w0BAQUFAAOBgQA4ozvC1stbNmWJxMH8
    61 yF+1B6KFC1ki97Opl7eBMk0/F2lsb/Nk3nW/5haYiM8k8gcQ/tLoZkIQLULVgBTm
    62 VQ6PxCjpOfHNpErFkxVFCMm2Pn5M5x/uDVORNx/d4tqX8KnOmMBdRhESZl9/EfyA
    63 KjbYymitXD0SWzKvG63gNm3i8Q==
     50MIIDhTCCAu6gAwIBAgIRAL+u/zrN2Cll68c6eleBPvswDQYJKoZIhvcNAQEFBQAw
     51ezELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxLjAsBgNVBAoT
     52JU1hc3NhY2h1c2V0dHMgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kxJDAiBgNVBAsT
     53G01JVCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wOTA3MDYxNjAwMDBaFw0x
     54MDA3MDgxNjAwMDBaMIHXMQswCQYDVQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVz
     55ZXR0czESMBAGA1UEBxMJQ2FtYnJpZGdlMS4wLAYDVQQKEyVNYXNzYWNodXNldHRz
     56IEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MS0wKwYDVQQLEyRTdHVkZW50IEluZm9y
     57bWF0aW9uIFByb2Nlc3NpbmcgQm9hcmQxHTAbBgNVBAMTFHNjcmlwdHMtY2VydC5t
     58aXQuZWR1MR4wHAYJKoZIhvcNAQkBFg9zY3JpcHRzQG1pdC5lZHUwgZ8wDQYJKoZI
     59hvcNAQEBBQADgY0AMIGJAoGBALU+IU3BiWsBjEeA/rM3J3b4UkHmoj1Ldnjl8mY8
     60D7Gt+5ePLqK2U9O2DuJm+bkLt8601fUcH28ifUj1bfAWzY5IedEUShQvL/jEvR2H
     61z32LXHetWCSwDqFt1grH2LwvZ2XIXdjYMcJnS0r0oaVUgq/LNAgqBH+OfEy329xq
     62il2BAgMBAAGjgaswgagwCQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBeAwJwYD
     63VR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMEBggrBgEFBQcDAjALBgNVHQ8EBAMC
     64BeAwHQYDVR0OBBYEFFQRfAlVRByURamidkYrLCQmakToMDMGA1UdHwQsMCowKKAm
     65oCSGImh0dHA6Ly9jYS5taXQuZWR1L2NhL21pdHNlcnZlci5jcmwwDQYJKoZIhvcN
     66AQEFBQADgYEAKzm6sDYT/MG79TSV1FoMCCrbYqB76pw7ou0hIm1Jy3i5/Xreqj4Z
     670SIKCfHImyCArwyadsbPjtMc3eIywtqfIGIjF2jW2g1tiBg+TsstdLCvIzi6FLUa
     685469Ib45BzB2jnF8yfCt8NXXaS96qzXYTxcr7af8tBzi/J4Ar1EsRig=
    6469-----END CERTIFICATE-----
  • branches/fc11-dev/server/fedora/config/etc/ssh/shosts.equiv

    r1179 r1246  
    33bees-knees.mit.edu
    44cats-whiskers.mit.edu
     5pancake-bunny.mit.edu
    56172.21.0.53
    67172.21.0.57
    78172.21.0.167
    89172.21.0.228
     10172.21.0.237
  • branches/fc11-dev/server/fedora/config/etc/ssh/ssh_known_hosts

    r1179 r1246  
     1pancake-bunny.mit.edu,pancake-bunny,p-b.mit.edu,p-b,scripts6.mit.edu,scripts6,18.181.0.237,172.21.0.237 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==
    12cats-whiskers.mit.edu,cats-whiskers,c-w.mit.edu,c-w,scripts4.mit.edu,scripts4,18.181.0.228,172.21.0.228 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==
    23bees-knees.mit.edu,bees-knees,b-k.mit.edu,b-k,scripts3.mit.edu,scripts3,18.181.0.167,172.21.0.167 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==
  • branches/fc11-dev/server/fedora/config/etc/ssh/sshd_config

    r1179 r1246  
    1919IgnoreRhosts yes
    2020IgnoreUserKnownHosts yes
    21 DenyUsers root@old-faithful.mit.edu root@better-mousetrap.mit.edu root@bees-knees.mit.edu root@cats-whiskers.mit.edu
     21DenyUsers root@old-faithful.mit.edu root@better-mousetrap.mit.edu root@bees-knees.mit.edu root@cats-whiskers.mit.edu root@pancake-bunny.mit.edu
  • branches/fc11-dev/server/fedora/config/etc/sysconfig/network-scripts/route-eth1

    r1179 r1246  
    6618.181.0.167 via 172.21.0.167
    7718.181.0.228 via 172.21.0.228
     818.181.0.237 via 172.21.0.237
Note: See TracChangeset for help on using the changeset viewer.