.../extra-available/DirectoryIndex_default.conf.in | 13 ++++ .../Directory_cgibin_default.conf.in | 15 +++++ .../extra-available/Directory_html_default.conf.in | 36 ++++++++++++ .../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 | 5 ++ docs/conf/extra-available/httpd-dav.conf.in | 5 ++ docs/conf/extra-available/httpd-default.conf.in | 5 ++ 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 | 5 ++ 23 files changed, 180 insertions(+), 50 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 +# + + + # + # 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 + 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..06f2d30 --- /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 + + Order allow,deny + Allow from all + 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..f722a2d --- /dev/null +++ b/docs/conf/extra-available/Directory_html_default.conf.in @@ -0,0 +1,36 @@ +# +# 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 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 + + + # + # Controls who can get stuff from this server. + # + Order allow,deny + Allow from all + 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..959cab7 --- /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 +AllowOverride None + + Order deny,allow + Deny from all + 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 @@ - - # - # 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 - diff --git a/docs/conf/extra-available/httpd-autoindex.conf.in b/docs/conf/extra-available/httpd-autoindex.conf.in index 1f764e4..3e48dd5 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 diff --git a/docs/conf/extra-available/httpd-dav.conf.in b/docs/conf/extra-available/httpd-dav.conf.in index 8ed8af5..a308a69 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-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 399451f..80a5b84 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 10cd6c2..38629ab 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 +# + # # 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 +# + 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 +# + # # 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 +# + 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 +# + # # 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 99779e4..9d4f99f 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 +# + # # 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 * # # ServerAdmin: Your address, where problems with the server should be @@ -44,12 +50,9 @@ NameVirtualHost * # features. # - Options FollowSymLinks - AllowOverride None - - Order deny,allow - Deny from all - + # Summary: Configure for all dirs by default + # Requires: Directory-root + Include @rel_sysconfdir@/extra-available/Directory_root_default.conf # @@ -63,37 +66,9 @@ NameVirtualHost * # This should be changed to whatever you set DocumentRoot to. # - # - # 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 - - - # - # Controls who can get stuff from this server. - # - Order allow,deny - Allow from all - - + # Summary: Configure for html documents in DocumentRoot + # Requires: Directory-html + Include @rel_sysconfdir@/extra-available/Directory_html_default.conf # @@ -165,10 +140,8 @@ NameVirtualHost * # CGI directory exists, if you have that configured. # - Options ExecCGI -MultiViews +SymLinksIfOwnerMatch - - Order allow,deny - Allow from all - + # Summary: Configure for default CGI directory + # Requires: Directory-cgi + Include @rel_sysconfdir@/extra-available/Directory_cgibin_default.conf diff --git a/docs/conf/sites-available/default_https.conf.in b/docs/conf/sites-available/default_https.conf.in index ef1c8a3..465079b 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..fb472df 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