Sisyphus repositório
Última atualização: 21 agosto 2019 | SRPMs: 17343 | Visitas: 14695524
en ru br
ALT Linux repositórios
S:2.4.41-alt1
D:2.2.9-alt11
5.0: 2.2.24-alt2.M50.1
4.1: 2.2.8-alt1
4.0: 2.2.6-alt4
+updates:2.2.6-alt2
3.0: 2.0.55-alt1
+backports:2.0.59-alt0.M30.1

Outros repositórios
Upstream:2.2.8

Group :: Sistema/Servidores
RPM: apache2

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs e FR  Repocop 

Patch: apache2-2.2.9-alt-configs-0.2.patch
Download


 .../extra-available/DirectoryIndex_default.conf.in |   13 ++++
 .../Directory_cgibin_default.conf.in               |   15 +++++
 .../extra-available/Directory_html_default.conf.in |   34 +++++++++++
 .../extra-available/Directory_root_default.conf.in |   11 ++++
 docs/conf/extra-available/dir_default.conf.in      |    7 --
 docs/conf/extra-available/httpd-autoindex.conf.in  |   21 ++-----
 docs/conf/extra-available/httpd-dav.conf.in        |    5 ++
 docs/conf/extra-available/httpd-default.conf.in    |    5 ++
 docs/conf/extra-available/httpd-icons.conf.in      |   24 ++++++++
 docs/conf/extra-available/httpd-info.conf.in       |    5 ++
 docs/conf/extra-available/httpd-languages.conf.in  |    5 ++
 docs/conf/extra-available/httpd-manual.conf.in     |    5 ++
 docs/conf/extra-available/httpd-mime.conf.in       |    5 ++
 .../httpd-multilang-errordoc.conf.in               |    5 ++
 docs/conf/extra-available/httpd-proxy.conf.in      |    5 ++
 .../extra-available/log_config_default.conf.in     |    5 ++
 .../conf/extra-available/mem_cache_default.conf.in |    5 ++
 .../extra-available/mime_magic_default.conf.in     |    5 ++
 docs/conf/extra-available/userdir_default.conf.in  |    5 ++
 docs/conf/ports-available/http.conf.in             |    5 ++
 docs/conf/ports-available/https.conf.in            |    7 ++
 docs/conf/sites-available/default.conf.in          |   59 +++++--------------
 docs/conf/sites-available/default_https.conf.in    |    7 ++
 docs/conf/sites-available/vhosts.conf.in           |    9 ++-
 24 files changed, 204 insertions(+), 68 deletions(-)
diff --git a/docs/conf/extra-available/DirectoryIndex_default.conf.in b/docs/conf/extra-available/DirectoryIndex_default.conf.in
new file mode 100644
index 0000000..448f889
--- /dev/null
+++ b/docs/conf/extra-available/DirectoryIndex_default.conf.in
@@ -0,0 +1,13 @@
+#
+# Summary: DirectoryIndex by default
+# Provides: DirectoryIndex
+# Provides: Extra
+#
+
+<IfModule dir_module>
+	#
+	# DirectoryIndex: sets the file that Apache will serve if a directory
+	# is requested.
+	#
+	DirectoryIndex index.html index.cgi index.pl index.php index.xhtml index.shtml
+</IfModule>
diff --git a/docs/conf/extra-available/Directory_cgibin_default.conf.in b/docs/conf/extra-available/Directory_cgibin_default.conf.in
new file mode 100644
index 0000000..59dc044
--- /dev/null
+++ b/docs/conf/extra-available/Directory_cgibin_default.conf.in
@@ -0,0 +1,15 @@
+#
+# Summary: Default config for CGI directory
+# Provides: Directory
+# Provides: Directory-cgi
+#
+
+#
+# "@exp_cgidir@" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+<IfModule authz_host_module>
+	Order allow,deny
+	Allow from all
+</IfModule>
diff --git a/docs/conf/extra-available/Directory_html_default.conf.in b/docs/conf/extra-available/Directory_html_default.conf.in
new file mode 100644
index 0000000..c635715
--- /dev/null
+++ b/docs/conf/extra-available/Directory_html_default.conf.in
@@ -0,0 +1,34 @@
+#
+# Summary: Default config for html documents
+# Provides: Directory
+# Provides: Directory-html
+#
+
+#
+# Possible values for the Options directive are "None", "All",
+# or any combination of:
+#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+#
+# Note that "MultiViews" must be named *explicitly* --- "Options All"
+# doesn't give it to you.
+#
+# The Options directive is both complicated and important.  Please see
+# http://httpd.apache.org/docs/2.2/mod/core.html#options
+# for more information.
+#
+Options Includes FollowSymLinks MultiViews
+
+#
+# AllowOverride controls what directives may be placed in .htaccess files.
+# It can be "All", "None", or any combination of the keywords:
+#   Options FileInfo AuthConfig Limit
+#
+AllowOverride None
+
+<IfModule authz_host_module>
+	#
+	# Controls who can get stuff from this server.
+	#
+	Order allow,deny
+	Allow from all
+</IfModule>
diff --git a/docs/conf/extra-available/Directory_root_default.conf.in b/docs/conf/extra-available/Directory_root_default.conf.in
new file mode 100644
index 0000000..c9505cd
--- /dev/null
+++ b/docs/conf/extra-available/Directory_root_default.conf.in
@@ -0,0 +1,11 @@
+#
+# Summary: Default config for all dirs
+# Provides: Directory
+# Provides: Directory-root
+#
+Options +FollowSymLinks -Indexes
+AllowOverride None
+<IfModule authz_host_module>
+	Order deny,allow
+	Deny from all
+</IfModule>
diff --git a/docs/conf/extra-available/dir_default.conf.in b/docs/conf/extra-available/dir_default.conf.in
deleted file mode 100644
index a5c7c14..0000000
--- a/docs/conf/extra-available/dir_default.conf.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<IfModule dir_module>
-	#
-	# DirectoryIndex: sets the file that Apache will serve if a directory
-	# is requested.
-	#
-	DirectoryIndex index.html index.cgi index.pl index.php index.xhtml index.shtml
-</IfModule>
diff --git a/docs/conf/extra-available/httpd-autoindex.conf.in b/docs/conf/extra-available/httpd-autoindex.conf.in
index 1f764e4..7dec5f1 100644
--- a/docs/conf/extra-available/httpd-autoindex.conf.in
+++ b/docs/conf/extra-available/httpd-autoindex.conf.in
@@ -1,4 +1,9 @@
 #
+# Summary: Directives controlling the display of server-generated directory listings.
+# Provides: Extra
+#
+
+#
 # Directives controlling the display of server-generated directory listings.
 #
 # Required modules: mod_autoindex, mod_alias
@@ -16,22 +21,6 @@
 	IndexOptions FancyIndexing HTMLTable VersionSort
 
 	<IfModule alias_module>
-		# We include the /icons/ alias for FancyIndexed directory listings.  If
-		# you do not use FancyIndexing, you may comment this out.
-		#
-		Alias /icons/ "@exp_iconsdir@/"
-	</IfModule>
-
-	<Directory "@exp_iconsdir@">
-		Options Indexes MultiViews
-		AllowOverride None
-		<IfModule authz_host_module>
-			Order allow,deny
-			Allow from all
-		</IfModule>
-	</Directory>
-
-	<IfModule alias_module>
 		#
 		# AddIcon* directives tell the server which icon to show for different
 		# files or filename extensions.  These are only displayed for
diff --git a/docs/conf/extra-available/httpd-dav.conf.in b/docs/conf/extra-available/httpd-dav.conf.in
index 254b2cf..4e36ec2 100644
--- a/docs/conf/extra-available/httpd-dav.conf.in
+++ b/docs/conf/extra-available/httpd-dav.conf.in
@@ -1,4 +1,9 @@
 #
+# Summary: Distributed authoring and versioning (WebDAV)
+# Provides: Extra
+#
+
+#
 # Distributed authoring and versioning (WebDAV)
 #
 # Required modules: mod_dav, mod_dav_fs, mod_setenvif, mod_alias
diff --git a/docs/conf/extra-available/httpd-default.conf.in b/docs/conf/extra-available/httpd-default.conf.in
index b2e0e4c..aab527d 100644
--- a/docs/conf/extra-available/httpd-default.conf.in
+++ b/docs/conf/extra-available/httpd-default.conf.in
@@ -1,4 +1,9 @@
 #
+# Summary: This configuration file reflects default settings for Apache HTTP Server.
+# Provides: Extra
+#
+
+#
 # This configuration file reflects default settings for Apache HTTP Server.
 #
 # You may change these, but chances are that you may not need to.
diff --git a/docs/conf/extra-available/httpd-icons.conf.in b/docs/conf/extra-available/httpd-icons.conf.in
new file mode 100644
index 0000000..6bb3f72
--- /dev/null
+++ b/docs/conf/extra-available/httpd-icons.conf.in
@@ -0,0 +1,24 @@
+#
+# Summary: Icons for server-generated directory listings.
+# Provides: Extra
+#
+
+#
+# Required modules: mod_alias
+#
+
+<IfModule alias_module>
+	# We include the /icons/ alias for FancyIndexed directory listings.  If
+	# you do not use FancyIndexing, you may comment this out.
+	#
+	Alias /icons/ "@exp_iconsdir@/"
+</IfModule>
+
+<Directory "@exp_iconsdir@">
+	Options Indexes MultiViews
+	AllowOverride None
+	<IfModule authz_host_module>
+		Order allow,deny
+		Allow from all
+	</IfModule>
+</Directory>
diff --git a/docs/conf/extra-available/httpd-info.conf.in b/docs/conf/extra-available/httpd-info.conf.in
index d8a274c..3b062b8 100644
--- a/docs/conf/extra-available/httpd-info.conf.in
+++ b/docs/conf/extra-available/httpd-info.conf.in
@@ -1,4 +1,9 @@
 #
+# Summary: Get information about the requests being processed by the server and the configuration of the server.
+# Provides: Extra
+#
+
+#
 # Get information about the requests being processed by the server
 # and the configuration of the server.
 #
diff --git a/docs/conf/extra-available/httpd-languages.conf.in b/docs/conf/extra-available/httpd-languages.conf.in
index 64fb5d1..28b4a41 100644
--- a/docs/conf/extra-available/httpd-languages.conf.in
+++ b/docs/conf/extra-available/httpd-languages.conf.in
@@ -1,4 +1,9 @@
 #
+# Summary: Settings for hosting different languages.
+# Provides: Extra
+#
+
+#
 # Settings for hosting different languages.
 #
 # Required modules: mod_mime, mod_negotiation
diff --git a/docs/conf/extra-available/httpd-manual.conf.in b/docs/conf/extra-available/httpd-manual.conf.in
index 31ca501..c12b268 100644
--- a/docs/conf/extra-available/httpd-manual.conf.in
+++ b/docs/conf/extra-available/httpd-manual.conf.in
@@ -1,4 +1,9 @@
 #
+# Summary: Provide access to the documentation on your server
+# Provides: Extra
+#
+
+#
 # Provide access to the documentation on your server as
 #  http://yourserver.example.com/manual/
 # The documentation is always available at
diff --git a/docs/conf/extra-available/httpd-mime.conf.in b/docs/conf/extra-available/httpd-mime.conf.in
index dcf6692..04c565e 100644
--- a/docs/conf/extra-available/httpd-mime.conf.in
+++ b/docs/conf/extra-available/httpd-mime.conf.in
@@ -1,3 +1,8 @@
+#
+# Summary: Configure the list of mappings from filename extension to MIME-type.
+# Provides: Extra
+#
+
 <IfModule mime_module>
 	#
 	# AddType allows you to add to or override the MIME configuration
diff --git a/docs/conf/extra-available/httpd-multilang-errordoc.conf.in b/docs/conf/extra-available/httpd-multilang-errordoc.conf.in
index 21d1b3a..2974e02 100644
--- a/docs/conf/extra-available/httpd-multilang-errordoc.conf.in
+++ b/docs/conf/extra-available/httpd-multilang-errordoc.conf.in
@@ -1,4 +1,9 @@
 #
+# Summary: The configuration below implements multi-language error documents through content-negotiation
+# Provides: Extra
+#
+
+#
 # The configuration below implements multi-language error documents through
 # content-negotiation.
 #
diff --git a/docs/conf/extra-available/httpd-proxy.conf.in b/docs/conf/extra-available/httpd-proxy.conf.in
index bac7477..e81c69e 100644
--- a/docs/conf/extra-available/httpd-proxy.conf.in
+++ b/docs/conf/extra-available/httpd-proxy.conf.in
@@ -1,3 +1,8 @@
+#
+# Summary: proxy_module configure
+# Provides: Extra
+#
+
 <IfModule proxy_module>
 	<Proxy *>
 		AddDefaultCharset off
diff --git a/docs/conf/extra-available/log_config_default.conf.in b/docs/conf/extra-available/log_config_default.conf.in
index e9ec604..41c556e 100644
--- a/docs/conf/extra-available/log_config_default.conf.in
+++ b/docs/conf/extra-available/log_config_default.conf.in
@@ -1,3 +1,8 @@
+#
+# Summary: Loging configure
+# Provides: Extra
+#
+
 <IfModule log_config_module>
 	#
 	# The following directives define some format nicknames for use with
diff --git a/docs/conf/extra-available/mem_cache_default.conf.in b/docs/conf/extra-available/mem_cache_default.conf.in
index ffeb9d7..6c3a849 100644
--- a/docs/conf/extra-available/mem_cache_default.conf.in
+++ b/docs/conf/extra-available/mem_cache_default.conf.in
@@ -1,3 +1,8 @@
+#
+# Summary: Default configs for mem_cache_module
+# Provides: Extra
+#
+
 <IfModule mem_cache_module>
 	CacheEnable mem /
 	MCacheSize 4096
diff --git a/docs/conf/extra-available/mime_magic_default.conf.in b/docs/conf/extra-available/mime_magic_default.conf.in
index 01dcb00..6dac1bc 100644
--- a/docs/conf/extra-available/mime_magic_default.conf.in
+++ b/docs/conf/extra-available/mime_magic_default.conf.in
@@ -1,3 +1,8 @@
+#
+# Summary: Default configs for mime_magic_module
+# Provides: Extra
+#
+
 <IfModule mime_magic_module>
 	#
 	# The mod_mime_magic module allows the server to use various hints from the
diff --git a/docs/conf/extra-available/userdir_default.conf.in b/docs/conf/extra-available/userdir_default.conf.in
index b667d7e..6e8f58e 100644
--- a/docs/conf/extra-available/userdir_default.conf.in
+++ b/docs/conf/extra-available/userdir_default.conf.in
@@ -1,3 +1,8 @@
+#
+# Summary: Settings for user home directories
+# Provides: Extra
+#
+
 # Settings for user home directories
 #
 # Required module: mod_userdir
diff --git a/docs/conf/ports-available/http.conf.in b/docs/conf/ports-available/http.conf.in
index ab5d7af..b91c07e 100644
--- a/docs/conf/ports-available/http.conf.in
+++ b/docs/conf/ports-available/http.conf.in
@@ -1,3 +1,8 @@
+#
+# Summary: Set @@Port@@ port listen
+# Provides: Listen
+# Provides: Listen-default
+#
 
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
diff --git a/docs/conf/ports-available/https.conf.in b/docs/conf/ports-available/https.conf.in
index 5df5993..72fa3e0 100644
--- a/docs/conf/ports-available/https.conf.in
+++ b/docs/conf/ports-available/https.conf.in
@@ -1,3 +1,10 @@
+#
+# Summary: Set 443 port for https listen
+# Provides: Listen
+# Provides: Listen-https
+# Provides: Listen-https-default
+#
+
 <IfModule ssl_module>
 	#
 	# When we also provide SSL we have to listen to the
diff --git a/docs/conf/sites-available/default.conf.in b/docs/conf/sites-available/default.conf.in
index 13a6080..4a70e06 100644
--- a/docs/conf/sites-available/default.conf.in
+++ b/docs/conf/sites-available/default.conf.in
@@ -1,3 +1,10 @@
+#
+# Summary: Main server configuration (for default virtual host)
+# Provides: VirtualHost
+# Provides: VirtualHost-default
+#
+
+#
 # 'Main' server configuration
 #
 # The directives in this section set up the values used by the 'main'
@@ -10,7 +17,6 @@
 # virtual host being defined.
 #
 
-NameVirtualHost *
 <VirtualHost *>
 	#
 	# ServerAdmin: Your address, where problems with the server should be
@@ -44,12 +50,9 @@ NameVirtualHost *
 	# features.
 	#
 	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-		<IfModule authz_host_module>
-			Order deny,allow
-			Deny from all
-		</IfModule>
+		# Summary: Configure for all dirs by default
+		# Requires: Directory-root
+		Include @rel_sysconfdir@/extra-available/Directory_root_default.conf
 	</Directory>
 
 	#
@@ -63,37 +66,9 @@ NameVirtualHost *
 	# This should be changed to whatever you set DocumentRoot to.
 	#
 	<Directory "@exp_htdocsdir@">
-		#
-		# Possible values for the Options directive are "None", "All",
-		# or any combination of:
-		#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-		#
-		# Note that "MultiViews" must be named *explicitly* --- "Options All"
-		# doesn't give it to you.
-		#
-		# The Options directive is both complicated and important.  Please see
-		# http://httpd.apache.org/docs/2.2/mod/core.html#options
-		# for more information.
-		#
-		Options Indexes Includes FollowSymLinks MultiViews
-
-		#
-		# AllowOverride controls what directives may be placed in .htaccess files.
-		# It can be "All", "None", or any combination of the keywords:
-		#   Options FileInfo AuthConfig Limit
-		#
-		AllowOverride None
-
-		DirectoryIndex index
-
-		<IfModule authz_host_module>
-			#
-			# Controls who can get stuff from this server.
-			#
-			Order allow,deny
-			Allow from all
-		</IfModule>
-
+		# Summary: Configure for html documents in DocumentRoot
+		# Requires: Directory-html
+		Include @rel_sysconfdir@/extra-available/Directory_html_default.conf
 	</Directory>
 
 	#
@@ -165,10 +140,8 @@ NameVirtualHost *
 	# CGI directory exists, if you have that configured.
 	#
 	<Directory "@exp_cgidir@">
-		Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		<IfModule authz_host_module>
-			Order allow,deny
-			Allow from all
-		</IfModule>
+		# Summary: Configure for default CGI directory
+		# Requires: Directory-cgi
+		Include @rel_sysconfdir@/extra-available/Directory_cgibin_default.conf
 	</Directory>
 </VirtualHost>
diff --git a/docs/conf/sites-available/default_https.conf.in b/docs/conf/sites-available/default_https.conf.in
index 97af1a9..281b05c 100644
--- a/docs/conf/sites-available/default_https.conf.in
+++ b/docs/conf/sites-available/default_https.conf.in
@@ -1,4 +1,11 @@
 #
+# Summary: Default server configuration for https
+# Provides: VirtualHost
+# Provides: VirtualHost-https
+# Provides: VirtualHost-https-default
+#
+
+#
 # This is the Apache server configuration file providing SSL support.
 # It contains the configuration directives to instruct the server how to
 # serve pages over an https connection. For detailing information about these
diff --git a/docs/conf/sites-available/vhosts.conf.in b/docs/conf/sites-available/vhosts.conf.in
index 345564d..dfbc515 100644
--- a/docs/conf/sites-available/vhosts.conf.in
+++ b/docs/conf/sites-available/vhosts.conf.in
@@ -1,4 +1,9 @@
 #
+# Summary: Use name-based virtual hosting for *:@@Port@@
+# Provides: NameVirtualHost
+#
+
+#
 # Virtual Hosts
 #
 # If you want to maintain multiple domains/hostnames on your
@@ -26,7 +31,7 @@ NameVirtualHost *:@@Port@@
 #
 #<VirtualHost *:@@Port@@>
 #	ServerAdmin webmaster@dummy-host.example.com
-#	DocumentRoot "/www/docs/dummy-host.example.com"
+#	DocumentRoot "@vhosts_dir@/dummy-host.example.com"
 #	ServerName dummy-host.example.com
 #	ServerAlias www.dummy-host.example.com
 #	ErrorLog "@rel_logfiledir@/dummy-host.example.com-error_log"
@@ -35,7 +40,7 @@ NameVirtualHost *:@@Port@@
 #
 #<VirtualHost *:@@Port@@>
 #	ServerAdmin webmaster@dummy-host2.example.com
-#	DocumentRoot "/www/docs/dummy-host2.example.com"
+#	DocumentRoot "@vhosts_dir@/dummy-host.example.com"
 #	ServerName dummy-host2.example.com
 #	ErrorLog "@rel_logfiledir@/dummy-host2.example.com-error_log"
 #	CustomLog "@rel_logfiledir@/dummy-host2.example.com-access_log common"
 
projeto & código: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
mantenedor atual: Michael Shigorin
mantenedor da tradução: Fernando Martini aka fmartini © 2009