Merge branch 'master' of ssh://git-ssh.notandy.de:2222/ansible/roles/nginx

tasks/main.yml

@@ -86,15 +86,6 @@
 - name: delete nginx default config
   file: path=/etc/nginx/sites-enabled/default state=absent
 
-- name: copy monitoring config
-  copy:
-    src: monitoring.cfg
-    dest: /etc/check_mk/nginx_status.cfg
-    owner: root
-    group: root
-    mode: 0644
-  when: nginx.monitoring
-
 - name: copy nginx status config
   copy:
     src: monitoring

templates/vhost.conf.j2

@@ -32,12 +32,17 @@ server {
 		proxy_pass {{ vhost.backend }};
 
 		# add proxy headers
-		proxy_set_header  Host			{% if 'host' in vhost %}"{{ vhost.host }}"{% else %}$host{% endif %};
+		proxy_set_header Host			{% if 'host' in vhost %}"{{ vhost.host }}"{% else %}$host{% endif %};
-		proxy_set_header  X-Real-IP		$remote_addr;
+		proxy_set_header X-Real-IP		$remote_addr;
-		proxy_set_header  X-Forwarded-For	$proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-For	$proxy_add_x_forwarded_for;
-		proxy_set_header  X-Forwarded-Proto	$scheme;
+		proxy_set_header X-Forwarded-Proto	$scheme;
-		proxy_set_header  X-Forwarded-Ssl	$https;
+		proxy_set_header X-Forwarded-Ssl	$https;
-		proxy_set_header  X-Url-Scheme		$scheme;
+		proxy_set_header X-Url-Scheme		$scheme;
+
+		# custom proxy headers
+{% for header in vhost.add_proxy_headers|d({}) if header %}
+		proxy_set_header {{ header }}		"{{ vhost.add_proxy_headers[header] }}";
+{% endfor %}
 
 		# Websockets
 		proxy_http_version 1.1;