Commit b94aa21e authored by Leigh B Stoller's avatar Leigh B Stoller

Changes for apache24 upgrade.

parent a4636949
......@@ -96,7 +96,9 @@ KeepAliveTimeout 15
##
## Server-Pool Size Regulation (MPM specific)
##
##
LoadModule mpm_prefork_module libexec/apache24/mod_mpm_prefork.so
# prefork MPM
# StartServers: number of server processes to start
......@@ -134,68 +136,71 @@ MaxRequestsPerChild 0
# to be loaded here.
#
# Example:
# LoadModule foo_module libexec/apache22/mod_foo.so
#
#LoadModule auth_basic_module libexec/apache22/mod_auth_basic.so
#LoadModule auth_digest_module libexec/apache22/mod_auth_digest.so
#LoadModule authn_file_module libexec/apache22/mod_authn_file.so
#LoadModule authn_alias_module libexec/apache22/mod_authn_alias.so
#LoadModule authn_anon_module libexec/apache22/mod_authn_anon.so
#LoadModule authn_dbm_module libexec/apache22/mod_authn_dbm.so
#LoadModule authn_default_module libexec/apache22/mod_authn_default.so
LoadModule authz_host_module libexec/apache22/mod_authz_host.so
#LoadModule authz_user_module libexec/apache22/mod_authz_user.so
#LoadModule authz_owner_module libexec/apache22/mod_authz_owner.so
LoadModule authz_groupfile_module libexec/apache22/mod_authz_groupfile.so
#LoadModule authz_dbm_module libexec/apache22/mod_authz_dbm.so
LoadModule authz_default_module libexec/apache22/mod_authz_default.so
#LoadModule ldap_module libexec/apache22/mod_ldap.so
#LoadModule authnz_ldap_module libexec/apache22/mod_authnz_ldap.so
LoadModule include_module libexec/apache22/mod_include.so
LoadModule log_config_module libexec/apache22/mod_log_config.so
LoadModule logio_module libexec/apache22/mod_logio.so
LoadModule env_module libexec/apache22/mod_env.so
#LoadModule ext_filter_module libexec/apache22/mod_ext_filter.so
#LoadModule mime_magic_module libexec/apache22/mod_mime_magic.so
LoadModule expires_module libexec/apache22/mod_expires.so
LoadModule deflate_module libexec/apache22/mod_deflate.so
LoadModule headers_module libexec/apache22/mod_headers.so
#LoadModule usertrack_module libexec/apache22/mod_usertrack.so
LoadModule setenvif_module libexec/apache22/mod_setenvif.so
LoadModule mime_module libexec/apache22/mod_mime.so
#LoadModule dav_module libexec/apache22/mod_dav.so
#LoadModule status_module libexec/apache22/mod_status.so
#LoadModule autoindex_module libexec/apache22/mod_autoindex.so
LoadModule info_module libexec/apache22/mod_info.so
#LoadModule dav_fs_module libexec/apache22/mod_dav_fs.so
LoadModule vhost_alias_module libexec/apache22/mod_vhost_alias.so
LoadModule negotiation_module libexec/apache22/mod_negotiation.so
LoadModule dir_module libexec/apache22/mod_dir.so
LoadModule actions_module libexec/apache22/mod_actions.so
#LoadModule speling_module libexec/apache22/mod_speling.so
#LoadModule userdir_module libexec/apache22/mod_userdir.so
LoadModule alias_module libexec/apache22/mod_alias.so
LoadModule rewrite_module libexec/apache22/mod_rewrite.so
#LoadModule proxy_module libexec/apache22/mod_proxy.so
#LoadModule proxy_balancer_module libexec/apache22/mod_proxy_balancer.so
#LoadModule proxy_ftp_module libexec/apache22/mod_proxy_ftp.so
#LoadModule proxy_http_module libexec/apache22/mod_proxy_http.so
#LoadModule proxy_connect_module libexec/apache22/mod_proxy_connect.so
LoadModule cache_module libexec/apache22/mod_cache.so
LoadModule suexec_module libexec/apache22/mod_suexec.so
LoadModule disk_cache_module libexec/apache22/mod_disk_cache.so
#LoadModule file_cache_module libexec/apache22/mod_file_cache.so
#LoadModule mem_cache_module libexec/apache22/mod_mem_cache.so
LoadModule cgi_module libexec/apache22/mod_cgi.so
# LoadModule foo_module libexec/apache24/mod_foo.so
#
#LoadModule auth_basic_module libexec/apache24/mod_auth_basic.so
#LoadModule auth_digest_module libexec/apache24/mod_auth_digest.so
#LoadModule authn_file_module libexec/apache24/mod_authn_file.so
#LoadModule authn_alias_module libexec/apache24/mod_authn_alias.so
#LoadModule authn_anon_module libexec/apache24/mod_authn_anon.so
#LoadModule authn_dbm_module libexec/apache24/mod_authn_dbm.so
#LoadModule authn_default_module libexec/apache24/mod_authn_default.so
LoadModule authn_core_module libexec/apache24/mod_authn_core.so
LoadModule authz_host_module libexec/apache24/mod_authz_host.so
#LoadModule authz_user_module libexec/apache24/mod_authz_user.so
#LoadModule authz_owner_module libexec/apache24/mod_authz_owner.so
LoadModule authz_groupfile_module libexec/apache24/mod_authz_groupfile.so
#LoadModule authz_dbm_module libexec/apache24/mod_authz_dbm.so
#LoadModule authz_default_module libexec/apache24/mod_authz_default.so
#LoadModule ldap_module libexec/apache24/mod_ldap.so
#LoadModule authnz_ldap_module libexec/apache24/mod_authnz_ldap.so
LoadModule include_module libexec/apache24/mod_include.so
LoadModule log_config_module libexec/apache24/mod_log_config.so
LoadModule logio_module libexec/apache24/mod_logio.so
LoadModule env_module libexec/apache24/mod_env.so
#LoadModule ext_filter_module libexec/apache24/mod_ext_filter.so
#LoadModule mime_magic_module libexec/apache24/mod_mime_magic.so
LoadModule expires_module libexec/apache24/mod_expires.so
LoadModule deflate_module libexec/apache24/mod_deflate.so
LoadModule headers_module libexec/apache24/mod_headers.so
#LoadModule usertrack_module libexec/apache24/mod_usertrack.so
LoadModule setenvif_module libexec/apache24/mod_setenvif.so
LoadModule mime_module libexec/apache24/mod_mime.so
#LoadModule dav_module libexec/apache24/mod_dav.so
#LoadModule status_module libexec/apache24/mod_status.so
#LoadModule autoindex_module libexec/apache24/mod_autoindex.so
LoadModule info_module libexec/apache24/mod_info.so
#LoadModule dav_fs_module libexec/apache24/mod_dav_fs.so
LoadModule vhost_alias_module libexec/apache24/mod_vhost_alias.so
LoadModule negotiation_module libexec/apache24/mod_negotiation.so
LoadModule dir_module libexec/apache24/mod_dir.so
LoadModule actions_module libexec/apache24/mod_actions.so
#LoadModule speling_module libexec/apache24/mod_speling.so
#LoadModule userdir_module libexec/apache24/mod_userdir.so
LoadModule alias_module libexec/apache24/mod_alias.so
LoadModule rewrite_module libexec/apache24/mod_rewrite.so
#LoadModule proxy_module libexec/apache24/mod_proxy.so
#LoadModule proxy_balancer_module libexec/apache24/mod_proxy_balancer.so
#LoadModule proxy_ftp_module libexec/apache24/mod_proxy_ftp.so
#LoadModule proxy_http_module libexec/apache24/mod_proxy_http.so
#LoadModule proxy_connect_module libexec/apache24/mod_proxy_connect.so
LoadModule cache_module libexec/apache24/mod_cache.so
LoadModule suexec_module libexec/apache24/mod_suexec.so
#LoadModule disk_cache_module libexec/apache24/mod_disk_cache.so
#LoadModule file_cache_module libexec/apache24/mod_file_cache.so
#LoadModule mem_cache_module libexec/apache24/mod_mem_cache.so
LoadModule cgi_module libexec/apache24/mod_cgi.so
# For shmcb below.
LoadModule socache_shmcb_module libexec/apache24/mod_socache_shmcb.so
<IfDefine PGENI>
LoadModule wsgi_module libexec/apache22/mod_wsgi.so
LoadModule wsgi_module libexec/apache24/mod_wsgi.so
</IfDefine>
#
# The following modules are not loaded by default:
# Need this for backwards compat with allow/deny syntax.
#
#LoadModule cern_meta_module libexec/apache22/mod_cern_meta.so
#LoadModule asis_module libexec/apache22/mod_asis.so
LoadModule access_compat_module libexec/apache24/mod_access_compat.so
#
# Load config files from the config directory "/etc/httpd/conf.d".
......@@ -210,7 +215,7 @@ LoadModule wsgi_module libexec/apache22/mod_wsgi.so
# PHP is an HTML-embedded scripting language which attempts to make it
# easy for developers to write dynamically generated webpages.
#
#LoadModule php5_module libexec/apache22/libphp5.so
#LoadModule php5_module libexec/apache24/libphp5.so
#
# Cause the PHP interpreter to handle files with a .php extension.
......@@ -250,6 +255,8 @@ LoadModule wsgi_module libexec/apache22/mod_wsgi.so
# when the value of (unsigned)Group is above 60000;
# don't use Group #-1 on these systems!
#
LoadModule unixd_module libexec/apache24/mod_unixd.so
User nobody
Group nobody
......@@ -436,18 +443,7 @@ AccessFileName .htaccess
# TypesConfig describes where the mime.types file (or equivalent) is
# to be found.
#
TypesConfig /usr/local/etc/apache22/mime.types
#
# DefaultType is the default MIME type the server will use for a document
# if it cannot otherwise determine one, such as from filename extensions.
# If your server contains mostly text or HTML documents, "text/plain" is
# a good value. If most of your content is binary, such as applications
# or images, you may want to use "application/octet-stream" instead to
# keep browsers from trying to display binary files as though they are
# text.
#
DefaultType text/plain
TypesConfig /usr/local/etc/apache24/mime.types
#
# HostnameLookups: Log the names of clients or just their IP addresses
......@@ -552,9 +548,9 @@ ServerSignature On
# We include the /icons/ alias for FancyIndexed directory listings. If you
# do not use FancyIndexing, you may comment this out.
#
Alias /icons/ "/usr/local/www/apache22/icons/"
Alias /icons/ "/usr/local/www/apache24/icons/"
<Directory "/usr/local/www/apache22/icons">
<Directory "/usr/local/www/apache24/icons">
Options Indexes MultiViews FollowSymLinks
AllowOverride None
Order allow,deny
......@@ -569,13 +565,13 @@ Alias /icons/ "/usr/local/www/apache22/icons/"
# The same rules about trailing "/" apply to ScriptAlias directives as to
# Alias.
#
ScriptAlias /cgi-bin/ "/usr/local/www/apache22/cgi-bin/"
ScriptAlias /cgi-bin/ "/usr/local/www/apache24/cgi-bin/"
#
# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
#
<Directory "/usr/local/www/apache22/cgi-bin">
<Directory "/usr/local/www/apache24/cgi-bin">
AllowOverride None
Options None
Order deny,allow
......@@ -622,7 +618,7 @@ AddHandler cgi-script .cgi
# consult the online docs. You have been warned.
#
LoadModule ssl_module libexec/apache22/mod_ssl.so
LoadModule ssl_module libexec/apache24/mod_ssl.so
##
## SSL Global Context
......@@ -653,7 +649,7 @@ SSLSessionCacheTimeout 300
# Semaphore:
# Configure the path to the mutual exclusion semaphore the
# SSL engine uses internally for inter-process synchronization.
SSLMutex default
Mutex default
# Pseudo Random Number Generator (PRNG):
# Configure one or more sources to seed the PRNG of the
......@@ -803,7 +799,7 @@ SSLVerifyDepth 10
<Files ~ "\.(cgi|shtml|phtml|php3?)$">
SSLOptions +StdEnvVars
</Files>
<Directory "/usr/local/www/apache22/cgi-bin">
<Directory "/usr/local/www/apache24/cgi-bin">
SSLOptions +StdEnvVars
</Directory>
......@@ -854,7 +850,7 @@ SSLRequire ( %{SSL_CLIENT_S_DN_OU} ne "sslxmlrpc" )
ScriptAlias /protogeni/xmlrpc @prefix@/protogeni/xmlrpc/protogeni-wrapper.pl
<IfDefine PGENI_FCGID>
LoadModule fcgid_module libexec/apache22/mod_fcgid.so
LoadModule fcgid_module libexec/apache24/mod_fcgid.so
FcgidBusyTimeout 1000
FcgidIOTimeout 1000
FcgidMaxRequestLen 524288
......@@ -866,7 +862,7 @@ FcgidMaxProcessesPerClass 50
SetHandler fcgid-script
Options +ExecCGI
SSLRequireSSL
SSLOptions +StdEnvVars +ExportCertData
SSLOptions +StdEnvVars +ExportCertData +LegacyDNStringFormat
Order deny,allow
allow from all
</LocationMatch>
......@@ -881,7 +877,7 @@ FcgidMaxProcessesPerClass 50
SSLRequireSSL
Order deny,allow
allow from all
SSLOptions +StdEnvVars +ExportCertData
SSLOptions +StdEnvVars +ExportCertData +LegacyDNStringFormat
Options +ExecCGI +FollowSymLinks
SetHandler cgi-script
SetEnv USER "nobody"
......@@ -1000,7 +996,7 @@ SSLVerifyClient none
<Files ~ "\.(cgi|shtml|phtml|php3?)$">
SSLOptions +StdEnvVars
</Files>
<Directory "/usr/local/www/apache22/cgi-bin">
<Directory "/usr/local/www/apache24/cgi-bin">
SSLOptions +StdEnvVars
</Directory>
......@@ -1052,7 +1048,7 @@ ScriptAlias /protogeni/gtw/pubxmlrpc @prefix@/devel/gtw/protogeni/pubxmlrpc/pubg
SSLRequireSSL
Order deny,allow
allow from all
SSLOptions +StdEnvVars
SSLOptions +StdEnvVars +LegacyDNStringFormat
Options +ExecCGI +FollowSymLinks
SetHandler cgi-script
SetEnv USER "nobody"
......
......@@ -96,7 +96,9 @@ KeepAliveTimeout 15
##
## Server-Pool Size Regulation (MPM specific)
##
##
LoadModule mpm_prefork_module libexec/apache24/mod_mpm_prefork.so
# prefork MPM
# StartServers: number of server processes to start
......@@ -135,65 +137,66 @@ Listen 80
# to be loaded here.
#
# Example:
# LoadModule foo_module libexec/apache22/mod_foo.so
#
LoadModule auth_basic_module libexec/apache22/mod_auth_basic.so
LoadModule auth_digest_module libexec/apache22/mod_auth_digest.so
LoadModule authn_file_module libexec/apache22/mod_authn_file.so
LoadModule authn_alias_module libexec/apache22/mod_authn_alias.so
LoadModule authn_anon_module libexec/apache22/mod_authn_anon.so
LoadModule authn_dbm_module libexec/apache22/mod_authn_dbm.so
LoadModule authn_default_module libexec/apache22/mod_authn_default.so
LoadModule authz_host_module libexec/apache22/mod_authz_host.so
LoadModule authz_user_module libexec/apache22/mod_authz_user.so
LoadModule authz_owner_module libexec/apache22/mod_authz_owner.so
LoadModule authz_groupfile_module libexec/apache22/mod_authz_groupfile.so
LoadModule authz_dbm_module libexec/apache22/mod_authz_dbm.so
LoadModule authz_default_module libexec/apache22/mod_authz_default.so
#LoadModule ldap_module libexec/apache22/mod_ldap.so
#LoadModule authnz_ldap_module libexec/apache22/mod_authnz_ldap.so
LoadModule include_module libexec/apache22/mod_include.so
LoadModule log_config_module libexec/apache22/mod_log_config.so
LoadModule logio_module libexec/apache22/mod_logio.so
LoadModule env_module libexec/apache22/mod_env.so
#LoadModule ext_filter_module libexec/apache22/mod_ext_filter.so
LoadModule mime_magic_module libexec/apache22/mod_mime_magic.so
LoadModule expires_module libexec/apache22/mod_expires.so
LoadModule deflate_module libexec/apache22/mod_deflate.so
LoadModule headers_module libexec/apache22/mod_headers.so
LoadModule usertrack_module libexec/apache22/mod_usertrack.so
LoadModule setenvif_module libexec/apache22/mod_setenvif.so
LoadModule mime_module libexec/apache22/mod_mime.so
LoadModule dav_module libexec/apache22/mod_dav.so
LoadModule status_module libexec/apache22/mod_status.so
LoadModule autoindex_module libexec/apache22/mod_autoindex.so
LoadModule info_module libexec/apache22/mod_info.so
LoadModule dav_fs_module libexec/apache22/mod_dav_fs.so
LoadModule vhost_alias_module libexec/apache22/mod_vhost_alias.so
LoadModule negotiation_module libexec/apache22/mod_negotiation.so
LoadModule dir_module libexec/apache22/mod_dir.so
LoadModule actions_module libexec/apache22/mod_actions.so
LoadModule speling_module libexec/apache22/mod_speling.so
LoadModule userdir_module libexec/apache22/mod_userdir.so
LoadModule alias_module libexec/apache22/mod_alias.so
LoadModule rewrite_module libexec/apache22/mod_rewrite.so
#LoadModule proxy_module libexec/apache22/mod_proxy.so
#LoadModule proxy_balancer_module libexec/apache22/mod_proxy_balancer.so
#LoadModule proxy_ftp_module libexec/apache22/mod_proxy_ftp.so
#LoadModule proxy_http_module libexec/apache22/mod_proxy_http.so
#LoadModule proxy_connect_module libexec/apache22/mod_proxy_connect.so
LoadModule cache_module libexec/apache22/mod_cache.so
LoadModule suexec_module libexec/apache22/mod_suexec.so
LoadModule disk_cache_module libexec/apache22/mod_disk_cache.so
#LoadModule file_cache_module libexec/apache22/mod_file_cache.so
#LoadModule mem_cache_module libexec/apache22/mod_mem_cache.so
LoadModule cgi_module libexec/apache22/mod_cgi.so
#
# The following modules are not loaded by default:
#
#LoadModule cern_meta_module libexec/apache22/mod_cern_meta.so
#LoadModule asis_module libexec/apache22/mod_asis.so
# LoadModule foo_module libexec/apache24/mod_foo.so
#
LoadModule auth_basic_module libexec/apache24/mod_auth_basic.so
LoadModule auth_digest_module libexec/apache24/mod_auth_digest.so
LoadModule authn_file_module libexec/apache24/mod_authn_file.so
LoadModule authn_core_module libexec/apache24/mod_authn_core.so
LoadModule authn_anon_module libexec/apache24/mod_authn_anon.so
LoadModule authn_dbm_module libexec/apache24/mod_authn_dbm.so
#LoadModule authn_default_module libexec/apache24/mod_authn_default.so
LoadModule authz_host_module libexec/apache24/mod_authz_host.so
LoadModule authz_user_module libexec/apache24/mod_authz_user.so
LoadModule authz_owner_module libexec/apache24/mod_authz_owner.so
LoadModule authz_groupfile_module libexec/apache24/mod_authz_groupfile.so
LoadModule authz_dbm_module libexec/apache24/mod_authz_dbm.so
#LoadModule authz_default_module libexec/apache24/mod_authz_default.so
#LoadModule ldap_module libexec/apache24/mod_ldap.so
#LoadModule authnz_ldap_module libexec/apache24/mod_authnz_ldap.so
LoadModule include_module libexec/apache24/mod_include.so
LoadModule log_config_module libexec/apache24/mod_log_config.so
LoadModule logio_module libexec/apache24/mod_logio.so
LoadModule env_module libexec/apache24/mod_env.so
#LoadModule ext_filter_module libexec/apache24/mod_ext_filter.so
LoadModule mime_magic_module libexec/apache24/mod_mime_magic.so
LoadModule expires_module libexec/apache24/mod_expires.so
LoadModule deflate_module libexec/apache24/mod_deflate.so
LoadModule headers_module libexec/apache24/mod_headers.so
LoadModule usertrack_module libexec/apache24/mod_usertrack.so
LoadModule setenvif_module libexec/apache24/mod_setenvif.so
LoadModule mime_module libexec/apache24/mod_mime.so
LoadModule dav_module libexec/apache24/mod_dav.so
LoadModule status_module libexec/apache24/mod_status.so
LoadModule autoindex_module libexec/apache24/mod_autoindex.so
LoadModule info_module libexec/apache24/mod_info.so
LoadModule dav_fs_module libexec/apache24/mod_dav_fs.so
LoadModule vhost_alias_module libexec/apache24/mod_vhost_alias.so
LoadModule negotiation_module libexec/apache24/mod_negotiation.so
LoadModule dir_module libexec/apache24/mod_dir.so
LoadModule actions_module libexec/apache24/mod_actions.so
LoadModule speling_module libexec/apache24/mod_speling.so
LoadModule userdir_module libexec/apache24/mod_userdir.so
LoadModule alias_module libexec/apache24/mod_alias.so
LoadModule rewrite_module libexec/apache24/mod_rewrite.so
#LoadModule proxy_module libexec/apache24/mod_proxy.so
#LoadModule proxy_balancer_module libexec/apache24/mod_proxy_balancer.so
#LoadModule proxy_ftp_module libexec/apache24/mod_proxy_ftp.so
#LoadModule proxy_http_module libexec/apache24/mod_proxy_http.so
#LoadModule proxy_connect_module libexec/apache24/mod_proxy_connect.so
LoadModule cache_module libexec/apache24/mod_cache.so
LoadModule suexec_module libexec/apache24/mod_suexec.so
#LoadModule disk_cache_module libexec/apache24/mod_disk_cache.so
#LoadModule file_cache_module libexec/apache24/mod_file_cache.so
#LoadModule mem_cache_module libexec/apache24/mod_mem_cache.so
LoadModule cgi_module libexec/apache24/mod_cgi.so
# For shmcb below.
LoadModule socache_shmcb_module libexec/apache24/mod_socache_shmcb.so
#
# Need this for backwards compat with allow/deny syntax.
#
LoadModule access_compat_module libexec/apache24/mod_access_compat.so
#
# Load config files from the config directory "/etc/httpd/conf.d".
......@@ -208,7 +211,7 @@ LoadModule cgi_module libexec/apache22/mod_cgi.so
# PHP is an HTML-embedded scripting language which attempts to make it
# easy for developers to write dynamically generated webpages.
#
LoadModule php5_module libexec/apache22/libphp5.so
LoadModule php5_module libexec/apache24/libphp5.so
#
# Cause the PHP interpreter to handle files with a .php extension.
......@@ -248,6 +251,8 @@ AddType application/x-httpd-php-source .phps .php3s
# when the value of (unsigned)Group is above 60000;
# don't use Group #-1 on these systems!
#
LoadModule unixd_module libexec/apache24/mod_unixd.so
User nobody
Group nobody
......@@ -498,18 +503,7 @@ AccessFileName .htaccess
# TypesConfig describes where the mime.types file (or equivalent) is
# to be found.
#
TypesConfig /usr/local/etc/apache22/mime.types
#
# DefaultType is the default MIME type the server will use for a document
# if it cannot otherwise determine one, such as from filename extensions.
# If your server contains mostly text or HTML documents, "text/plain" is
# a good value. If most of your content is binary, such as applications
# or images, you may want to use "application/octet-stream" instead to
# keep browsers from trying to display binary files as though they are
# text.
#
DefaultType text/plain
TypesConfig /usr/local/etc/apache24/mime.types
#
# The mod_mime_magic module allows the server to use various hints from the
......@@ -518,7 +512,7 @@ DefaultType text/plain
#
<IfModule mod_mime_magic.c>
# MIMEMagicFile /usr/share/magic.mime
MIMEMagicFile /usr/local/etc/apache22/magic
MIMEMagicFile /usr/local/etc/apache24/magic
</IfModule>
#
......@@ -624,9 +618,9 @@ ServerSignature On
# We include the /icons/ alias for FancyIndexed directory listings. If you
# do not use FancyIndexing, you may comment this out.
#
Alias /icons/ "/usr/local/www/apache22/icons/"
Alias /icons/ "/usr/local/www/apache24/icons/"
<Directory "/usr/local/www/apache22/icons">
<Directory "/usr/local/www/apache24/icons">
Options Indexes MultiViews FollowSymLinks
AllowOverride None
Order allow,deny
......@@ -649,13 +643,13 @@ Alias /icons/ "/usr/local/www/apache22/icons/"
# The same rules about trailing "/" apply to ScriptAlias directives as to
# Alias.
#
ScriptAlias /cgi-bin/ "/usr/local/www/apache22/cgi-bin/"
ScriptAlias /cgi-bin/ "/usr/local/www/apache24/cgi-bin/"
#
# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
#
<Directory "/usr/local/www/apache22/cgi-bin">
<Directory "/usr/local/www/apache24/cgi-bin">
AllowOverride None
Options None
Order deny,allow
......@@ -999,7 +993,7 @@ BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
# consult the online docs. You have been warned.
#
LoadModule ssl_module libexec/apache22/mod_ssl.so
LoadModule ssl_module libexec/apache24/mod_ssl.so
#
# When we also provide SSL we have to listen to the
......@@ -1036,7 +1030,7 @@ SSLSessionCacheTimeout 300
# Semaphore:
# Configure the path to the mutual exclusion semaphore the
# SSL engine uses internally for inter-process synchronization.
SSLMutex default
Mutex default
# Pseudo Random Number Generator (PRNG):
# Configure one or more sources to seed the PRNG of the
......@@ -1122,7 +1116,7 @@ SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:!RC4:!MD5:!AECDH:+HIGH:+MEDIUM:!LOW
# pass phrase. Note that a kill -HUP will prompt again. A new
# certificate can be generated using the genkey(1) command.
#SSLCertificateFile /etc/pki/tls/certs/localhost.crt
SSLCertificateFile /usr/local/etc/apache22/ssl.crt/www.@OURDOMAIN@.crt
SSLCertificateFile /usr/local/etc/apache24/ssl.crt/www.@OURDOMAIN@.crt
# Server Private Key:
# If the key is not combined with the certificate, use this
......@@ -1130,7 +1124,7 @@ SSLCertificateFile /usr/local/etc/apache22/ssl.crt/www.@OURDOMAIN@.crt
# you've both a RSA and a DSA private key you can configure
# both in parallel (to also allow the use of DSA ciphers, etc.)
#SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
SSLCertificateKeyFile /usr/local/etc/apache22/ssl.key/www.@OURDOMAIN@.key
SSLCertificateKeyFile /usr/local/etc/apache24/ssl.key/www.@OURDOMAIN@.key
# Server Certificate Chain:
# Point SSLCertificateChainFile at a file containing the
......@@ -1201,7 +1195,7 @@ SSLCACertificateFile @prefix@/etc/emulab.pem
<Files ~ "\.(cgi|shtml|phtml|php3?)$">
SSLOptions +StdEnvVars
</Files>
<Directory "/usr/local/www/apache22/cgi-bin">
<Directory "/usr/local/www/apache24/cgi-bin">
SSLOptions +StdEnvVars
</Directory>
......
......@@ -20,6 +20,9 @@ sub Install($$$)
return 0;
}
my $apache = ("$APACHE_VERSION" eq "22" ? "apache22" :
"$APACHE_VERSION" eq "24" ? "apache24" : "");
Phase "rc.conf", "Adding testbed content to $RCCONF", sub {
DoneIfEdited($RCCONF);
my @strings = (qq|rpcbind_enable="YES"|,
......@@ -28,12 +31,13 @@ sub Install($$$)
qq|inetd_flags="-wW -R 0"|,
qq|syslogd_flags=""|,
qq|tftpd_flags="-lvvvv -C 40 -s /tftpboot"|,
(("$APACHE_VERSION" eq "22") ?
(qq|apache22_enable="YES"|,
qq|apache22_flags="-DSSL"|,
qq|apache22_profiles="www"|,
"apache22_www_configfile=\"${HTTPD_CONF}\"",
qq|apache22_www_enable="YES"|) :
(("$APACHE_VERSION" eq "22" ||
"$APACHE_VERSION" eq "24") ?
("${apache}_enable=\"YES\"",
"${apache}_flags=\"-DSSL\"",
"${apache}_profiles=\"www\"",
"${apache}_www_configfile=\"${HTTPD_CONF}\"",
"${apache}_www_enable=\"YES\"") :
(qq|apache_enable="YES"|,
qq|apache_flags="-DSSL"|)),
qq|pubsubd_flags="-T 10"|);
......
#!/usr/bin/perl -w
#
# Copyright (c) 2008-2017 University of Utah and the Flux Group.
# Copyright (c) 2008-2018 University of Utah and the Flux Group.
#
# {{{GENIPUBLIC-LICENSE
#
......@@ -97,7 +97,8 @@ my $FETCH = "/usr/bin/fetch";
my $OPENSSL = "/usr/bin/openssl";
my $FIXROOTCERT = "$TB/sbin/fixrootcert";
my $MYSAURN = "urn:publicid:IDN+@OURDOMAIN@+authority+sa";
my $APACHEPREFIX = ("@APACHE_VERSION@" == "22" ? "apache22" : "apache");
my $APACHEPREFIX = ("@APACHE_VERSION@" == "22" ? "apache22" :
"@APACHE_VERSION@" == "24" ? "apache24" : "apache");
my $APACHE_START = "@APACHE_START_COMMAND@";
# un-taint path
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment