.../extra-available/DirectoryIndex_default.conf.in | 7 +++
.../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/sites-available/default.conf.in | 55 ++++---------------
docs/conf/sites-available/ports_all.conf.in | 4 ++
7 files changed, 85 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..a5c7c14
--- /dev/null
+++ b/docs/conf/extra-available/DirectoryIndex_default.conf.in
@@ -0,0 +1,7 @@
+
+ #
+ # 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/sites-available/default.conf.in b/docs/conf/sites-available/default.conf.in
index 13a6080..b8df019 100644
--- a/docs/conf/sites-available/default.conf.in
+++ b/docs/conf/sites-available/default.conf.in
@@ -1,3 +1,6 @@
+#
+# Summary: Main server configuration
+#
# 'Main' server configuration
#
# The directives in this section set up the values used by the 'main'
@@ -10,7 +13,6 @@
# virtual host being defined.
#
-NameVirtualHost *
#
# ServerAdmin: Your address, where problems with the server should be
@@ -44,12 +46,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 +62,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 +136,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/ports_all.conf.in b/docs/conf/sites-available/ports_all.conf.in
new file mode 100644
index 0000000..57c34f3
--- /dev/null
+++ b/docs/conf/sites-available/ports_all.conf.in
@@ -0,0 +1,4 @@
+#
+# Use name-based virtual hosting.
+#
+NameVirtualHost *