Ignore:
Timestamp:
Apr 3, 2007, 9:43:09 PM (17 years ago)
Author:
presbrey
Message:
Default charset directive removed.
Minor cosmetic changes.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • server/fedora/config/etc/httpd/conf/httpd.conf

    r252 r257  
    1 #ServerType standalone
    21ServerRoot /etc/httpd
    3 #LockFile /var/lock/apache.lock
    42PidFile run/httpd.pid
    5 #ScoreBoardFile /var/run/apache.scoreboard
    63Timeout 300
    74KeepAlive On
    … …  
    8279
    8380<Directory /mit/*/web_scripts>
    84     AllowOverride All
    85     Options FollowSymLinks IncludesNoExec
    86 </Directory>
    87 
     81</Directory>
    8882<Directory /afs/athena.mit.edu/activity/*/*/web_scripts>
    89     AllowOverride All
    90     Options FollowSymLinks IncludesNoExec
    91 </Directory>
    92 
     83</Directory>
    9384<Directory /afs/athena.mit.edu/contrib/*/web_scripts>
    94     AllowOverride All
    95     Options FollowSymLinks IncludesNoExec
    96 </Directory>
    97 
     85</Directory>
    9886<Directory /afs/athena.mit.edu/course/*/*/web_scripts>
    99     AllowOverride All
    100     Options FollowSymLinks IncludesNoExec
    101 </Directory>
    102 
     87</Directory>
    10388<Directory /afs/athena.mit.edu/org/*/*/web_scripts>
    104     AllowOverride All
    105     Options FollowSymLinks IncludesNoExec
    106 </Directory>
    107 
     89</Directory>
    10890<Directory /afs/athena.mit.edu/user/*/*/*/web_scripts>
    109     AllowOverride All
    110     Options FollowSymLinks IncludesNoExec
    11191</Directory>
    11292
    11393<IfModule mod_dir.c>
    114     DirectoryIndex index.html index.htm index.cgi index.pl index.php index.py index.shtml
     94    DirectoryIndex index.html index.htm index.cgi index.pl index.php index.py index.shtml index.exe
    11595</IfModule>
    11696
    … …  
    11898
    11999<Files ~ "^\.ht">
    120         Order Allow,Deny
    121         Deny from all
     100    Order Allow,Deny
     101    Deny from all
    122102</Files>
    123103
    … …  
    126106DefaultType text/plain
    127107#MIMEMagicFile conf/magic
    128 
    129 AddDefaultCharset on
    130108
    131109HostnameLookups Off
    … …  
    134112LogFormat "%V %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
    135113LogFormat "%h %l %u %t \"%r\" %>s %b" common
    136 LogFormat "%{Referer}i -> %U" referer
    137 LogFormat "%{User-agent}i" agent
    138114#CustomLog /var/log/httpd/access_log combined
    139115ServerSignature Off
    … …  
    141117ServerTokens Prod
    142118
    143 Alias /icons /var/www/icons
    144 <Directory /var/www/icons>
    145         Options None
    146         AllowOverride None
    147         <Files ~ "\.(gif|png)$">
    148                 SetHandler default-handler
    149         </Files>
    150 </Directory>
    151 
    152119<IfModule mod_autoindex.c>
     120    Alias /icons /var/www/icons
     121    <Directory /var/www/icons>
     122        Options None
     123        AllowOverride None
     124        <Files ~ "\.(gif|png)$">
     125            SetHandler default-handler
     126        </Files>
     127    </Directory>
     128
    153129    IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable
    154130
    … …  
    192168
    193169<IfModule mod_mime.c>
    194         AddType application/xhtml+xml         .xhtml
    195         AddType application/http-index-format .hti
    196         AddType text/html                     .html
    197         AddType text/css                      .css
    198         AddType text/xsl                      .xslt
    199         AddType application/x-javascript      .js
    200         AddType application/xml               .xml
    201         AddType image/svg+xml                 .svg
    202         AddType application/vnd.mozilla.xul+xml .xul
    203         AddType application/rdf+xml             .rdf
    204         AddType application/x-xpinstall         .xpi
    205         AddType text/xml .xsl
    206         #AddOutputFilterByType mod-xslt application/xml
    207         AddType text/html .shtml
    208         AddHandler server-parsed .shtml
    209 </IfModule>
    210 
    211 <IfModule mod_mime.c>
     170    AddType application/xhtml+xml         .xhtml
     171    AddType application/http-index-format .hti
     172    AddType text/html                     .html
     173    AddType text/css                      .css
     174    AddType text/xsl                      .xslt
     175    AddType application/x-javascript      .js
     176    AddType application/xml               .xml
     177    AddType image/svg+xml                 .svg
     178    AddType application/vnd.mozilla.xul+xml .xul
     179    AddType application/rdf+xml             .rdf
     180    AddType application/x-xpinstall         .xpi
     181    AddType text/xml .xsl
     182    AddType text/html .shtml
     183    AddHandler server-parsed .shtml
     184
    212185    AddEncoding x-compress Z
    213186    AddEncoding x-gzip gz tgz
    … …  
    237210    </IfModule>
    238211
    239     #AddType application/x-httpd-php .php
    240     #AddType application/x-httpd-php-source .phps
    241 
    242212    AddType application/x-tar .tgz
    243213    AddType image/bmp .bmp
    244214
    245     # hdml
    246215    AddType text/x-hdml .hdml
    247 
    248     #AddType text/html .shtml
    249     #AddHandler server-parsed .shtml
    250216</IfModule>
    251217
    … …  
    280246
    281247<Location ~ "/(robots\.txt|favicon\.ico)">
    282         RewriteEngine On
    283         RewriteBase /~scripts
    284         RewriteCond %{REQUEST_FILENAME} !-f
    285         RewriteRule .*(favicon\.ico) $1 [L,NS]
    286         RewriteCond %{REQUEST_FILENAME} !-f
    287         RewriteRule .*(robots\.txt) $1 [L,NS]
     248    RewriteEngine On
     249    RewriteBase /~scripts
     250    RewriteCond %{REQUEST_FILENAME} !-f
     251    RewriteRule .*(favicon\.ico) $1 [L,NS]
     252    RewriteCond %{REQUEST_FILENAME} !-f
     253    RewriteRule .*(robots\.txt) $1 [L,NS]
    288254</Location>
    289255
    … …  
    291257
    292258<VirtualHost _default_:80>
    293         ServerName vhosts.mit.edu
    294         DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
    295         Include conf.d/vhosts-common.conf
     259    ServerName vhosts.mit.edu
     260    DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
     261    Include conf.d/vhosts-common.conf
    296262</VirtualHost>
    297263
    298264<VirtualHost 18.181.0.50:80>
    299         ServerName scripts-cert.mit.edu
    300         ServerAlias scripts-cert
    301         DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
    302         SuExecUserGroup scripts users
    303         UserDir web_scripts
    304         RewriteEngine Off
    305         Include conf.d/vhosts-common.conf
     265    ServerName scripts-cert.mit.edu
     266    ServerAlias scripts-cert
     267    DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
     268    SuExecUserGroup scripts users
     269    UserDir web_scripts
     270    Include conf.d/vhosts-common.conf
    306271</VirtualHost>
    307272
    308273<VirtualHost *:80>
    309         ServerName scripts.mit.edu
    310         ServerAlias scripts scripts-test.mit.edu scripts-test 18.181.0.46 18.181.0.57 old-faithful.mit.edu old-faithful scripts3.mit.edu scripts3 18.181.0.53 better-mousetrap.mit.edu better-mousetrap scripts4.mit.edu scripts4
    311         DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
    312         SuExecUserGroup scripts users
    313         UserDir web_scripts
    314         RewriteEngine Off
    315         Alias /src /afs/athena.mit.edu/contrib/scripts/src
    316         Redirect /sql https://scripts.mit.edu/~sql
    317         Include conf.d/vhosts-common.conf
     274    ServerName scripts.mit.edu
     275    ServerAlias scripts scripts-test.mit.edu scripts-test 18.181.0.46 18.181.0.57 old-faithful.mit.edu old-faithful scripts3.mit.edu scripts3 18.181.0.53 better-mousetrap.mit.edu better-mousetrap scripts4.mit.edu scripts4
     276    DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
     277    SuExecUserGroup scripts users
     278    UserDir web_scripts
     279    Alias /src /afs/athena.mit.edu/contrib/scripts/src
     280    Redirect /sql https://scripts.mit.edu/~sql
     281    Include conf.d/vhosts-common.conf
    318282</VirtualHost>
    319283
    320284<IfModule ssl_module>
    321         Listen 443
    322 
    323         AddType application/x-x509-ca-cert .crt
    324         AddType application/x-pkcs7-crl    .crl
    325 
    326         SSLPassPhraseDialog  builtin
    327         SSLSessionCache dbm:/var/run/ssl_scache
    328         SSLSessionCacheTimeout 300
    329         SSLMutex file:/var/run/ssl_mutex
    330         SSLRandomSeed startup builtin
    331         SSLRandomSeed connect builtin
    332         SSLCertificateFile /etc/pki/tls/certs/cert-new.pem
    333         SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
    334         SSLCACertificateFile /etc/pki/tls/certs/ca.pem
    335         SSLVerifyClient none
    336         SSLOptions +StdEnvVars
    337         SSLUserName SSL_CLIENT_S_DN_Email
    338         <VirtualHost 18.181.0.50:443>
    339                 ServerName scripts-cert.mit.edu
    340                 ServerAlias scripts-cert
    341                 DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
    342                 SuExecUserGroup scripts users
    343                 UserDir web_scripts
    344                 RewriteEngine Off
    345                 Include conf.d/vhosts-common-ssl.conf
    346                 SSLCertificateFile /etc/pki/tls/certs/scripts-cert-new.pem
    347                 SSLVerifyClient require
    348                 SSLVerifyDepth 1
    349         </VirtualHost>
    350         <VirtualHost *:443>
    351                 ServerName vhosts.mit.edu
    352                 ServerAlias vhosts
    353                 DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
    354                 RewriteEngine Off
    355                 Include conf.d/vhosts-common-ssl.conf
    356         </VirtualHost>
    357         <VirtualHost *:443>
    358                 ServerName scripts.mit.edu
    359                 ServerAlias scripts scripts-test.mit.edu scripts-test
    360                 DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
    361                 SuExecUserGroup scripts users
    362                 UserDir web_scripts
    363                 RewriteEngine Off
    364                 Include conf.d/vhosts-common-ssl.conf
    365         </VirtualHost>
     285    Listen 443
     286
     287    AddType application/x-x509-ca-cert .crt
     288    AddType application/x-pkcs7-crl    .crl
     289
     290    SSLPassPhraseDialog  builtin
     291    SSLSessionCache dbm:/var/run/ssl_scache
     292    SSLSessionCacheTimeout 300
     293    SSLMutex file:/var/run/ssl_mutex
     294    SSLRandomSeed startup builtin
     295    SSLRandomSeed connect builtin
     296    SSLCertificateFile /etc/pki/tls/certs/cert-new.pem
     297    SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
     298    SSLCACertificateFile /etc/pki/tls/certs/ca.pem
     299    SSLVerifyClient none
     300    SSLOptions +StdEnvVars
     301    SSLUserName SSL_CLIENT_S_DN_Email
     302    <VirtualHost 18.181.0.50:443>
     303        ServerName scripts-cert.mit.edu
     304        ServerAlias scripts-cert
     305        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
     306        SuExecUserGroup scripts users
     307        UserDir web_scripts
     308        Include conf.d/vhosts-common-ssl.conf
     309        SSLCertificateFile /etc/pki/tls/certs/scripts-cert-new.pem
     310        SSLVerifyClient require
     311        SSLVerifyDepth 1
     312    </VirtualHost>
     313    <VirtualHost *:443>
     314        ServerName vhosts.mit.edu
     315        ServerAlias vhosts
     316        DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
     317        Include conf.d/vhosts-common-ssl.conf
     318    </VirtualHost>
     319    <VirtualHost *:443>
     320        ServerName scripts.mit.edu
     321        ServerAlias scripts scripts-test.mit.edu scripts-test
     322        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
     323        SuExecUserGroup scripts users
     324        UserDir web_scripts
     325        Include conf.d/vhosts-common-ssl.conf
     326    </VirtualHost>
    366327</IfModule>
    367328
Note: See TracChangeset for help on using the changeset viewer.