Changeset 2528 for branches/fc20-dev/server/fedora/config

Timestamp:

May 26, 2014, 4:24:38 PM (11 years ago)

Author:

achernya

Message:

Merge r2523-r2527 from branches/fc19-dev to branches/fc20-dev

Location:

branches/fc20-dev

Files:

• . (modified) (1 prop)
• server/fedora/config/etc/httpd/conf.d/scripts-special.conf (modified) (2 diffs)
• server/fedora/config/etc/httpd/conf/httpd.conf (modified) (7 diffs)

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

@@ -36 +36 @@
 </Location>
 
+<IfModule ssl_module>
 <Location /__scripts/certerror>
     SSLVerifyClient require
@@ -41 +42 @@
     RewriteRule /afs/athena.mit.edu/contrib/scripts/www/certerror /__scripts/unauthorized.html [L]
 </Location>
+</IfModule>

branches/fc20-dev/server/fedora/config/etc/httpd/conf/httpd.conf

@@ -5 +5 @@
 MaxKeepAliveRequests 1000
 KeepAliveTimeout 15
+
+LoadModule mpm_worker_module modules/mod_mpm_worker.so
 
 <IfModule mpm_prefork_module>
@@ -35 +37 @@
 </IfModule>
 
+# This file configures systemd module:
+LoadModule systemd_module modules/mod_systemd.so
+
 LoadModule auth_basic_module modules/mod_auth_basic.so
 LoadModule auth_digest_module modules/mod_auth_digest.so
+LoadModule authn_core_module modules/mod_authn_core.so
 LoadModule authn_file_module modules/mod_authn_file.so
-LoadModule authn_alias_module modules/mod_authn_alias.so
 LoadModule authn_anon_module modules/mod_authn_anon.so
 #LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
+LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule authz_user_module modules/mod_authz_user.so
@@ -47 +52 @@
 LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
 #LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
 LoadModule ldap_module modules/mod_ldap.so
 #LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
@@ -86 +90 @@
 LoadModule cgi_module modules/mod_cgi.so
 LoadModule ssl_module modules/mod_ssl.so
+LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
 LoadModule vhost_ldap_module modules/mod_vhost_ldap.so
+LoadModule unixd_module modules/mod_unixd.so
 
 User apache
@@ -131 +137 @@
 
 <Files ~ "^\.ht">
-    Order Allow,Deny
-    Deny from all
+    Require all denied
 </Files>
 
 UseCanonicalName Off
 TypesConfig /etc/mime.types
-DefaultType text/plain
 #MIMEMagicFile conf/magic
 
@@ -325 +329 @@
     SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000)
     SSLSessionCacheTimeout 28800
-    SSLMutex default
     SSLRandomSeed startup file:/dev/urandom 256
     SSLRandomSeed connect builtin
@@ -336 +339 @@
     SSLOptions +StdEnvVars
     SSLProtocol all -SSLv2
-    SSLCipherSuite RC4-SHA:AES128-SHA:ALL:!ADH:!EXP:!LOW:!MD5:!SSLV2:!NULL
+    SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
     <VirtualHost 18.181.0.50:443 18.181.0.50:444>
         ServerName scripts-cert.mit.edu