Index: server/fedora/config/etc/httpd/conf/httpd.conf
===================================================================
--- server/fedora/config/etc/httpd/conf/httpd.conf (revision 252)
+++ server/fedora/config/etc/httpd/conf/httpd.conf (revision 257)
@@ -1,7 +1,4 @@
-#ServerType standalone
ServerRoot /etc/httpd
-#LockFile /var/lock/apache.lock
PidFile run/httpd.pid
-#ScoreBoardFile /var/run/apache.scoreboard
Timeout 300
KeepAlive On
@@ -82,35 +79,18 @@
- AllowOverride All
- Options FollowSymLinks IncludesNoExec
-
-
+
- AllowOverride All
- Options FollowSymLinks IncludesNoExec
-
-
+
- AllowOverride All
- Options FollowSymLinks IncludesNoExec
-
-
+
- AllowOverride All
- Options FollowSymLinks IncludesNoExec
-
-
+
- AllowOverride All
- Options FollowSymLinks IncludesNoExec
-
-
+
- AllowOverride All
- Options FollowSymLinks IncludesNoExec
- DirectoryIndex index.html index.htm index.cgi index.pl index.php index.py index.shtml
+ DirectoryIndex index.html index.htm index.cgi index.pl index.php index.py index.shtml index.exe
@@ -118,6 +98,6 @@
- Order Allow,Deny
- Deny from all
+ Order Allow,Deny
+ Deny from all
@@ -126,6 +106,4 @@
DefaultType text/plain
#MIMEMagicFile conf/magic
-
-AddDefaultCharset on
HostnameLookups Off
@@ -134,6 +112,4 @@
LogFormat "%V %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
LogFormat "%h %l %u %t \"%r\" %>s %b" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
#CustomLog /var/log/httpd/access_log combined
ServerSignature Off
@@ -141,14 +117,14 @@
ServerTokens Prod
-Alias /icons /var/www/icons
-
- Options None
- AllowOverride None
-
- SetHandler default-handler
-
-
-
+ Alias /icons /var/www/icons
+
+ Options None
+ AllowOverride None
+
+ SetHandler default-handler
+
+
+
IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable
@@ -192,22 +168,19 @@
- AddType application/xhtml+xml .xhtml
- AddType application/http-index-format .hti
- AddType text/html .html
- AddType text/css .css
- AddType text/xsl .xslt
- AddType application/x-javascript .js
- AddType application/xml .xml
- AddType image/svg+xml .svg
- AddType application/vnd.mozilla.xul+xml .xul
- AddType application/rdf+xml .rdf
- AddType application/x-xpinstall .xpi
- AddType text/xml .xsl
- #AddOutputFilterByType mod-xslt application/xml
- AddType text/html .shtml
- AddHandler server-parsed .shtml
-
-
-
+ AddType application/xhtml+xml .xhtml
+ AddType application/http-index-format .hti
+ AddType text/html .html
+ AddType text/css .css
+ AddType text/xsl .xslt
+ AddType application/x-javascript .js
+ AddType application/xml .xml
+ AddType image/svg+xml .svg
+ AddType application/vnd.mozilla.xul+xml .xul
+ AddType application/rdf+xml .rdf
+ AddType application/x-xpinstall .xpi
+ AddType text/xml .xsl
+ AddType text/html .shtml
+ AddHandler server-parsed .shtml
+
AddEncoding x-compress Z
AddEncoding x-gzip gz tgz
@@ -237,15 +210,8 @@
- #AddType application/x-httpd-php .php
- #AddType application/x-httpd-php-source .phps
-
AddType application/x-tar .tgz
AddType image/bmp .bmp
- # hdml
AddType text/x-hdml .hdml
-
- #AddType text/html .shtml
- #AddHandler server-parsed .shtml
@@ -280,10 +246,10 @@
- RewriteEngine On
- RewriteBase /~scripts
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteRule .*(favicon\.ico) $1 [L,NS]
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteRule .*(robots\.txt) $1 [L,NS]
+ RewriteEngine On
+ RewriteBase /~scripts
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteRule .*(favicon\.ico) $1 [L,NS]
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteRule .*(robots\.txt) $1 [L,NS]
@@ -291,77 +257,72 @@
- ServerName vhosts.mit.edu
- DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
- Include conf.d/vhosts-common.conf
+ ServerName vhosts.mit.edu
+ DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
+ Include conf.d/vhosts-common.conf
- ServerName scripts-cert.mit.edu
- ServerAlias scripts-cert
- DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
- SuExecUserGroup scripts users
- UserDir web_scripts
- RewriteEngine Off
- Include conf.d/vhosts-common.conf
+ ServerName scripts-cert.mit.edu
+ ServerAlias scripts-cert
+ DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
+ SuExecUserGroup scripts users
+ UserDir web_scripts
+ Include conf.d/vhosts-common.conf
- ServerName scripts.mit.edu
- 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
- DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
- SuExecUserGroup scripts users
- UserDir web_scripts
- RewriteEngine Off
- Alias /src /afs/athena.mit.edu/contrib/scripts/src
- Redirect /sql https://scripts.mit.edu/~sql
- Include conf.d/vhosts-common.conf
+ ServerName scripts.mit.edu
+ 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
+ DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
+ SuExecUserGroup scripts users
+ UserDir web_scripts
+ Alias /src /afs/athena.mit.edu/contrib/scripts/src
+ Redirect /sql https://scripts.mit.edu/~sql
+ Include conf.d/vhosts-common.conf
- Listen 443
-
- AddType application/x-x509-ca-cert .crt
- AddType application/x-pkcs7-crl .crl
-
- SSLPassPhraseDialog builtin
- SSLSessionCache dbm:/var/run/ssl_scache
- SSLSessionCacheTimeout 300
- SSLMutex file:/var/run/ssl_mutex
- SSLRandomSeed startup builtin
- SSLRandomSeed connect builtin
- SSLCertificateFile /etc/pki/tls/certs/cert-new.pem
- SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
- SSLCACertificateFile /etc/pki/tls/certs/ca.pem
- SSLVerifyClient none
- SSLOptions +StdEnvVars
- SSLUserName SSL_CLIENT_S_DN_Email
-
- ServerName scripts-cert.mit.edu
- ServerAlias scripts-cert
- DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
- SuExecUserGroup scripts users
- UserDir web_scripts
- RewriteEngine Off
- Include conf.d/vhosts-common-ssl.conf
- SSLCertificateFile /etc/pki/tls/certs/scripts-cert-new.pem
- SSLVerifyClient require
- SSLVerifyDepth 1
-
-
- ServerName vhosts.mit.edu
- ServerAlias vhosts
- DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
- RewriteEngine Off
- Include conf.d/vhosts-common-ssl.conf
-
-
- ServerName scripts.mit.edu
- ServerAlias scripts scripts-test.mit.edu scripts-test
- DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
- SuExecUserGroup scripts users
- UserDir web_scripts
- RewriteEngine Off
- Include conf.d/vhosts-common-ssl.conf
-
+ Listen 443
+
+ AddType application/x-x509-ca-cert .crt
+ AddType application/x-pkcs7-crl .crl
+
+ SSLPassPhraseDialog builtin
+ SSLSessionCache dbm:/var/run/ssl_scache
+ SSLSessionCacheTimeout 300
+ SSLMutex file:/var/run/ssl_mutex
+ SSLRandomSeed startup builtin
+ SSLRandomSeed connect builtin
+ SSLCertificateFile /etc/pki/tls/certs/cert-new.pem
+ SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
+ SSLCACertificateFile /etc/pki/tls/certs/ca.pem
+ SSLVerifyClient none
+ SSLOptions +StdEnvVars
+ SSLUserName SSL_CLIENT_S_DN_Email
+
+ ServerName scripts-cert.mit.edu
+ ServerAlias scripts-cert
+ DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
+ SuExecUserGroup scripts users
+ UserDir web_scripts
+ Include conf.d/vhosts-common-ssl.conf
+ SSLCertificateFile /etc/pki/tls/certs/scripts-cert-new.pem
+ SSLVerifyClient require
+ SSLVerifyDepth 1
+
+
+ ServerName vhosts.mit.edu
+ ServerAlias vhosts
+ DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
+ Include conf.d/vhosts-common-ssl.conf
+
+
+ ServerName scripts.mit.edu
+ ServerAlias scripts scripts-test.mit.edu scripts-test
+ DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
+ SuExecUserGroup scripts users
+ UserDir web_scripts
+ Include conf.d/vhosts-common-ssl.conf
+