.../extra-available/DirectoryIndex_default.conf.in | 6 ++++++ .../extra-available/Directory_html_default.conf.in | 2 +- .../extra-available/Directory_root_default.conf.in | 2 +- 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 | 6 +++++- docs/conf/sites-available/default_https.conf.in | 7 +++++++ docs/conf/sites-available/ports_all.conf.in | 4 ---- docs/conf/sites-available/vhosts.conf.in | 9 +++++++-- 22 files changed, 104 insertions(+), 9 deletions(-) diff --git a/docs/conf/extra-available/DirectoryIndex_default.conf.in b/docs/conf/extra-available/DirectoryIndex_default.conf.in index a5c7c14..448f889 100644 --- a/docs/conf/extra-available/DirectoryIndex_default.conf.in +++ b/docs/conf/extra-available/DirectoryIndex_default.conf.in @@ -1,3 +1,9 @@ +# +# Summary: DirectoryIndex by default +# Provides: DirectoryIndex +# Provides: Extra +# + # # DirectoryIndex: sets the file that Apache will serve if a directory diff --git a/docs/conf/extra-available/Directory_html_default.conf.in b/docs/conf/extra-available/Directory_html_default.conf.in index f722a2d..c1cb65a 100644 --- a/docs/conf/extra-available/Directory_html_default.conf.in +++ b/docs/conf/extra-available/Directory_html_default.conf.in @@ -16,7 +16,7 @@ # http://httpd.apache.org/docs/2.2/mod/core.html#options # for more information. # -Options Indexes Includes FollowSymLinks MultiViews +Options Includes FollowSymLinks MultiViews # # AllowOverride controls what directives may be placed in .htaccess files. diff --git a/docs/conf/extra-available/Directory_root_default.conf.in b/docs/conf/extra-available/Directory_root_default.conf.in index 959cab7..5dcfb4c 100644 --- a/docs/conf/extra-available/Directory_root_default.conf.in +++ b/docs/conf/extra-available/Directory_root_default.conf.in @@ -3,7 +3,7 @@ # Provides: Directory # Provides: Directory-root # -Options FollowSymLinks +Options FollowSymLinks -Indexes AllowOverride None Order deny,allow 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 b8df019..4a70e06 100644 --- a/docs/conf/sites-available/default.conf.in +++ b/docs/conf/sites-available/default.conf.in @@ -1,5 +1,9 @@ # -# Summary: Main server configuration +# Summary: Main server configuration (for default virtual host) +# Provides: VirtualHost +# Provides: VirtualHost-default +# + # # 'Main' server configuration # diff --git a/docs/conf/sites-available/default_https.conf.in b/docs/conf/sites-available/default_https.conf.in index 16b18e7..eb3f708 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/ports_all.conf.in b/docs/conf/sites-available/ports_all.conf.in deleted file mode 100644 index 57c34f3..0000000 --- a/docs/conf/sites-available/ports_all.conf.in +++ /dev/null @@ -1,4 +0,0 @@ -# -# Use name-based virtual hosting. -# -NameVirtualHost * 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@@ # # # 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@@ # # # 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"