Ignore:
Timestamp:
Nov 4, 2011, 4:21:37 PM (12 years ago)
Author:
achernya
Message:
Merge r1989-2025 from trunk to branches/fc15-dev
Location:
branches/fc15-dev
Files:
10 edited
3 copied

Legend:

Unmodified
Added
Removed

  • branches/fc15-dev

  • branches/fc15-dev/server/fedora/config/etc/httpd/conf/httpd.conf

    r1967 r2026  
    411411IPCCommTimeout 300
    412412FcgidMaxRequestLen 209715200
     413FcgidIdleTimeout 600
     414FcgidMaxProcessesPerClass 10
     415FcgidMinProcessesPerClass 0
     416FcgidMaxRequestsPerProcess 10000
    413417
    414418Include conf.d/auth_sslcert.conf

  • branches/fc15-dev/server/fedora/config/etc/httpd/vhosts.d/barnowl.conf

    r885 r2026  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/barnowl.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/barnowl.pem
     32                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3133        </VirtualHost>
    3234</IfModule>

  • branches/fc15-dev/server/fedora/config/etc/httpd/vhosts.d/cdsa.conf

    r885 r2026  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/cdsa.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/cdsa.pem
     32                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3133        </VirtualHost>
    3234</IfModule>

  • branches/fc15-dev/server/fedora/config/etc/httpd/vhosts.d/fridget.conf

    r1719 r2026  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/fridget.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/fridget.pem
     32                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3133        </VirtualHost>
    3234</IfModule>

  • branches/fc15-dev/server/fedora/config/etc/httpd/vhosts.d/signup.conf

    r1335 r2026  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/signup.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/signup.pem
     32                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3133        </VirtualHost>
    3234</IfModule>

  • branches/fc15-dev/server/fedora/config/etc/httpd/vhosts.d/sipb.conf

    r974 r2026  
    33<VirtualHost *:80>
    44        ServerName sipb.mit.edu
    5         ServerAlias sipb
     5        ServerAlias sipb sipb.org www.sipb.org
    66        DocumentRoot /afs/sipb.mit.edu/project/sipb-www/web_scripts/sipb
    77        Alias /~sipb-www /afs/sipb.mit.edu/project/sipb-www/web_scripts
    … …  
    1313        <VirtualHost *:443>
    1414                ServerName sipb.mit.edu
    15                 ServerAlias sipb
     15                ServerAlias sipb sipb.org www.sipb.org
    1616                DocumentRoot /afs/sipb.mit.edu/project/sipb-www/web_scripts/sipb
    1717                Alias /~sipb-www /afs/sipb.mit.edu/project/sipb-www/web_scripts
    … …  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/sipb.pem
     21                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    2122        </VirtualHost>
    2223        <VirtualHost *:444>
    2324                ServerName sipb.mit.edu
    24                 ServerAlias sipb
     25                ServerAlias sipb sipb.org www.sipb.org
    2526                DocumentRoot /afs/sipb.mit.edu/project/sipb-www/web_scripts/sipb
    2627                Alias /~sipb-www /afs/sipb.mit.edu/project/sipb-www/web_scripts
    … …  
    2930                Include conf.d/vhosts-common-ssl-cert.conf
    3031                SSLCertificateFile /etc/pki/tls/certs/sipb.pem
     32                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3133        </VirtualHost>
    3234</IfModule>

  • branches/fc15-dev/server/fedora/config/etc/httpd/vhosts.d/twentytwelve.conf

    r885 r2026  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/twentytwelve.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/twentytwelve.pem
     32                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3133        </VirtualHost>
    3234</IfModule>

  • branches/fc15-dev/server/fedora/config/etc/httpd/vhosts.d/ua.conf

    r1326 r2026  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/ua.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/ua.pem
     32                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3133        </VirtualHost>
    3234</IfModule>

  • branches/fc15-dev/server/fedora/config/etc/httpd/vhosts.d/wakeup.conf

    r1947 r2026  
    44        ServerName wakeup.mit.edu
    55        ServerAlias wakeup
    6         DocumentRoot /afs/athena.mit.edu/user/g/e/geofft/web_scripts/wakeup
    7         Alias /~geofft /afs/athena.mit.edu/user/g/e/geofft/web_scripts
    8         SuExecUserGroup geofft geofft
     6        DocumentRoot /afs/sipb.mit.edu/project/voip/web_scripts/wakeup
     7        Alias /~sipb-voip /afs/sipb.mit.edu/project/voip/web_scripts
     8        SuExecUserGroup sipb-voip sipb-voip
    99        Include conf.d/vhosts-common.conf
    1010</VirtualHost>
    … …  
    1414                ServerName wakeup.mit.edu
    1515                ServerAlias wakeup
    16                 DocumentRoot /afs/athena.mit.edu/user/g/e/geofft/web_scripts/wakeup
    17                 Alias /~geofft /afs/athena.mit.edu/user/g/e/geofft/web_scripts
    18                 SuExecUserGroup geofft geofft
     16                DocumentRoot /afs/sipb.mit.edu/project/voip/web_scripts/wakeup
     17                Alias /~sipb-voip /afs/sipb.mit.edu/project/voip/web_scripts
     18                SuExecUserGroup sipb-voip sipb-voip
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/wakeup.pem
    … …  
    2424                ServerName wakeup.mit.edu
    2525                ServerAlias wakeup
    26                 DocumentRoot /afs/athena.mit.edu/user/g/e/geofft/web_scripts/wakeup
    27                 Alias /~geofft /afs/athena.mit.edu/user/g/e/geofft/web_scripts
    28                 SuExecUserGroup geofft geofft
     26                DocumentRoot /afs/sipb.mit.edu/project/voip/web_scripts/wakeup
     27                Alias /~sipb-voip /afs/sipb.mit.edu/project/voip/web_scripts
     28                SuExecUserGroup sipb-voip sipb-voip
    2929                Include conf.d/vhosts-common-ssl.conf
    3030                Include conf.d/vhosts-common-ssl-cert.conf
Note: See TracChangeset for help on using the changeset viewer.