Added apache__redirect_to_https variable

Currently, each vhost can define "redirect_to_https".  If True, which is
the current default, then the Apache configuration will include a
Redirect line.

This is good, except that VirtualHost rules seem to have precedence over
other rules.  That is annoying when you want to define a global rule to
serve, say, ACME requests, because Apache would respect the VirtualHost
rules and redirect the plain HTTP request instead of serving the token.
To help debops users to not having to touch each and every defined
vhost, the new variable defines the default value for redirect_to_https,
which used to be "True".  The default is still "True", but now you can
override that easily.

Author: muelli

defaults/main.yml

@@ -362,7 +362,15 @@ apache__combined_snippets: '{{ apache__dependent_snippets
 apache__https_enabled: '{{ ansible_local|d() and ansible_local.pki|d() and
                            (ansible_local.pki.enabled|d() | bool) and
                            apache__https_listen|length > 0 }}'
+                                                                   # ]]]
+
 
+# .. envvar:: apache__redirect_to_https [[[
+#
+# Each vhost can define a boolean ``redirect_to_https``.
+# If not set, it defaults to the value defined in ``apache__redirect_to_https``.
+# Defaults to ``True``.
+apache__redirect_to_https: True
                                                                    # ]]]
 # PKI [[[
 # ~~~~~~~

docs/defaults-detailed.rst

@@ -315,7 +315,7 @@ Refer to the `Apache Redirect directive documentation`_ for details.
   HTTPS, by default 301 Moved Permanently.
 
 ``redirect_to_https``
-  Optional, boolean. Defaults to ``True``
+  Optional, boolean. Defaults to ``apache__redirect_to_https``
   If ``True``, redirect connection from HTTP to the HTTPS version of the site.
   Set to ``False`` to allow to serve the website via HTTP and HTTPS and don't
   redirect HTTP to HTTPS.

templates/etc/apache2/sites-available/default.conf.j2

@@ -12,7 +12,8 @@
 
 {% if item.redirect_http|d() %}
     {{ apache__tpl_macros.get_redirect( item.redirect_http_code|d(307), "/", item.redirect_http) | indent(4) }}
-{% elif item.redirect_to_https|d(True) | bool %}
+{% elif item.redirect_to_https|default(apache__redirect_to_https) | bool %}
+    # Item's redirect: {{ item.redirect_to_https | default() }}   default: {{ apache__redirect_to_https }}
     Redirect {{ item.redirect_to_https_with_code|d("301") }} "/" "https://{{ (debops__tpl_macros.get_yaml_list_for_elem(item.name) | from_yaml)[0] }}/"
 {% else %}
     {{ apache__tpl_macros.get_content_directives(item) | indent(4) }}