Ignore:
Timestamp:
Jun 27, 2012, 10:26:17 PM (12 years ago)
Author:
ezyang
Message:
Merging r2215 through r2244 from trunk.
Location:
branches/fc17-dev
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/fc17-dev

  • branches/fc17-dev/server/fedora/config/etc/httpd/vhosts.d/blog.gregbrockman.com.conf

    r2195 r2245  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
     21                SSLCertificateChainFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
    2122                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    22                 SSLCertificateChainFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
    2323        </VirtualHost>
    2424        <VirtualHost *:444>
    … …  
    3131                Include conf.d/vhosts-common-ssl-cert.conf
    3232                SSLCertificateFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
     33                SSLCertificateChainFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
    3334                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    34                 SSLCertificateChainFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
    3535        </VirtualHost>
    3636</IfModule>

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

    r1771 r2245  
    55        ServerAlias eastgate
    66        DocumentRoot /afs/athena.mit.edu/activity/e/eastgate/web_scripts
    7         Alias /~eastgate /afs/athena.mit.edu/activity/e/eastgate/web_scripts
     7        Alias /~eastgate /disabled/afs/athena.mit.edu/activity/e/eastgate/web_scripts
    88        SuExecUserGroup eastgate eastgate
    99        Include conf.d/vhosts-common.conf
    … …  
    1515                ServerAlias eastgate
    1616                DocumentRoot /afs/athena.mit.edu/activity/e/eastgate/web_scripts
    17                 Alias /~eastgate /afs/athena.mit.edu/activity/e/eastgate/web_scripts
     17                Alias /~eastgate /disabled/afs/athena.mit.edu/activity/e/eastgate/web_scripts
    1818                SuExecUserGroup eastgate eastgate
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/eastgate.pem
     21                SSLCertificateChainFile /etc/pki/tls/certs/eastgate.pem
    2122                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    2223        </VirtualHost>
    … …  
    2526                ServerAlias eastgate
    2627                DocumentRoot /afs/athena.mit.edu/activity/e/eastgate/web_scripts
    27                 Alias /~eastgate /afs/athena.mit.edu/activity/e/eastgate/web_scripts
     28                Alias /~eastgate /disabled/afs/athena.mit.edu/activity/e/eastgate/web_scripts
    2829                SuExecUserGroup eastgate eastgate
    2930                Include conf.d/vhosts-common-ssl.conf
    3031                Include conf.d/vhosts-common-ssl-cert.conf
    3132                SSLCertificateFile /etc/pki/tls/certs/eastgate.pem
     33                SSLCertificateChainFile /etc/pki/tls/certs/eastgate.pem
    3234                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3335        </VirtualHost>

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

    r2195 r2245  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/ldpreload.com.pem
     21                SSLCertificateChainFile /etc/pki/tls/certs/ldpreload.com.pem
    2122                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    22                 SSLCertificateChainFile /etc/pki/tls/certs/ldpreload.com.pem
    2323        </VirtualHost>
    2424        <VirtualHost *:444>
    … …  
    3131                Include conf.d/vhosts-common-ssl-cert.conf
    3232                SSLCertificateFile /etc/pki/tls/certs/ldpreload.com.pem
     33                SSLCertificateChainFile /etc/pki/tls/certs/ldpreload.com.pem
    3334                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    34                 SSLCertificateChainFile /etc/pki/tls/certs/ldpreload.com.pem
    3535        </VirtualHost>
    3636</IfModule>

  • branches/fc17-dev/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py

    r1818 r2245  
    6363                Include conf.d/vhosts-common-ssl.conf
    6464                SSLCertificateFile /etc/pki/tls/certs/%(hname)s.pem
     65                SSLCertificateChainFile /etc/pki/tls/certs/%(hname)s.pem
    6566                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    6667        </VirtualHost>
    … …  
    7475                Include conf.d/vhosts-common-ssl-cert.conf
    7576                SSLCertificateFile /etc/pki/tls/certs/%(hname)s.pem
     77                SSLCertificateChainFile /etc/pki/tls/certs/%(hname)s.pem
    7678                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    7779        </VirtualHost>

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

    r1872 r2245  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/tours.pem
     21                SSLCertificateChainFile /etc/pki/tls/certs/tours.pem
    2122                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    2223        </VirtualHost>
    … …  
    3031                Include conf.d/vhosts-common-ssl-cert.conf
    3132                SSLCertificateFile /etc/pki/tls/certs/tours.pem
     33                SSLCertificateChainFile /etc/pki/tls/certs/tours.pem
    3234                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3335        </VirtualHost>
Note: See TracChangeset for help on using the changeset viewer.