Configure Nginx, minor changes

Author: Federico Ceratto

ansible/deploy-haproxy.yml

@@ -1,4 +1,5 @@
 ---
+# See roles/haproxy/README.adoc
 - hosts: have_haproxy
   roles:
     - role: haproxy

ansible/deploy-prio.yml

@@ -1,4 +1,5 @@
 ---
+# See roles/haproxy/README.adoc
 - hosts: have_prio
   tasks:
     - name: Add bintray pull-request repository

ansible/roles/haproxy/README.adoc

@@ -0,0 +1,12 @@
+
+HAproxy used for Orchestra / Prio
+
+The [] box is the PS host
+probe --> [ nginx:443 --test-list--> haproxy:9972 --> orchestra ]
+          [                                ⤷      --> prio      ]
+
+Currently used only for /api/v1/test-list/urls
+Monitor with:
+ssh <probe service> -L 9972:127.0.0.1:9972
+browse http://localhost:9972/haproxy?stats
+

ansible/roles/haproxy/templates/haproxy.cfg.j2

@@ -55,7 +55,7 @@ frontend frontend_test_list_urls_forwarding
   bind    127.0.0.1:9972
   #http-response set-header Strict-Transport-Security max-age=63072000
   stats refresh 5s
-  stats uri /haproxy?stats
+  stats uri /haproxy_stats
   default_backend test_list_urls
 
 backend test_list_urls

ansible/roles/probe-services/tasks/main.yml

@@ -8,6 +8,7 @@
   - "blackhole_gateway is defined"
 
 - name: probe-services nginx config
+  tags: probe-service-nginx-conf
   template: src=probe-services-nginx dest=/etc/nginx/sites-enabled/probe-services
   notify: reload nginx
 

ansible/roles/probe-services/templates/probe-services-nginx

@@ -91,6 +91,21 @@ server {
         proxy_pass http://{{ registry_ipv4 }}:{{ registry_port }};
     }
 
+    # Prio / Orchestrate URL test list
+    # Forwarded to Haproxy on localhost - see roles/haproxy/README.adoc
+    # Should match:
+    # - /api/v1/test-list/urls
+    location /api/v1/test-list/urls {
+        proxy_http_version 1.1;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_read_timeout 900;
+
+        proxy_pass http://127.0.0.1:9972;
+    }
+
     # Orchestrate
     # Should match:
     # - /api/v1/test-list
@@ -104,6 +119,7 @@ server {
 
         proxy_pass http://{{ orchestrate_ipv4 }}:{{ orchestrate_port }};
     }
+
     # - /api/v1/admin/jobs
     location ~^/api/v1/admin/(jobs|job) {
         proxy_http_version 1.1;
@@ -141,5 +157,19 @@ server {
         return 200 "{{ probe_services_domain }}";
     }
 
+    # Haproxy on localhost dashboard - see roles/haproxy/README.adoc
+    # - /haproxy_stats
+    location /haproxy_stats {
+        proxy_http_version 1.1;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_read_timeout 900;
+
+        proxy_pass http://127.0.0.1:9972;
+    }
+
+
     {{ c.location_letsencrypt() }}
 }