cadc-haproxy-dev: change conf to config for consistency

Author: pdowler

cadc-haproxy-dev/Dockerfile

@@ -1,6 +1,6 @@
 FROM centos:7
 
-RUN yum -y update && yum install -y haproxy && yum install -y rsyslog && yum clean all
+RUN yum -y update && yum install -y haproxy rsyslog && yum clean all
 ENV OPENSSL_ALLOW_PROXY_CERTS=1
 
 # set up the configuration for rsyslog. haproxy requires it for logging

cadc-haproxy-dev/README.md

@@ -5,10 +5,10 @@ This is a basic haproxy image that can be used as a front end to a container. It
 hence the choices of components and configuration. Mounting the container /conf directory to the local host is
 required for configuring the server certificate but it also allows a
 number of features to be customized:
-    1. /conf/server-cert.pem is the server certificate (required)
-    2. /conf/cacerts is a directory containing CA certificates that should be added to the CA bundle if not part of
+    1. /config/server-cert.pem is the server certificate (required)
+    2. /config/cacerts is a directory containing CA certificates that should be added to the CA bundle if not part of
     the default bundle (optional)
-    3. /conf/haproxy.cfg overrides the default haproxy configuration (optional)
+    3. /config/haproxy.cfg overrides the default haproxy configuration (optional)
 
 The default haproxy container is linked with the backend container at startup and uses the Docker internal networking.
 Therefore, no ports need to be exposed on the backend container.
@@ -19,13 +19,21 @@ container /logs directory.
 Note: This container cannot handle multiple backend containers/services.
 
 ## building it
+```
 docker build -t cadc-haproxy-dev -f Dockerfile .
+```
 
 ## checking it
+```
 docker run --rm -it cadc-haproxy-dev:latest /bin/bash
+```
 
 ## running it with another container as back end: "backend-container-name"
-docker run --rm -v <path-to-external-logs>:/logs:rw <path-to-server-cert>:/conf:ro -p 443:443 --link <backend-container-name>:cadc-service --name haproxy cadc-haproxy-dev:latest
+```
+docker run --rm --volume=<path-to-external-logs>:/logs:rw --volume=<path-to-server-cert>:/config:ro -p 443:443 --name haproxy cadc-haproxy-dev:latest
+```
+Other options like `--link <backend-container-name>:cadc-service` could be used with the default haproxy.cfg to
+have haproxy forward requests to a single back end container (e.g. for testing).
 
 ## test some functionality with the configuration in /test that uses httpbin.org as a backend
 curl -E <user-cert> https://<host>/headers

cadc-haproxy-dev/src/entrypoint

@@ -6,7 +6,7 @@ trap "echo 'ERROR running/starting haproxy'; exit -1" ERR
 # log to external
 LOGDIR=/logs
 LOG=$LOGDIR/haproxy.log
-CONFDIR=/conf
+CONFDIR=/config
 
 touch $LOG
 
@@ -32,7 +32,7 @@ fi
 
 if [ -e $CONFDIR/haproxy.cfg ]; then
     cp $CONFDIR/haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
-    echo "Using custom haproxy.conf found in $CONFDIR" >> $LOG
+    echo "Using custom haproxy.cfg found in $CONFDIR" >> $LOG
 fi
 
 update-ca-trust

cadc-haproxy-dev/src/haproxy/haproxy.cfg

@@ -19,7 +19,7 @@ defaults
 
 frontend https-in
    log global
-   bind *:443 ssl crt /conf/server-cert.pem ca-file /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem verify optional
+   bind *:443 ssl crt /config/server-cert.pem ca-file /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem verify optional
    mode http
    option forwardfor
    option http-server-close