Ignore:
Timestamp:
Aug 27, 2014, 10:06:17 PM (8 years ago)
Author:
achernya
Message:
Reintegrate fc20-dev into trunk
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

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

    r2458 r2591  
    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
     42# Enable .htaccess files to use the legacy Order By syntax
     43LoadModule access_compat_module modules/mod_access_compat.so
     44
    3745LoadModule auth_basic_module modules/mod_auth_basic.so
    3846LoadModule auth_digest_module modules/mod_auth_digest.so
     47LoadModule authn_core_module modules/mod_authn_core.so
    3948LoadModule authn_file_module modules/mod_authn_file.so
    40 LoadModule authn_alias_module modules/mod_authn_alias.so
    4149LoadModule authn_anon_module modules/mod_authn_anon.so
    4250#LoadModule authn_dbm_module modules/mod_authn_dbm.so
    43 LoadModule authn_default_module modules/mod_authn_default.so
     51LoadModule authz_core_module modules/mod_authz_core.so
    4452LoadModule authz_host_module modules/mod_authz_host.so
    4553LoadModule authz_user_module modules/mod_authz_user.so
     
    4755LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
    4856#LoadModule authz_dbm_module modules/mod_authz_dbm.so
    49 LoadModule authz_default_module modules/mod_authz_default.so
    5057LoadModule ldap_module modules/mod_ldap.so
    5158#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
     
    8693LoadModule cgi_module modules/mod_cgi.so
    8794LoadModule ssl_module modules/mod_ssl.so
     95LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
    8896LoadModule vhost_ldap_module modules/mod_vhost_ldap.so
     97LoadModule unixd_module modules/mod_unixd.so
    8998
    9099User apache
     
    100109    AllowOverride None
    101110    Options FollowSymLinks IncludesNoExec
     111    # The new syntax wasn't added until 2.4,
     112    # so there's simply no way any deployed sites
     113    # are already using the new syntax.
     114    <IfModule include_module>
     115        SSILegacyExprParser on
     116    </IfModule>
    102117</Directory>
    103118
     
    131146
    132147<Files ~ "^\.ht">
    133     Order Allow,Deny
    134     Deny from all
     148    Require all denied
    135149</Files>
    136150
    137151UseCanonicalName Off
    138152TypesConfig /etc/mime.types
    139 DefaultType text/plain
    140153#MIMEMagicFile conf/magic
    141154
     
    154167
    155168<IfModule mod_autoindex.c>
    156     Alias /__scripts/icons /var/www/icons
    157     <Directory /var/www/icons>
     169    Alias /__scripts/icons /usr/share/httpd/icons/
     170    <Directory /usr/share/httpd/icons/>
    158171        Options Indexes
    159172        AllowOverride None
     
    266279RLimitNPROC 4096 4096
    267280
    268 NameVirtualHost *:80
    269 NameVirtualHost *:443
    270 NameVirtualHost *:444
    271 NameVirtualHost 18.181.0.50:80
    272 NameVirtualHost 18.181.0.50:443
    273 NameVirtualHost 18.181.0.50:444
    274 
    275281ServerName localhost
    276282DocumentRoot /afs/athena.mit.edu/contrib/scripts/www
     
    325331    SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000)
    326332    SSLSessionCacheTimeout 28800
    327     SSLMutex default
    328333    SSLRandomSeed startup file:/dev/urandom 256
    329334    SSLRandomSeed connect builtin
    330335    SSLCryptoDevice builtin
    331     SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem
    332     SSLCertificateChainFile /etc/pki/tls/certs/star.scripts.pem
    333     SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    334336    SSLCACertificateFile /etc/pki/tls/certs/ca.pem
    335337    SSLVerifyClient none
    336338    SSLOptions +StdEnvVars
    337339    SSLProtocol all -SSLv2
    338     SSLCipherSuite RC4-SHA:AES128-SHA:ALL:!ADH:!EXP:!LOW:!MD5:!SSLV2:!NULL
     340    SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
    339341    <VirtualHost 18.181.0.50:443 18.181.0.50:444>
    340342        ServerName scripts-cert.mit.edu
     
    343345        Include conf.d/vhosts-common-ssl.conf
    344346        SSLCertificateFile /etc/pki/tls/certs/scripts-cert.pem
    345         SSLCertificateChainFile /etc/pki/tls/certs/scripts-cert.pem
    346347        SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    347348        Include conf.d/vhosts-common-ssl-cert.conf
     
    353354        SSLCertificateFile /etc/pki/tls/certs/scripts.pem
    354355        SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    355         SSLCertificateChainFile /etc/pki/tls/certs/scripts.pem
    356356    </VirtualHost>
    357357    <VirtualHost 18.181.0.43:444>
     
    362362        SSLCertificateFile /etc/pki/tls/certs/scripts.pem
    363363        SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    364         SSLCertificateChainFile /etc/pki/tls/certs/scripts.pem
    365364    </VirtualHost>
    366365    # LDAP vhost, w00t w00t
    367366    <VirtualHost *:443>
    368367        ServerName localhost
     368        SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem
     369        SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    369370        Include conf.d/vhost_ldap.conf
    370371        Include conf.d/vhosts-common-ssl.conf
     
    373374    <VirtualHost *:444>
    374375        ServerName localhost
     376        SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem
     377        SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    375378        Include conf.d/vhost_ldap.conf
    376379        Include conf.d/vhosts-common-ssl.conf
     
    381384<IfModule ssl_module>
    382385    <VirtualHost *:443>
    383         ServerName scripts.scripts.mit.edu
    384         ServerAlias *.scripts.mit.edu *.scripts
    385         SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem
    386         SSLCertificateChainFile /etc/pki/tls/certs/star.scripts.pem
    387         Include conf.d/vhost_ldap.conf
    388         Include conf.d/vhosts-common-ssl.conf
    389     </VirtualHost>
    390     <VirtualHost *:443>
     386        SSLCertificateFile /etc/pki/tls/certs/scripts.pem
     387        SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    391388        Include conf.d/scripts-vhost-names.conf
    392389        Include conf.d/scripts-vhost.conf
     
    394391    </VirtualHost>
    395392    <VirtualHost *:444>
    396         ServerName scripts.scripts.mit.edu
    397         ServerAlias *.scripts.mit.edu *.scripts
    398         SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem
    399         SSLCertificateChainFile /etc/pki/tls/certs/star.scripts.pem
    400         Include conf.d/vhost_ldap.conf
    401         Include conf.d/vhosts-common-ssl.conf
    402         Include conf.d/vhosts-common-ssl-cert.conf
    403     </VirtualHost>
    404     <VirtualHost *:444>
     393        SSLCertificateFile /etc/pki/tls/certs/scripts.pem
     394        SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    405395        Include conf.d/scripts-vhost-names.conf
    406396        Include conf.d/scripts-vhost.conf
Note: See TracChangeset for help on using the changeset viewer.