Changeset 2528


Ignore:
Timestamp:
May 26, 2014, 4:24:38 PM (10 years ago)
Author:
achernya
Message:
Merge r2523-r2527 from branches/fc19-dev to branches/fc20-dev
Location:
branches/fc20-dev
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/fc20-dev

  • branches/fc20-dev/locker

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc20-dev/server/fedora/config/etc/httpd/conf.d/scripts-special.conf

    r2257 r2528  
    3636</Location>
    3737
     38<IfModule ssl_module>
    3839<Location /__scripts/certerror>
    3940    SSLVerifyClient require
     
    4142    RewriteRule /afs/athena.mit.edu/contrib/scripts/www/certerror /__scripts/unauthorized.html [L]
    4243</Location>
     44</IfModule>
  • branches/fc20-dev/server/fedora/config/etc/httpd/conf/httpd.conf

    r2487 r2528  
    55MaxKeepAliveRequests 1000
    66KeepAliveTimeout 15
     7
     8LoadModule mpm_worker_module modules/mod_mpm_worker.so
    79
    810<IfModule mpm_prefork_module>
     
    3537</IfModule>
    3638
     39# This file configures systemd module:
     40LoadModule systemd_module modules/mod_systemd.so
     41
    3742LoadModule auth_basic_module modules/mod_auth_basic.so
    3843LoadModule auth_digest_module modules/mod_auth_digest.so
     44LoadModule authn_core_module modules/mod_authn_core.so
    3945LoadModule authn_file_module modules/mod_authn_file.so
    40 LoadModule authn_alias_module modules/mod_authn_alias.so
    4146LoadModule authn_anon_module modules/mod_authn_anon.so
    4247#LoadModule authn_dbm_module modules/mod_authn_dbm.so
    43 LoadModule authn_default_module modules/mod_authn_default.so
     48LoadModule authz_core_module modules/mod_authz_core.so
    4449LoadModule authz_host_module modules/mod_authz_host.so
    4550LoadModule authz_user_module modules/mod_authz_user.so
     
    4752LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
    4853#LoadModule authz_dbm_module modules/mod_authz_dbm.so
    49 LoadModule authz_default_module modules/mod_authz_default.so
    5054LoadModule ldap_module modules/mod_ldap.so
    5155#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
     
    8690LoadModule cgi_module modules/mod_cgi.so
    8791LoadModule ssl_module modules/mod_ssl.so
     92LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
    8893LoadModule vhost_ldap_module modules/mod_vhost_ldap.so
     94LoadModule unixd_module modules/mod_unixd.so
    8995
    9096User apache
     
    131137
    132138<Files ~ "^\.ht">
    133     Order Allow,Deny
    134     Deny from all
     139    Require all denied
    135140</Files>
    136141
    137142UseCanonicalName Off
    138143TypesConfig /etc/mime.types
    139 DefaultType text/plain
    140144#MIMEMagicFile conf/magic
    141145
     
    325329    SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000)
    326330    SSLSessionCacheTimeout 28800
    327     SSLMutex default
    328331    SSLRandomSeed startup file:/dev/urandom 256
    329332    SSLRandomSeed connect builtin
     
    336339    SSLOptions +StdEnvVars
    337340    SSLProtocol all -SSLv2
    338     SSLCipherSuite RC4-SHA:AES128-SHA:ALL:!ADH:!EXP:!LOW:!MD5:!SSLV2:!NULL
     341    SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
    339342    <VirtualHost 18.181.0.50:443 18.181.0.50:444>
    340343        ServerName scripts-cert.mit.edu
Note: See TracChangeset for help on using the changeset viewer.