Skip to content

Commit 9a1b504

Browse files
avoineaavoinea
authored
Merge pull request #14 from billux/master
Exec haproxy-entrypoint.sh if haproxy.cfg file is provided
2 parents 97551a7 + f814113 commit 9a1b504

1 file changed

Lines changed: 58 additions & 60 deletions

File tree

‎haproxy/docker-entrypoint.sh‎

Lines changed: 58 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2,68 +2,66 @@
22

33

44

5-
# haproxy directly configured within /etc/haproxy/haproxy.cfg
6-
if test -e /etc/haproxy/haproxy.cfg; then
7-
exit 0
8-
fi
9-
10-
if [ ! -z "$DNS_ENABLED" ]; then
11-
# Backends are resolved using internal or external DNS service
12-
touch /etc/haproxy/dns.backends
13-
python3 /configure.py dns
14-
echo "*/${DNS_TTL:-1} * * * * /track_dns | logger " > /var/crontab.txt
15-
16-
else
17-
18-
if [ ! -z "$BACKENDS" ]; then
19-
# Backend provided via $BACKENDS env
20-
python3 /configure.py env
21-
else
22-
# Find backend within /etc/hosts
23-
touch /etc/haproxy/hosts.backends
24-
python3 /configure.py hosts
25-
fi
26-
27-
echo "*/${DNS_TTL:-1} * * * * /track_hosts | logger " > /var/crontab.txt
5+
# haproxy not directly configured within /etc/haproxy/haproxy.cfg
6+
if ! test -e /etc/haproxy/haproxy.cfg; then
287

8+
if [ ! -z "$DNS_ENABLED" ]; then
9+
# Backends are resolved using internal or external DNS service
10+
touch /etc/haproxy/dns.backends
11+
python3 /configure.py dns
12+
echo "*/${DNS_TTL:-1} * * * * /track_dns | logger " > /var/crontab.txt
13+
14+
else
15+
16+
if [ ! -z "$BACKENDS" ]; then
17+
# Backend provided via $BACKENDS env
18+
python3 /configure.py env
19+
else
20+
# Find backend within /etc/hosts
21+
touch /etc/haproxy/hosts.backends
22+
python3 /configure.py hosts
23+
fi
24+
25+
echo "*/${DNS_TTL:-1} * * * * /track_hosts | logger " > /var/crontab.txt
26+
27+
fi
28+
29+
#enable cron logging
30+
service rsyslog restart
31+
32+
#add crontab
33+
crontab /var/crontab.txt
34+
chmod 600 /etc/crontab
35+
service cron restart
36+
37+
38+
#Add env variables for haproxy
39+
echo "export PATH=$PATH"':$PATH' >> /etc/environment
40+
if [ ! -z "$BACKENDS" ]; then echo "export BACKENDS=\"$BACKENDS\"" >> /etc/environment; fi
41+
if [ ! -z "$BACKENDS_PORT" ]; then echo "export BACKENDS_PORT=\"$BACKENDS_PORT\"" >> /etc/environment; fi
42+
if [ ! -z "$BACKENDS_MODE" ]; then echo "export BACKENDS_MODE=\"$BACKENDS_MODE\"" >> /etc/environment; fi
43+
if [ ! -z "$BACKEND_NAME" ]; then echo "export BACKEND_NAME=\"$BACKEND_NAME\"" >> /etc/environment; fi
44+
if [ ! -z "$BALANCE" ]; then echo "export BALANCE=\"$BALANCE\"" >> /etc/environment; fi
45+
if [ ! -z "$COOKIES_ENABLED" ]; then echo "export COOKIES_ENABLED=\"$COOKIES_ENABLED\"" >> /etc/environment; fi
46+
if [ ! -z "$DOWN_INTER" ]; then echo "export DOWN_INTER=\"$DOWN_INTER\"" >> /etc/environment; fi
47+
if [ ! -z "$FALL" ]; then echo "export FALL=\"$FALL\"" >> /etc/environment; fi
48+
if [ ! -z "$FAST_INTER" ]; then echo "export FAST_INTER=\"$FAST_INTER\"" >> /etc/environment; fi
49+
if [ ! -z "$FRONTEND_NAME" ]; then echo "export FRONTEND_NAME=\"$FRONTEND_NAME\"" >> /etc/environment; fi
50+
if [ ! -z "$FRONTEND_PORT" ]; then echo "export FRONTEND_PORT=\"$FRONTEND_PORT\"" >> /etc/environment; fi
51+
if [ ! -z "$FRONTEND_MODE" ]; then echo "export FRONTEND_MODE=\"$FRONTEND_MODE\"" >> /etc/environment; fi
52+
if [ ! -z "$HTTPCHK" ]; then echo "export HTTPCHK=\"$HTTPCHK\"" >> /etc/environment; fi
53+
if [ ! -z "$INTER" ]; then echo "export INTER=\"$INTER\"" >> /etc/environment; fi
54+
if [ ! -z "$LOGGING" ]; then echo "export LOGGING=\"$LOGGING\"" >> /etc/environment; fi
55+
if [ ! -z "$LOG_LEVEL" ]; then echo "export LOG_LEVEL=\"$LOG_LEVEL\"" >> /etc/environment; fi
56+
if [ ! -z "$PROXY_PROTOCOL_ENABLED" ]; then echo "export PROXY_PROTOCOL_ENABLED=\"$PROXY_PROTOCOL_ENABLED\"" >> /etc/environment; fi
57+
if [ ! -z "$RISE" ]; then echo "export RISE=\"$RISE\"" >> /etc/environment; fi
58+
if [ ! -z "$SERVICE_NAMES" ]; then echo "export SERVICE_NAMES=\"$SERVICE_NAMES\"" >> /etc/environment; fi
59+
if [ ! -z "$STATS_AUTH" ]; then echo "export STATS_AUTH=\"$STATS_AUTH\"" >> /etc/environment; fi
60+
if [ ! -z "$STATS_PORT" ]; then echo "export STATS_PORT=\"$STATS_PORT\"" >> /etc/environment; fi
61+
if [ ! -z "$TIMEOUT_CLIENT" ]; then echo "export TIMEOUT_CLIENT=\"$TIMEOUT_CLIENT\"" >> /etc/environment; fi
62+
if [ ! -z "$TIMEOUT_CONNECT" ]; then echo "export TIMEOUT_CONNECT=\"$TIMEOUT_CONNECT\"" >> /etc/environment; fi
63+
if [ ! -z "$TIMEOUT_SERVER" ]; then echo "export TIMEOUT_SERVER=\"$TIMEOUT_SERVER\"" >> /etc/environment; fi
2964
fi
3065

31-
#enable cron logging
32-
service rsyslog restart
33-
34-
#add crontab
35-
crontab /var/crontab.txt
36-
chmod 600 /etc/crontab
37-
service cron restart
38-
39-
40-
#Add env variables for haproxy
41-
echo "export PATH=$PATH"':$PATH' >> /etc/environment
42-
if [ ! -z "$BACKENDS" ]; then echo "export BACKENDS=\"$BACKENDS\"" >> /etc/environment; fi
43-
if [ ! -z "$BACKENDS_PORT" ]; then echo "export BACKENDS_PORT=\"$BACKENDS_PORT\"" >> /etc/environment; fi
44-
if [ ! -z "$BACKENDS_MODE" ]; then echo "export BACKENDS_MODE=\"$BACKENDS_MODE\"" >> /etc/environment; fi
45-
if [ ! -z "$BACKEND_NAME" ]; then echo "export BACKEND_NAME=\"$BACKEND_NAME\"" >> /etc/environment; fi
46-
if [ ! -z "$BALANCE" ]; then echo "export BALANCE=\"$BALANCE\"" >> /etc/environment; fi
47-
if [ ! -z "$COOKIES_ENABLED" ]; then echo "export COOKIES_ENABLED=\"$COOKIES_ENABLED\"" >> /etc/environment; fi
48-
if [ ! -z "$DOWN_INTER" ]; then echo "export DOWN_INTER=\"$DOWN_INTER\"" >> /etc/environment; fi
49-
if [ ! -z "$FALL" ]; then echo "export FALL=\"$FALL\"" >> /etc/environment; fi
50-
if [ ! -z "$FAST_INTER" ]; then echo "export FAST_INTER=\"$FAST_INTER\"" >> /etc/environment; fi
51-
if [ ! -z "$FRONTEND_NAME" ]; then echo "export FRONTEND_NAME=\"$FRONTEND_NAME\"" >> /etc/environment; fi
52-
if [ ! -z "$FRONTEND_PORT" ]; then echo "export FRONTEND_PORT=\"$FRONTEND_PORT\"" >> /etc/environment; fi
53-
if [ ! -z "$FRONTEND_MODE" ]; then echo "export FRONTEND_MODE=\"$FRONTEND_MODE\"" >> /etc/environment; fi
54-
if [ ! -z "$HTTPCHK" ]; then echo "export HTTPCHK=\"$HTTPCHK\"" >> /etc/environment; fi
55-
if [ ! -z "$INTER" ]; then echo "export INTER=\"$INTER\"" >> /etc/environment; fi
56-
if [ ! -z "$LOGGING" ]; then echo "export LOGGING=\"$LOGGING\"" >> /etc/environment; fi
57-
if [ ! -z "$LOG_LEVEL" ]; then echo "export LOG_LEVEL=\"$LOG_LEVEL\"" >> /etc/environment; fi
58-
if [ ! -z "$PROXY_PROTOCOL_ENABLED" ]; then echo "export PROXY_PROTOCOL_ENABLED=\"$PROXY_PROTOCOL_ENABLED\"" >> /etc/environment; fi
59-
if [ ! -z "$RISE" ]; then echo "export RISE=\"$RISE\"" >> /etc/environment; fi
60-
if [ ! -z "$SERVICE_NAMES" ]; then echo "export SERVICE_NAMES=\"$SERVICE_NAMES\"" >> /etc/environment; fi
61-
if [ ! -z "$STATS_AUTH" ]; then echo "export STATS_AUTH=\"$STATS_AUTH\"" >> /etc/environment; fi
62-
if [ ! -z "$STATS_PORT" ]; then echo "export STATS_PORT=\"$STATS_PORT\"" >> /etc/environment; fi
63-
if [ ! -z "$TIMEOUT_CLIENT" ]; then echo "export TIMEOUT_CLIENT=\"$TIMEOUT_CLIENT\"" >> /etc/environment; fi
64-
if [ ! -z "$TIMEOUT_CONNECT" ]; then echo "export TIMEOUT_CONNECT=\"$TIMEOUT_CONNECT\"" >> /etc/environment; fi
65-
if [ ! -z "$TIMEOUT_SERVER" ]; then echo "export TIMEOUT_SERVER=\"$TIMEOUT_SERVER\"" >> /etc/environment; fi
66-
67-
6866
exec /haproxy-entrypoint.sh "$@"
6967

0 commit comments

Comments
 (0)