Ignore:
Timestamp:
May 22, 2012, 10:52:35 PM (12 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc17-dev
Files:
4 deleted
5 edited
7 copied

Legend:

Unmodified
Added
Removed

  • branches/fc17-dev

  • branches/fc17-dev/server/fedora/config/etc/httpd/conf.d/scripts-special.conf

    r2066 r2195  
    3030
    3131    RewriteCond %{HTTP_USER_AGENT} Mac\ OS\ X.*AppleWebKit
    32     RewriteRule /afs/athena.mit.edu/contrib/scripts/www/needcerts(.*) /__scripts/safarihack$1 [L]
     32    RewriteRule /afs/athena.mit.edu/contrib/scripts/www/needcerts(.*) /__scripts/certerror$1 [L]
    3333
    3434    RewriteRule /afs/athena.mit.edu/contrib/scripts/www/needcerts(.+) $1 [L]
    … …  
    3636</Location>
    3737
    38 <Location /__scripts/safarihack>
     38<Location /__scripts/certerror>
    3939    SSLVerifyClient require
    40     RewriteRule /afs/athena.mit.edu/contrib/scripts/www/safarihack(.+) $1 [L]
    41     RewriteRule /afs/athena.mit.edu/contrib/scripts/www/safarihack /__scripts/unauthorized.html [L]
     40    RewriteRule /afs/athena.mit.edu/contrib/scripts/www/certerror(.+) $1 [L]
     41    RewriteRule /afs/athena.mit.edu/contrib/scripts/www/certerror /__scripts/unauthorized.html [L]
    4242</Location>

  • branches/fc17-dev/server/fedora/config/etc/httpd/vhosts.d/asa.conf

    r1802 r2195  
    44        ServerName asa.mit.edu
    55        ServerAlias asa
    6         DocumentRoot /afs/athena.mit.edu/activity/a/asa/web_scripts
    7         Alias /~asa /afs/athena.mit.edu/activity/a/asa/web_scripts
    8         SuExecUserGroup asa asa
     6        DocumentRoot /afs/athena.mit.edu/activity/a/asa-db/web_scripts/db
     7        Alias /~asa-db /afs/athena.mit.edu/activity/a/asa-db/web_scripts
     8        SuExecUserGroup asa-db asa-db
    99        Include conf.d/vhosts-common.conf
    1010</VirtualHost>
    … …  
    1414                ServerName asa.mit.edu
    1515                ServerAlias asa
    16                 DocumentRoot /afs/athena.mit.edu/activity/a/asa/web_scripts
    17                 Alias /~asa /afs/athena.mit.edu/activity/a/asa/web_scripts
    18                 SuExecUserGroup asa asa
     16                DocumentRoot /afs/athena.mit.edu/activity/a/asa-db/web_scripts/db
     17                Alias /~asa-db /afs/athena.mit.edu/activity/a/asa-db/web_scripts
     18                SuExecUserGroup asa-db asa-db
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/asa.pem
    … …  
    2424                ServerName asa.mit.edu
    2525                ServerAlias asa
    26                 DocumentRoot /afs/athena.mit.edu/activity/a/asa/web_scripts
    27                 Alias /~asa /afs/athena.mit.edu/activity/a/asa/web_scripts
    28                 SuExecUserGroup asa asa
     26                DocumentRoot /afs/athena.mit.edu/activity/a/asa-db/web_scripts/db
     27                Alias /~asa-db /afs/athena.mit.edu/activity/a/asa-db/web_scripts
     28                SuExecUserGroup asa-db asa-db
    2929                Include conf.d/vhosts-common-ssl.conf
    3030                Include conf.d/vhosts-common-ssl-cert.conf

  • branches/fc17-dev/server/fedora/config/etc/httpd/vhosts.d/debathena.conf

    r1081 r2195  
    33<VirtualHost *:80>
    44        ServerName debathena.mit.edu
    5         ServerAlias debathena
     5        ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
    66        DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
    77        Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
    … …  
    1414        <VirtualHost *:443>
    1515                ServerName debathena.mit.edu
    16                 ServerAlias debathena
     16                ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
    1717                DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
    1818                Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
    1919                SuExecUserGroup debathena debathena
    2020                Include conf.d/vhosts-common-ssl.conf
     21                CustomLog /home/logview/debathena.log combined
    2122                SSLCertificateFile /etc/pki/tls/certs/debathena.pem
    22                 CustomLog /home/logview/debathena.log combined
     23                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    2324        </VirtualHost>
    2425        <VirtualHost *:444>
    2526                ServerName debathena.mit.edu
    26                 ServerAlias debathena
     27                ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
    2728                DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
    2829                Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
    … …  
    3031                Include conf.d/vhosts-common-ssl.conf
    3132                Include conf.d/vhosts-common-ssl-cert.conf
     33                CustomLog /home/logview/debathena.log combined
    3234                SSLCertificateFile /etc/pki/tls/certs/debathena.pem
    33                 CustomLog /home/logview/debathena.log combined
     35                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3436        </VirtualHost>
    3537</IfModule>

  • branches/fc17-dev/server/fedora/config/etc/httpd/vhosts.d/impact.conf

    r1405 r2195  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/impact.pem
     21                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    2122        </VirtualHost>
    2223        <VirtualHost *:444>
    … …  
    2930                Include conf.d/vhosts-common-ssl-cert.conf
    3031                SSLCertificateFile /etc/pki/tls/certs/impact.pem
     32                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3133        </VirtualHost>
    3234</IfModule>
Note: See TracChangeset for help on using the changeset viewer.