Update code with new haproxy locations /usr/local/etc/haproxy/haproxy.cfg

Author: valentinab25

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 2021-03-23 (1.8-1.6)
 
 - Upgrade HAProxy to 1.8.29
+- Fixed code to work with new HAProxy configuration location - /usr/local/etc/haproxy/haproxy.cfg
 - Fix backend port when DNS_ENABLED - refs #24
 
 ## 2019-11-28 (1.8-1.5)

haproxy/Dockerfile

@@ -15,7 +15,10 @@ RUN apt-get update \
  && sed -i '/#$UDPServerRun/c\$UDPServerRun 514'  /etc/rsyslog.conf \
  && sed -i '/$UDPServerRun 514/a $UDPServerAddress 127.0.0.1' /etc/rsyslog.conf \
  && sed -i '/cron.*/a local2.*                          \/proc\/1\/fd\/1' /etc/rsyslog.conf \
- && mv /docker-entrypoint.sh /haproxy-entrypoint.sh
+ && mv /usr/local/bin/docker-entrypoint.sh /usr/local/bin/haproxy-entrypoint.sh 
+
+COPY src/haproxy.cfg /tmp/
+COPY src/configure.py src/track_hosts src/track_dns /
+COPY docker-entrypoint.sh /usr/local/bin/
+
 
-COPY src/haproxy.cfg            /tmp/
-COPY docker-entrypoint.sh src/configure.py src/track_hosts src/track_dns /

haproxy/Readme.md

@@ -98,7 +98,7 @@ all of your backends instead of only the first entry found:
 
 ### Use a custom configuration file mounted as a volume
 
-    $ docker run -v conf.d/haproxy.cfg:/etc/haproxy/haproxy.cfg eeacms/haproxy:latest
+    $ docker run -v conf.d/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg eeacms/haproxy:latest
 
 
 If you edit `haproxy.cfg` you can reload it without having to restart the container:
@@ -111,7 +111,7 @@ If you edit `haproxy.cfg` you can reload it without having to restart the contai
 Additionally, you can supply your own static `haproxy.cfg` file by extending the image
 
     FROM eeacms/haproxy:latest
-    COPY conf.d/haproxy.cfg /etc/haproxy/haproxy.cfg
+    COPY conf.d/haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
 
     RUN apt-get install...
 

haproxy/docker-entrypoint.sh

@@ -2,9 +2,8 @@
 
 
 
-# haproxy not directly configured within /etc/haproxy/haproxy.cfg
-if ! test -e /etc/haproxy/haproxy.cfg; then
-
+# haproxy not directly configured within /usr/local/etc/haproxy/haproxy.cfg
+if ! test -e /usr/local/etc/haproxy/haproxy.cfg; then
     if [ ! -z "$DNS_ENABLED" ]; then
       # Backends are resolved using internal or external DNS service
       touch /etc/haproxy/dns.backends
@@ -65,5 +64,5 @@ service rsyslog restart
 #start crontab
 service cron restart
 
-exec /haproxy-entrypoint.sh "$@"
+exec /usr/local/bin/haproxy-entrypoint.sh "$@"
 

haproxy/src/configure.py

@@ -216,7 +216,7 @@
 else:
     accept_proxy = ""
 
-with open("/etc/haproxy/haproxy.cfg", "w") as configuration:
+with open("/usr/local/etc/haproxy/haproxy.cfg", "w") as configuration:
     with open("/tmp/haproxy.cfg", "r") as default:
         conf = Template(default.read())
         conf = conf.substitute(