From dd05da1dbcdec389492d326796747127f5a1e245 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20=C5=9Awi=C4=85tek?= Date: Sun, 26 Feb 2012 21:53:09 +0100 Subject: [PATCH] - 2.4 access control syntax - clear 2.4 TODO --- apache-common.conf | 6 ++---- apache-example.net.conf | 3 +-- apache-manual.conf | 3 +-- apache-mod_authz_host.conf | 4 +--- apache-mod_autoindex.conf | 4 +--- apache-mod_info.conf | 4 +--- apache-mod_proxy.conf | 5 ++--- apache-mod_status.conf | 4 +--- apache-mod_userdir.conf | 6 ++---- apache-multilang-errordoc.conf | 3 +-- apache.spec | 6 ------ 11 files changed, 13 insertions(+), 35 deletions(-) diff --git a/apache-common.conf b/apache-common.conf index 05686e9..8643668 100644 --- a/apache-common.conf +++ b/apache-common.conf @@ -16,8 +16,7 @@ DocumentRoot "/home/services/httpd/html" Options FollowSymLinks AllowOverride None - Order deny,allow - Deny from all + Require all denied @@ -50,8 +49,7 @@ DocumentRoot "/home/services/httpd/html" # Controls who can get stuff from this server. # - Order allow,deny - Allow from all + Require all granted diff --git a/apache-example.net.conf b/apache-example.net.conf index 2d65d7f..90a938b 100644 --- a/apache-example.net.conf +++ b/apache-example.net.conf @@ -18,7 +18,6 @@ # AllowOverride None # Options None # -# Order allow,deny -# Allow from all +# Require all granted # # diff --git a/apache-manual.conf b/apache-manual.conf index a94735d..77edb70 100644 --- a/apache-manual.conf +++ b/apache-manual.conf @@ -12,8 +12,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "/home/services/h Options Indexes AllowOverride None - Order allow,deny - Allow from all + Require all granted SetHandler type-map diff --git a/apache-mod_authz_host.conf b/apache-mod_authz_host.conf index cf9c259..6792035 100644 --- a/apache-mod_authz_host.conf +++ b/apache-mod_authz_host.conf @@ -1,4 +1,3 @@ - LoadModule authz_host_module modules/mod_authz_host.so # The following lines prevent .htaccess and .htpasswd files from being @@ -6,7 +5,6 @@ LoadModule authz_host_module modules/mod_authz_host.so # - Order allow,deny - Deny from all + Require all denied diff --git a/apache-mod_autoindex.conf b/apache-mod_autoindex.conf index a8fb2ed..e23c0a1 100644 --- a/apache-mod_autoindex.conf +++ b/apache-mod_autoindex.conf @@ -1,4 +1,3 @@ - LoadModule autoindex_module modules/mod_autoindex.so # @@ -26,8 +25,7 @@ Alias /icons/ "/home/services/httpd/icons/" Options Indexes MultiViews AllowOverride None - Order allow,deny - Allow from all + Require all granted diff --git a/apache-mod_info.conf b/apache-mod_info.conf index 6ede0b0..0b8bc14 100644 --- a/apache-mod_info.conf +++ b/apache-mod_info.conf @@ -14,9 +14,7 @@ LoadModule info_module modules/mod_info.so # SetHandler server-info - Order deny,allow - Deny from all - Allow from 127.0.0.1 + Require local diff --git a/apache-mod_proxy.conf b/apache-mod_proxy.conf index 8b21e9c..31c7afc 100644 --- a/apache-mod_proxy.conf +++ b/apache-mod_proxy.conf @@ -20,9 +20,8 @@ ProxyRequests On # http://victim:25/ and sending raw data. # - Order deny,allow - Deny from all -# Allow from .your-domain.com + Require all denied +# Require host .your-domain.com # diff --git a/apache-mod_status.conf b/apache-mod_status.conf index 62e9b2a..9851db4 100644 --- a/apache-mod_status.conf +++ b/apache-mod_status.conf @@ -15,9 +15,7 @@ LoadModule status_module modules/mod_status.so SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 + Require local # diff --git a/apache-mod_userdir.conf b/apache-mod_userdir.conf index 9675227..8e8ce28 100644 --- a/apache-mod_userdir.conf +++ b/apache-mod_userdir.conf @@ -21,12 +21,10 @@ UserDir public_html AllowOverride FileInfo AuthConfig Limit Indexes Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec - Order allow,deny - Allow from all + Require all granted - Order deny,allow - Deny from all + Require all denied # # php_admin_value open_basedir "/home/users:/usr/share/pear:/usr/share/php:/tmp" diff --git a/apache-multilang-errordoc.conf b/apache-multilang-errordoc.conf index f865b6f..0cc6af5 100644 --- a/apache-multilang-errordoc.conf +++ b/apache-multilang-errordoc.conf @@ -26,8 +26,7 @@ Alias /error/ "/home/services/httpd/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/apache.spec b/apache.spec index 04e62f6..4203cf2 100644 --- a/apache.spec +++ b/apache.spec @@ -10,12 +10,6 @@ # - mod_auth_digest and mod_auth_basic R: apache(authn) ? # - FYI: http://wiki.apache.org/httpd/InternalDummyConnection - -# 2.4 TODO -# -# add new access control syntax to configs by default (mod_access_compat provides old syntax) - - # Conditional build: %bcond_without ssl # build without SSL support %bcond_without ldap # build without LDAP support -- 2.44.0