Add location_extra webserver option. Fixes #35.

HISTORY.txt

@@ -1,5 +1,8 @@
 1.2.9 (unreleased)
 
+- Add location_extra webserver option. Fixes #35.
+  [smcmahon]
+
 - Always run Ansible version check.
   [djowett]
 

docs/webserver.rst

@@ -102,6 +102,15 @@ Let's take a look at a common use for these options:
 
 This is a *redirect to https* setting.
 
+``location_extra`` may be used to add directives *within* the location block:
+
+.. code-block:: yaml
+
+    - hostname: plone.com
+      protocol: http
+      location_extra: |
+        auth_basic "Private Demo - please enter your credentials";
+        auth_basic_user_file /etc/nginx/htpasswd;
 
 Status and monitoring
 ~~~~~~~~~~~~~~~~~~~~~

roles/nginx/templates/host.j2

@@ -42,8 +42,11 @@ server {
 
 {% if item.get('zodb_path') != None %}
   location / {
-    rewrite ^/(.*)$ /VirtualHostBase/$vh_protocol/$server_name:$vh_port{{ item.zodb_path }}/VirtualHostRoot/$1 break;
     auth_basic off;
+    {% if item.get('location_extra') != None %}
+      {{ item.location_extra }}
+    {% endif %}
+    rewrite ^/(.*)$ /VirtualHostBase/$vh_protocol/$server_name:$vh_port{{ item.zodb_path }}/VirtualHostRoot/$1 break;
     proxy_pass http://localhost:{{ proxycache_port|default('6081') }};
   }
   location ~ /manage_ {

sample-multiserver.yml

@@ -77,5 +77,7 @@ playbook_plones:
     webserver_virtualhosts:
       - hostname: localhost
         zodb_path: /Plone
+        extra: "# test comment here; added via extra"
+        location_extra: "# test comment here; added via location_extra"