ctucx.git: ansible-configs

roles/nginx: more options for vhost

diff --git a/roles/nginx/templates/vhost.conf.j2 b/roles/nginx/templates/vhost.conf.j2
@@ -18,6 +18,14 @@ server {
 	root {{ item.value.root }};
 	{% endif %}	
 
+	{% if item.value.index is defined %}
+	index {{ item.value.index }};
+	{% else %}
+	{% if item.value.enablePhpSupport is true %}
+	index index.php index.html;
+	{% endif %}
+	{% endif %}
+
 	{% if item.value.locations is defined %}
 	{% for location in item.value.locations %}
 	location {{ location.path }} {

@@ -25,13 +33,21 @@ server {
 		proxy_pass {{ location.proxy }};
 		include /etc/nginx/proxy.conf;
 		{% endif %}
+
 		{% if location.root is defined %}
 		root {{ location.root }};
 		{% endif %}
+
 		{% if location.directoryListing is true %}
 		autoindex on;
 		autoindex_exact_size off;
 		{% endif %}
+
+		{% if location.basicAuth is defined %}
+		auth_basic "{{ location.basicAuthReason | default('Authorization required') }}";
+		auth_basic_user_file {{ location.basicAuth }};
+		{% endif %}
+
 		{% if location.extraConfig is defined %}
 		{{ location.extraConfig }}
 		{% endif %}

@@ -73,6 +89,14 @@ server {
 	root {{ item.value.root }};
 	{% endif %}	
 
+	{% if item.value.index is defined %}
+	index {{ item.value.index }};
+	{% else %}
+	{% if item.value.enablePhpSupport is true %}
+	index index.php index.html;
+	{% endif %}
+	{% endif %}
+
 	{% if item.value.locations is defined %}
 	{% for location in item.value.locations %}
 	location {{ location.path }} {

@@ -80,13 +104,21 @@ server {
 		proxy_pass {{ location.proxy }};
 		include /etc/nginx/proxy.conf;
 		{% endif %}
+
 		{% if location.root is defined %}
 		root {{ location.root }};
 		{% endif %}
+
 		{% if location.directoryListing is true %}
 		autoindex on;
 		autoindex_exact_size off;
 		{% endif %}
+
+		{% if location.basicAuth is defined %}
+		auth_basic "{{ location.basicAuthReason | default('Authorization required') }}";
+		auth_basic_user_file {{ location.basicAuth }};
+		{% endif %}
+
 		{% if location.extraConfig is defined %}
 		{{ location.extraConfig }}
 		{% endif %}