[patch] Apache 2.2 to 2.4 migration

apache2.4.1-r2.diff (text/plain), 9.08 KB, created by Martin Cyr on 2012-04-03 19:09:22 UTC

diff --git a/apache2/httpd.conf b/apache2/httpd.conf
index 36ce6c1..e076fc1 100644
--- a/apache2/httpd.conf
+++ b/apache2/httpd.conf
@@ -61,9 +61,11 @@ ServerRoot "/usr/lib64/apache2"
 LoadModule actions_module modules/mod_actions.so
 LoadModule alias_module modules/mod_alias.so
 LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule authn_core_module modules/mod_authn_core.so
 LoadModule authn_anon_module modules/mod_authn_anon.so
 LoadModule authn_dbm_module modules/mod_authn_dbm.so
 LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authz_dbm_module modules/mod_authz_dbm.so
 LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
 LoadModule authz_host_module modules/mod_authz_host.so
@@ -72,16 +74,14 @@ LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule autoindex_module modules/mod_autoindex.so
 <IfDefine CACHE>
 LoadModule cache_module modules/mod_cache.so
+LoadModule file_cache_module modules/mod_file_cache.so
+LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
 </IfDefine>
 LoadModule cgi_module modules/mod_cgi.so
 LoadModule cgid_module modules/mod_cgid.so
 <IfDefine DAV>
 LoadModule dav_module modules/mod_dav.so
-</IfDefine>
-<IfDefine DAV>
 LoadModule dav_fs_module modules/mod_dav_fs.so
-</IfDefine>
-<IfDefine DAV>
 LoadModule dav_lock_module modules/mod_dav_lock.so
 </IfDefine>
 LoadModule deflate_module modules/mod_deflate.so
@@ -89,9 +89,6 @@ LoadModule dir_module modules/mod_dir.so
 LoadModule env_module modules/mod_env.so
 LoadModule expires_module modules/mod_expires.so
 LoadModule ext_filter_module modules/mod_ext_filter.so
-<IfDefine CACHE>
-LoadModule file_cache_module modules/mod_file_cache.so
-</IfDefine>
 LoadModule filter_module modules/mod_filter.so
 LoadModule headers_module modules/mod_headers.so
 LoadModule include_module modules/mod_include.so
@@ -118,6 +115,7 @@ LoadModule userdir_module modules/mod_userdir.so
 </IfDefine>
 LoadModule usertrack_module modules/mod_usertrack.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
+LoadModule unixd_module modules/mod_unixd.so
 
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.
diff --git a/apache2/modules.d/00_default_settings.conf b/apache2/modules.d/00_default_settings.conf
index 0fa43b2..7f6dc4d 100644
--- a/apache2/modules.d/00_default_settings.conf
+++ b/apache2/modules.d/00_default_settings.conf
@@ -107,8 +107,7 @@ LogLevel warn
 <Directory />
 	Options FollowSymLinks
 	AllowOverride None
-	Order deny,allow
-	Deny from all
+    Require all denied
 </Directory>
 
 # DirectoryIndex: sets the file that Apache will serve if a directory
@@ -127,8 +126,8 @@ LogLevel warn
 # The following lines prevent .htaccess and .htpasswd files from being
 # viewed by Web clients.
 <FilesMatch "^\.ht">
-	Order allow,deny
-	Deny from all
+   Require all denied
 </FilesMatch>
 
+Mutex default:/var/run
 # vim: ts=4 filetype=apache
diff --git a/apache2/modules.d/00_error_documents.conf b/apache2/modules.d/00_error_documents.conf
index 815668f..ca42d10 100644
--- a/apache2/modules.d/00_error_documents.conf
+++ b/apache2/modules.d/00_error_documents.conf
@@ -30,8 +30,7 @@ Alias /error/ "/usr/share/apache2/error/"
 	Options IncludesNoExec
 	AddOutputFilter Includes html
 	AddHandler type-map var
-	Order allow,deny
-	Allow from all
+    Require all granted
 	LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
 	ForceLanguagePriority Prefer Fallback
 </Directory>
diff --git a/apache2/modules.d/00_mod_autoindex.conf b/apache2/modules.d/00_mod_autoindex.conf
index ca2a168..4cda174 100644
--- a/apache2/modules.d/00_mod_autoindex.conf
+++ b/apache2/modules.d/00_mod_autoindex.conf
@@ -7,8 +7,7 @@ Alias /icons/ "/usr/share/apache2/icons/"
 <Directory "/usr/share/apache2/icons">
 	Options Indexes MultiViews
 	AllowOverride None
-	Order allow,deny
-	Allow from all
+    Require all granted
 </Directory>
 </IfModule>
 
diff --git a/apache2/modules.d/00_mod_info.conf b/apache2/modules.d/00_mod_info.conf
index 809c223..bc6ad96 100644
--- a/apache2/modules.d/00_mod_info.conf
+++ b/apache2/modules.d/00_mod_info.conf
@@ -3,9 +3,7 @@
 # http://servername/server-info
 <Location /server-info>
 	SetHandler server-info
-	Order deny,allow
-	Deny from all
-	Allow from 127.0.0.1
+    Require ip 127.0.0.1
 </Location>
 </IfDefine>
 
diff --git a/apache2/modules.d/00_mod_mime.conf b/apache2/modules.d/00_mod_mime.conf
index 51f23d5..fb8a9a5 100644
--- a/apache2/modules.d/00_mod_mime.conf
+++ b/apache2/modules.d/00_mod_mime.conf
@@ -1,12 +1,3 @@
-# DefaultType: 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
-
 <IfModule mime_module>
 # TypesConfig points to the file containing the list of mappings from
 # filename extension to MIME-type.
diff --git a/apache2/modules.d/00_mod_status.conf b/apache2/modules.d/00_mod_status.conf
index edd46a4..73e39c8 100644
--- a/apache2/modules.d/00_mod_status.conf
+++ b/apache2/modules.d/00_mod_status.conf
@@ -3,9 +3,7 @@
 # with the URL of http://servername/server-status
 <Location /server-status>
 	SetHandler server-status
-	Order deny,allow
-	Deny from all
-	Allow from 127.0.0.1
+	Require ip 127.0.0.1
 </Location>
 
 # ExtendedStatus controls whether Apache will generate "full" status
diff --git a/apache2/modules.d/00_mod_userdir.conf b/apache2/modules.d/00_mod_userdir.conf
index da7d0fb..a3d47eb 100644
--- a/apache2/modules.d/00_mod_userdir.conf
+++ b/apache2/modules.d/00_mod_userdir.conf
@@ -11,12 +11,10 @@ UserDir public_html
 	AllowOverride FileInfo AuthConfig Limit Indexes
 	Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
 	<Limit GET POST OPTIONS>
-		Order allow,deny
-		Allow from all
+         Require all granted
 	</Limit>
 	<LimitExcept GET POST OPTIONS>
-		Order deny,allow
-		Deny from all
+         Require all denied
 	</LimitExcept>
 </Directory>

diff --git a/apache2/modules.d/40_mod_ssl.conf b/apache2/modules.d/40_mod_ssl.conf
index 3d0a043..53dbf33 100644
--- a/apache2/modules.d/40_mod_ssl.conf
+++ b/apache2/modules.d/40_mod_ssl.conf
@@ -47,17 +47,14 @@ SSLRandomSeed connect builtin
 # stdout.
 SSLPassPhraseDialog  builtin
 
+<IfDefine CACHE>
 ## Inter-Process Session Cache:
 # Configure the SSL Session Cache: First the mechanism  to use and second the
 # expiring timeout (in seconds).
 #SSLSessionCache		dbm:/var/run/ssl_scache
 SSLSessionCache			shmcb:/var/run/ssl_scache(512000)
 SSLSessionCacheTimeout  300
-
-## Semaphore:
-# Configure the path to the mutual exclusion semaphore the SSL engine uses
-# internally for inter-process synchronization.
-SSLMutex  file:/var/run/ssl_mutex
+</IfDefine>
 </IfDefine>
 
 # vim: ts=4 filetype=apache
diff --git a/apache2/modules.d/46_mod_ldap.conf b/apache2/modules.d/46_mod_ldap.conf
index c2893f8..bc23bce 100644
--- a/apache2/modules.d/46_mod_ldap.conf
+++ b/apache2/modules.d/46_mod_ldap.conf
@@ -11,9 +11,7 @@ LDAPOpCacheTTL		600
 
 <Location /ldap-status>
 	SetHandler ldap-status
-	Order deny,allow
-	Deny from all
-	Allow from 127.0.0.1
+	Require ip 127.0.0.1
 </Location>
 </IfDefine>
 
diff --git a/apache2/vhosts.d/00_default_vhost.conf b/apache2/vhosts.d/00_default_vhost.conf
index 9fa425a..370350c 100644
--- a/apache2/vhosts.d/00_default_vhost.conf
+++ b/apache2/vhosts.d/00_default_vhost.conf
@@ -25,9 +25,6 @@
 #Listen 12.34.56.78:80
 Listen 80
 
-# Use name-based virtual hosting.
-NameVirtualHost *:80
-
 # When virtual hosts are enabled, the main host defined in the default
 # httpd.conf configuration will go away. We redefine it here so that it is
 # still available.
diff --git a/apache2/vhosts.d/default_vhost.include b/apache2/vhosts.d/default_vhost.include
index 6d45888..b48d852 100644
--- a/apache2/vhosts.d/default_vhost.include
+++ b/apache2/vhosts.d/default_vhost.include
@@ -31,8 +31,7 @@ DocumentRoot "/var/www/localhost/htdocs"
 	AllowOverride All
 
 	# Controls who can get stuff from this server.
-	Order allow,deny
-	Allow from all
+    Require all granted	
 </Directory>
 
 <IfModule alias_module>
@@ -66,8 +65,7 @@ DocumentRoot "/var/www/localhost/htdocs"
 <Directory "/var/www/localhost/cgi-bin">
 	AllowOverride None
 	Options None
-	Order allow,deny
-	Allow from all
+	Require all granted
 </Directory>
 
 # vim: ts=4 filetype=apache
diff --git a/conf.d/apache2 b/conf.d/apache2
index b7ecb4f..37337df 100644
--- a/conf.d/apache2
+++ b/conf.d/apache2
@@ -33,7 +33,7 @@
 #  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
 #                     when you enable SSL)
 #
-APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D SSL -D SSL_DEFAULT_VHOST -D LANGUAGE"
+APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D SSL -D SSL_DEFAULT_VHOST -D LANGUAGE -D CACHE"
 
 # Extended options for advanced uses of Apache ONLY
 # You don't need to edit these unless you are doing crazy Apache stuff