Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Upgraded HAProxy to 2.1.2

Rich Turner58d31920eb8b
diff --git a/proxy/Dockerfile b/proxy/Dockerfile
index 4a6a604d7..20c9fcb10 100644
--- a/proxy/Dockerfile
+++ b/proxy/Dockerfile
@@ -17,9 +17,9 @@ RUN apt-get update \
curl certbot rsyslog cron inotify-tools make gcc g++ libreadline-dev libssl-dev libpcre3-dev libz-dev \
&& rm -rf /var/lib/apt/lists/*
-ARG HA_PROXY_MINOR_VERSION=1.7
-ARG HA_PROXY_VERSION=1.7.9
-ARG LUA_VERSION=5.3.4
+ARG HA_PROXY_MINOR_VERSION=2.1
+ARG HA_PROXY_VERSION=2.1.2
+ARG LUA_VERSION=5.3.5
ARG ACME_PLUGIN_VERSION=0.1.1
ARG DOMAINNAME
ARG LOCAL_CERT_FILE
@@ -39,7 +39,7 @@ RUN mkdir /tmp/lua && cd /tmp/lua \
RUN mkdir /tmp/haproxy && cd /tmp/haproxy \
&& curl -sSL http://www.haproxy.org/download/${HA_PROXY_MINOR_VERSION}/src/haproxy-${HA_PROXY_VERSION}.tar.gz -o haproxy.tar.gz \
&& tar xfv haproxy.tar.gz --strip-components=1 \
- && make TARGET=linux2628 USE_PCRE=1 USE_OPENSSL=1 USE_ZLIB=1 USE_CRYPT_H=1 USE_LIBCRYPT=1 USE_LUA=1 && make install \
+ && make -j $(nproc) TARGET=linux-glibc USE_PCRE=1 USE_OPENSSL=1 USE_ZLIB=1 USE_LUA=1 && make install \
&& cd /tmp && rm -r haproxy
RUN mkdir /etc/haproxy && cd /etc/haproxy \
diff --git a/proxy/haproxy.cfg b/proxy/haproxy.cfg
index a3eff8b6a..4100f6b7b 100644
--- a/proxy/haproxy.cfg
+++ b/proxy/haproxy.cfg
@@ -61,9 +61,9 @@ frontend http
frontend https
bind :443 ssl crt "${CERT_FILE}" no-sslv3 no-tls-tickets no-tlsv10 no-tlsv11
- reqadd X-Forwarded-Proto:\ https
- reqadd X-Forwarded-Port:\ 443
- rspadd Strict-Transport-Security:\ max-age=15768000
+ http-request add-header X-Forwarded-Proto https
+ http-request add-header X-Forwarded-Port %fp
+ http-request add-header Strict-Transport-Security max-age=15768000
use_backend proxy_backend