diff --git a/apache2-default-server.conf b/apache2-default-server.conf
index 261d5cc..ce1c59d 100644
--- a/apache2-default-server.conf
+++ b/apache2-default-server.conf
@@ -25,8 +25,7 @@ DocumentRoot "/srv/www/htdocs"
# Options FileInfo AuthConfig Limit
AllowOverride None
# Controls who can get stuff from this server.
- Order allow,deny
- Allow from all
+ Require all granted
# Aliases: aliases can be added as needed (with no limit). The format is
@@ -46,8 +45,7 @@ Alias /icons/ "/usr/share/apache2/icons/"
Options Indexes MultiViews
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
# ScriptAlias: This controls which directories contain server scripts.
@@ -65,8 +63,7 @@ ScriptAlias /cgi-bin/ "/srv/www/cgi-bin/"
AllowOverride None
Options +ExecCGI -Includes
- Order allow,deny
- Allow from all
+ Require all granted
# UserDir: The name of the directory that is appended onto a user's home
diff --git a/apache2-default-vhost-ssl.conf b/apache2-default-vhost-ssl.conf
index 214ae8e..26c6f17 100644
--- a/apache2-default-vhost-ssl.conf
+++ b/apache2-default-vhost-ssl.conf
@@ -190,15 +190,18 @@
#AuthUserFile /srv/www/passwd/default
#
- # Controls who can get stuff from this server.
+ # Controls who can get stuff from this server. The example gives access to:
+ # either a valid user, a user on the same system as the server, a system
+ # which name ends with .example.com and of which the reverse lookup of the
+ # IP address matches with the IP address that has been received by looking
+ # up that name in the DNS irrespective of any setting of HostnameLookups.
#
#
- # Require valid-user
- # Order Deny,Allow
- # Deny from All
- # Allow from 127.0.0.1
- # Allow from .example.com
- # Satisfy any
+ #
+ # Require valid-user
+ # Require local
+ # Require host .example.com
+ #
#
diff --git a/apache2-default-vhost.conf b/apache2-default-vhost.conf
index 3e9898b..cdfeb7b 100644
--- a/apache2-default-vhost.conf
+++ b/apache2-default-vhost.conf
@@ -52,8 +52,7 @@
AllowOverride None
Options +ExecCGI -Includes
- Order allow,deny
- Allow from all
+ Require all granted
@@ -109,8 +108,7 @@
#
# Controls who can get stuff from this server.
#
- Order allow,deny
- Allow from all
+ Require all granted
diff --git a/apache2-errors.conf b/apache2-errors.conf
index 56e1764..5967e84 100644
--- a/apache2-errors.conf
+++ b/apache2-errors.conf
@@ -40,8 +40,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
diff --git a/apache2-httpd.conf b/apache2-httpd.conf
index fe1f272..d445209 100644
--- a/apache2-httpd.conf
+++ b/apache2-httpd.conf
@@ -137,7 +137,6 @@ Include /etc/apache2/mod_autoindex-defaults.conf
# associate MIME types with filename extensions
TypesConfig /etc/apache2/mime.types
-DefaultType text/plain
Include /etc/apache2/mod_mime-defaults.conf
# set up (customizable) error responses
@@ -151,16 +150,14 @@ Include /etc/apache2/ssl-global.conf
Options None
AllowOverride None
- Order deny,allow
- Deny from all
+ Require all denied
# use .htaccess files for overriding,
AccessFileName .htaccess
# and never show them
- Order allow,deny
- Deny from all
+ Require all denied
# List of resources to look for when the client requests a directory
diff --git a/apache2-manual.conf b/apache2-manual.conf
index 82ddfc4..4984f54 100644
--- a/apache2-manual.conf
+++ b/apache2-manual.conf
@@ -2,15 +2,14 @@
# This configuration file belongs to the apache2-doc package.
#
# The alias provides the manual, even if you choose to move your DocumentRoot.
-# this out if you do not care for the documentation.
+# Comment this out if you do not care for the documentation.
#
AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "/usr/share/apache2/manual$1"
Options Indexes
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
SetHandler type-map
diff --git a/apache2-mod_info.conf b/apache2-mod_info.conf
index f2f57c1..4c469ec 100644
--- a/apache2-mod_info.conf
+++ b/apache2-mod_info.conf
@@ -7,9 +7,7 @@
SetHandler server-info
- Order deny,allow
- Deny from all
- Allow from localhost
+ Require local
diff --git a/apache2-mod_status.conf b/apache2-mod_status.conf
index 091bc7b..5fd8487 100644
--- a/apache2-mod_status.conf
+++ b/apache2-mod_status.conf
@@ -7,9 +7,7 @@
SetHandler server-status
- Order deny,allow
- Deny from all
- Allow from localhost 127.0.0.1
+ Require local
diff --git a/apache2-mod_userdir.conf b/apache2-mod_userdir.conf
index 0b75bbd..21f8d90 100644
--- a/apache2-mod_userdir.conf
+++ b/apache2-mod_userdir.conf
@@ -31,13 +31,11 @@
Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
- Order allow,deny
- Allow from all
+ Require all granted
- Order deny,allow
- Deny from all
+ Require all denied
diff --git a/apache2-vhost.template b/apache2-vhost.template
index 8d3ed8f..02e2ed8 100644
--- a/apache2-vhost.template
+++ b/apache2-vhost.template
@@ -60,8 +60,7 @@
AllowOverride None
Options +ExecCGI -Includes
- Order allow,deny
- Allow from all
+ Require all granted
@@ -116,8 +115,7 @@
#
# Controls who can get stuff from this server.
#
- Order allow,deny
- Allow from all
+ Require all granted
diff --git a/apache2.changes b/apache2.changes
index 553eb6e..7e3f64e 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 4 20:55:52 UTC 2013 - freek@opensuse.org
+
+- Removed obsolete directive DefaultType
+- Changed all access control to new Require directive
+
-------------------------------------------------------------------
Fri Oct 25 00:05:02 UTC 2013 - crrodriguez@opensuse.org