Fix some typos that led to incorrect generation of backend code (#17)

* [configure.py] Fix BACKENDS_MODE typo, not reading the correct env var.

* [docker-entrypoint] Only enable /track_hosts cron when BACKENDS env var is not present.

Otherwise /track_hosts cron script will overwrite and mess up our backends

* [backends] Only add http check option when backend is of type http, otherwise will break tcp.

Author: vulturm

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2019-11-15 (1.8-1.4)
+
+- Fix BACKENDS_MODE typo, not reading the correct env var.
+- Only enable /track_hosts cron when BACKENDS env var is not present. Otherwise /track_hosts cron script will overwrite and mess up our backends
+- Only add http check option when backend is of type http, otherwise will break tcp backends.
+
 ## 2018-11-21 (1.8-1.3)
 
 - Upgrade to haproxy 1.8.14

haproxy/docker-entrypoint.sh

@@ -20,10 +20,9 @@ if ! test -e /etc/haproxy/haproxy.cfg; then
         # Find backend within /etc/hosts
         touch /etc/haproxy/hosts.backends
         python3 /configure.py hosts
+        echo "*/${DNS_TTL:-1} * * * * /track_hosts  | logger " > /var/crontab.txt
       fi
 
-      echo "*/${DNS_TTL:-1} * * * * /track_hosts  | logger " > /var/crontab.txt
-    
     fi
 
     #add crontab

haproxy/src/configure.py

@@ -20,7 +20,7 @@
 STATS_AUTH = os.environ.get('STATS_AUTH', 'admin:admin')
 BACKENDS = os.environ.get('BACKENDS', '').split(' ')
 BACKENDS_PORT = os.environ.get('BACKENDS_PORT', '80')
-BACKENDS_MODE = os.environ.get('BACKEND_MODE', 'http')
+BACKENDS_MODE = os.environ.get('BACKENDS_MODE', 'http')
 LOGGING = os.environ.get('LOGGING', '127.0.0.1')
 LOG_LEVEL = os.environ.get('LOG_LEVEL', 'notice')
 TIMEOUT_CONNECT = os.environ.get('TIMEOUT_CONNECT', '5000')
@@ -59,10 +59,6 @@
   backend $backend
     mode $mode
     balance $balance
-    option forwardfor
-    http-request set-header X-Forwarded-Port %[dst_port]
-    http-request add-header X-Forwarded-Proto https if { ssl_fc }
-    option httpchk $httpchk HTTP/1.1\\r\\nHost:localhost
     default-server inter $inter fastinter $fastinter downinter $downinter fall $fall rise $rise
     cookie SRV_ID insert
 """)
@@ -75,14 +71,18 @@
   backend $backend
     mode $mode
     balance $balance
+    default-server inter $inter fastinter $fastinter downinter $downinter fall $fall rise $rise
+    cookie SRV_ID prefix
+""")
+    cookies = ""
+
+
+backend_type_http = Template("""
     option forwardfor
     http-request set-header X-Forwarded-Port %[dst_port]
     http-request add-header X-Forwarded-Proto https if { ssl_fc }
     option httpchk $httpchk HTTP/1.1\\r\\nHost:localhost
-    default-server inter $inter fastinter $fastinter downinter $downinter fall $fall rise $rise
-    cookie SRV_ID prefix
 """)
-    cookies = ""
 
 backend_conf_plus = Template("""
     server $name-$index $host:$port $cookies check
@@ -97,14 +97,17 @@
     backend=BACKEND_NAME,
     mode=BACKENDS_MODE,
     balance=BALANCE,
-    httpchk=HTTPCHK,
     inter=INTER,
     fastinter=FAST_INTER,
     downinter=DOWN_INTER,
     fall=FALL,
     rise=RISE
 )
 
+if BACKENDS_MODE == 'http':
+    backend_conf += backend_type_http.substitute(
+        httpchk=HTTPCHK
+    )
 
 ################################################################################
 # Backends are resolved using internal or external DNS service