Merge branch 'dev3' of https://scm.uninett.no/geant-wp8-t3.1/soctools into dev3

roles/haproxy/templates/haproxy.cfg.j2

@@ -27,7 +27,7 @@ listen nifiserv
 	balance source
 	option tcpka
 {% for nifihost in groups['nificontainers'] %}
-	server {{nifihost}} {{nifihost}}:9443 check
+	server {{nifihost}} {{nifihost}}:9443 ssl check verify none
 {% endfor %}
 
 listen odfeserv
@@ -92,9 +92,9 @@ listen nifiservhttp{{port}}
         balance source
         option tcpka
 {% for nifihost in groups['nificontainers'] %}
-        server {{nifihost}} {{nifihost}}:77{{port}} check
-
+        server {{nifihost}} {{nifihost}}:{{port}} check
 {% endfor %}
+
 {% endfor %}
 
 
@@ -109,7 +109,7 @@ listen nifiservtcp{{port}}
         option tcp-check
         tcp-check connect port {{port}}
 {% for nifihost in groups['nificontainers'] %}
-        server {{nifihost}} {{nifihost}}:77{{port}} check
-
+        server {{nifihost}} {{nifihost}}:{{port}} check
 {% endfor %}
+
 {% endfor %}