Merge lp:~thedac/charms/precise/apache2/trunk into lp:charms/apache2

[David Ames]

Fix missing security.template file

[Robert Ayres (robert-ayres)]

review: Approve

=== added file 'data/security.template'
--- data/security.template	1970-01-01 00:00:00 +0000
+++ data/security.template	2013-02-05 01:12:21 +0000
@@ -0,0 +1,47 @@
+{{ juju_warning_header }}
+#
+# Disable access to the entire file system except for the directories that
+# are explicitly allowed later.
+#
+# This currently breaks the configurations that come with some web application
+# Debian packages.
+
+<Directory />
+       AllowOverride None
+       Order Deny,Allow
+       Deny from all
+</Directory>
+
+
+# Changing the following options will not really affect the security of the
+# server, but might make attacks slightly more difficult in some cases.
+
+#
+# ServerTokens
+# This directive configures what you return as the Server HTTP response
+# Header. The default is 'Full' which sends information about the OS-Type
+# and compiled in modules.
+# Set to one of:  Full | OS | Minimal | Minor | Major | Prod
+# where Full conveys the most information, and Prod the least.
+#
+ServerTokens {{ server_tokens }}
+
+#
+# Optionally add a line containing the server version and virtual host
+# name to server-generated pages (internal error documents, FTP directory
+# listings, mod_status and mod_info output etc., but not CGI generated
+# documents or custom error documents).
+# Set to "EMail" to also include a mailto: link to the ServerAdmin.
+# Set to one of:  On | Off | EMail
+#
+ServerSignature {{ server_signature }}
+
+#
+# Allow TRACE method
+#
+# Set to "extended" to also reflect the request body (only for testing and
+# diagnostic purposes).
+#
+# Set to one of:  On | Off | extended
+#
+TraceEnable {{ trace_enabled }}