Ignore:
Timestamp:
May 25, 2014, 3:55:57 PM (8 years ago)
Author:
achernya
Message:
Merge r2487-r2521 from trunk to branches/fc19-dev
Location:
branches/fc19-dev
Files:
4 deleted
10 edited
31 copied

Legend:

Unmodified
Added
Removed
  • branches/fc19-dev

  • branches/fc19-dev/server/fedora/config/etc

    • Property svn:mergeinfo deleted
  • branches/fc19-dev/server/fedora/config/etc/aliases

    r2495 r2522  
    107107# buechley: not responsive to mail sent by -root on 2013-05-14, added 2013-07-04
    108108buechley:        /dev/null
    109 
    110 # Temporary to clear the queue
    111 # Should be deleted if left uncommitted
     109# cssa: spam, added 2014-02-01
     110cssa:   /dev/null
  • branches/fc19-dev/server/fedora/config/etc/httpd/vhosts.d/cs6090.conf

    r2355 r2522  
    44        ServerName cs6090.mit.edu
    55        ServerAlias cs6090
    6         DocumentRoot /afs/athena.mit.edu/course/6/6.090/web_scripts
    7         Alias /~6.090 /afs/athena.mit.edu/course/6/6.090/web_scripts
    8         SuExecUserGroup 6.090 6.090
     6        DocumentRoot /afs/athena.mit.edu/course/6/6.177/web_scripts
     7        Alias /~6.177 /afs/athena.mit.edu/course/6/6.177/web_scripts
     8        SuExecUserGroup 6.177 6.177
    99        Include conf.d/vhosts-common.conf
    1010</VirtualHost>
     
    1414                ServerName cs6090.mit.edu
    1515                ServerAlias cs6090
    16                 DocumentRoot /afs/athena.mit.edu/course/6/6.090/web_scripts
    17                 Alias /~6.090 /afs/athena.mit.edu/course/6/6.090/web_scripts
    18                 SuExecUserGroup 6.090 6.090
     16                DocumentRoot /afs/athena.mit.edu/course/6/6.177/web_scripts
     17                Alias /~6.177 /afs/athena.mit.edu/course/6/6.177/web_scripts
     18                SuExecUserGroup 6.177 6.177
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/cs6090.pem
     
    2525                ServerName cs6090.mit.edu
    2626                ServerAlias cs6090
    27                 DocumentRoot /afs/athena.mit.edu/course/6/6.090/web_scripts
    28                 Alias /~6.090 /afs/athena.mit.edu/course/6/6.090/web_scripts
    29                 SuExecUserGroup 6.090 6.090
     27                DocumentRoot /afs/athena.mit.edu/course/6/6.177/web_scripts
     28                Alias /~6.177 /afs/athena.mit.edu/course/6/6.177/web_scripts
     29                SuExecUserGroup 6.177 6.177
    3030                Include conf.d/vhosts-common-ssl.conf
    3131                Include conf.d/vhosts-common-ssl-cert.conf
  • branches/fc19-dev/server/fedora/config/etc/mock/scripts-fc17-i386.cfg

    r2344 r2522  
    2323name=fedora
    2424#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-17&arch=i386
    25 baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/17/Everything/i386/os/
     25#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/17/Everything/i386/os/
     26baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/17/Everything/i386/os/
    2627failovermethod=priority
    2728
     
    2930name=updates
    3031#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f17&arch=i386
    31 baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/17/i386/
     32#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/17/i386/
     33baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/17/i386/
    3234failovermethod=priority
    3335
  • branches/fc19-dev/server/fedora/config/etc/mock/scripts-fc17-x86_64.cfg

    r2344 r2522  
    2727name=fedora
    2828#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-17&arch=x86_64
    29 baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/17/Everything/x86_64/os/
     29#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/17/Everything/x86_64/os/
     30baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/17/Everything/x86_64/os/
    3031failovermethod=priority
    3132
     
    3334name=updates
    3435#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f17&arch=x86_64
    35 baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/17/x86_64/
     36#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/17/x86_64/
     37baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/17/x86_64/
    3638failovermethod=priority
    3739
  • branches/fc19-dev/server/fedora/config/etc/pki/tls/certs/davidben.net.pem

    r2350 r2522  
    11-----BEGIN CERTIFICATE-----
    2 MIIHWjCCBkKgAwIBAgIDCJb0MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
     2MIIHWjCCBkKgAwIBAgIDDYejMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
    33TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
    44YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
    5 MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwMTAyMTQxODU3
    6 WhcNMTQwMTAzMDQ0MzEwWjBrMRkwFwYDVQQNExAyYTdCVjYzTDNBcXBsZUVUMQsw
     5MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMxMjIxMTk0MzE0
     6WhcNMTQxMjIxMjMyNjQzWjBrMRkwFwYDVQQNExBTajg4TUt0MEl0UVRMMHdGMQsw
    77CQYDVQQGEwJVUzEZMBcGA1UEAxMQd3d3LmRhdmlkYmVuLm5ldDEmMCQGCSqGSIb3
    88DQEJARYXaG9zdG1hc3RlckBkYXZpZGJlbi5uZXQwggIiMA0GCSqGSIb3DQEBAQUA
     
    3333L2NsYXNzMS9zZXJ2ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRz
    3434c2wuY29tL2NlcnRzL3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAa
    35 hhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBAFro
    36 d7DIRqRZS6MLh0C1ei0pxKOcJ60vSym7SwziO6BlOx+bAUnKWBvCS/e+wNbjzKa6
    37 fD/MIAulEz8MAiD6pC7EXpu3/MXP5tI/F04kTqLEJ9X2XkteqJhgC1N6RW12wRyv
    38 hVYzBqYUddVYZ3TIDyOqS5hB+0f3UEW/XSZ1ltRvDq1TPuVLPwDvP4EX/nUW6BWy
    39 +e8uMgZ5IttHogSTIMAeDkWv57XBhRvHqLJvz4kxJETnNO0hiFVyNt2HOoxyyR3u
    40 HXZwAi64b0M0z4hK540OC0lc7ZY/9tdLUrGq22mfjTbTrdofboHYLqnVlyqzpZ4l
    41 idDGZG70dmJ6x7FuZoc=
     35hhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBADzv
     36p+sML+1oK9DnwnUAY5fVusuBAPDFZQl66lD92PtYLh7jv/oh91OZC5zg+pkxDo9Z
     37hDdeTK73ilJ60lQhFippmXA1iC7vKjSNg5j/m+uv9e/e/JnNsJ/BybcLkrfs7FIg
     38T8hOX7eLaCiBbqLgzmqsOW50DY3JEb7rxZJmp9+dH3JLRvNgt41um4kzd/EkcVsP
     39gzDzry5Ufip1FABnm3VbWbiqkPESKexOgYP0fZewKS7Z9GWx381vJfoBWdqtZzf6
     40pourUSpl2fvScbseAOK285gEeyduqGtxj7/HJQGLLfemSPX3fFmGpFoVczHwcybC
     414+w6NkWkfdsmQ4xU8oA=
    4242-----END CERTIFICATE-----
    4343-----BEGIN CERTIFICATE-----
  • branches/fc19-dev/server/fedora/config/etc/pki/tls/certs/www.davidben.net.pem

    r2353 r2522  
    11-----BEGIN CERTIFICATE-----
    2 MIIHWjCCBkKgAwIBAgIDCJb0MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
     2MIIHWjCCBkKgAwIBAgIDDYejMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
    33TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
    44YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
    5 MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwMTAyMTQxODU3
    6 WhcNMTQwMTAzMDQ0MzEwWjBrMRkwFwYDVQQNExAyYTdCVjYzTDNBcXBsZUVUMQsw
     5MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMxMjIxMTk0MzE0
     6WhcNMTQxMjIxMjMyNjQzWjBrMRkwFwYDVQQNExBTajg4TUt0MEl0UVRMMHdGMQsw
    77CQYDVQQGEwJVUzEZMBcGA1UEAxMQd3d3LmRhdmlkYmVuLm5ldDEmMCQGCSqGSIb3
    88DQEJARYXaG9zdG1hc3RlckBkYXZpZGJlbi5uZXQwggIiMA0GCSqGSIb3DQEBAQUA
     
    3333L2NsYXNzMS9zZXJ2ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRz
    3434c2wuY29tL2NlcnRzL3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAa
    35 hhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBAFro
    36 d7DIRqRZS6MLh0C1ei0pxKOcJ60vSym7SwziO6BlOx+bAUnKWBvCS/e+wNbjzKa6
    37 fD/MIAulEz8MAiD6pC7EXpu3/MXP5tI/F04kTqLEJ9X2XkteqJhgC1N6RW12wRyv
    38 hVYzBqYUddVYZ3TIDyOqS5hB+0f3UEW/XSZ1ltRvDq1TPuVLPwDvP4EX/nUW6BWy
    39 +e8uMgZ5IttHogSTIMAeDkWv57XBhRvHqLJvz4kxJETnNO0hiFVyNt2HOoxyyR3u
    40 HXZwAi64b0M0z4hK540OC0lc7ZY/9tdLUrGq22mfjTbTrdofboHYLqnVlyqzpZ4l
    41 idDGZG70dmJ6x7FuZoc=
     35hhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBADzv
     36p+sML+1oK9DnwnUAY5fVusuBAPDFZQl66lD92PtYLh7jv/oh91OZC5zg+pkxDo9Z
     37hDdeTK73ilJ60lQhFippmXA1iC7vKjSNg5j/m+uv9e/e/JnNsJ/BybcLkrfs7FIg
     38T8hOX7eLaCiBbqLgzmqsOW50DY3JEb7rxZJmp9+dH3JLRvNgt41um4kzd/EkcVsP
     39gzDzry5Ufip1FABnm3VbWbiqkPESKexOgYP0fZewKS7Z9GWx381vJfoBWdqtZzf6
     40pourUSpl2fvScbseAOK285gEeyduqGtxj7/HJQGLLfemSPX3fFmGpFoVczHwcybC
     414+w6NkWkfdsmQ4xU8oA=
    4242-----END CERTIFICATE-----
    4343-----BEGIN CERTIFICATE-----
  • branches/fc19-dev/server/fedora/config/etc/postfix/blocked_users

    r2434 r2522  
    44delian
    55buechley
     6cssa
  • branches/fc19-dev/server/fedora/config/etc/postfix/main.cf

    r2488 r2522  
    1515mailbox_command = /usr/bin/procmail -t -a "${EXTENSION}" ~/mail_scripts/procmailrc
    1616mailbox_size_limit = 0
     17message_size_limit = 41943040
    1718recipient_delimiter = +
    1819inet_interfaces = all
Note: See TracChangeset for help on using the changeset viewer.