diff options
| -rw-r--r-- | docker/docker-compose-dev.yaml | 3 | ||||
| -rw-r--r-- | docker/docker-compose.yaml | 3 | ||||
| -rw-r--r-- | docker/nginx/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/nginx/default.conf | 5 | ||||
| -rw-r--r-- | docker/nginx/soc_collector-key.pem | 28 | ||||
| -rw-r--r-- | docker/nginx/soc_collector.pem | 26 | ||||
| -rwxr-xr-x | quickstart.sh | 12 |
7 files changed, 73 insertions, 7 deletions
diff --git a/docker/docker-compose-dev.yaml b/docker/docker-compose-dev.yaml index 38520ae..9c7f247 100644 --- a/docker/docker-compose-dev.yaml +++ b/docker/docker-compose-dev.yaml @@ -4,8 +4,7 @@ services: nginx: build: ./nginx ports: - - 80:80 - - 443:443 + - 1443:443 depends_on: - collector diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index ac71ecc..3160b72 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -3,8 +3,7 @@ services: nginx: build: ./nginx ports: - - 80:80 - - 443:443 + - 1443:443 depends_on: - collector diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index cc3dac8..7a880c5 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,4 +1,7 @@ FROM nginx +COPY soc_collector.pem /etc/ssl/ +COPY soc_collector-key.pem /etc/ssl/ + COPY default.conf /etc/nginx/conf.d/default.conf diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index a734b0e..2a00e78 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -1,7 +1,10 @@ server { - listen 80; + listen 443 ssl; server_name _; + ssl_certificate /etc/ssl/soc_collector.pem; + ssl_certificate_key /etc/ssl/soc_collector-key.pem; + access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log warn; diff --git a/docker/nginx/soc_collector-key.pem b/docker/nginx/soc_collector-key.pem new file mode 100644 index 0000000..91b47df --- /dev/null +++ b/docker/nginx/soc_collector-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCnvrRD65+Ht4yi +hyA4gVZ/fAPycpkE3gV4j/hOPKQ2HQ4/Hgu4gLvYbXWVSbjoVT0VkioEtpYQMA4E +ZRwznV28pe6cQS1BdG1TkJpT4jTBa0JYRWD0Sk6uADtWtduEYIN2Zn/XRwc358Y7 +ios32prAJzer6OaILhFf4zEdC8K7z/9pWxH2nTsgAzFccReN+62AkaVfWmSCHk5I +PpsoU076t18jHFTsfvl1r+u2fTQgokC9qFJ7zk62m3NhJh6D4n3J/KzQi4ZvdU7Z +f5XHScdfcq2RoaYN55wS6zN5aSvcdksJMsFj/gOS0Wy5sMWS9MUf25merlqkwyZn +iQqd4DwlAgMBAAECggEBAItSOSawbK+sI4JZ+Mj1o4H+3shfpfgE70ZTTUit1TWc +rFh/+/wh7+KyBxcXRByzryhbXcrMW5bWUs4TrHiyG0i0CJp/B7d1m9fsIkHJf0em +blQiS4Sasv6R8rbyFIC+KHIOb9+9fqFQP7T0PO0HA8DU0chWiCJTINsjN4eIXRTf +NAzjL5xOnW2bIJTz1ZOWxZtVgSjbecKSw3PEy04RVmjEe2jcY0AqaG+IOvjNHgwZ +PR7JVAeU8ReyeEaNHOnJTCtwwTvlxtU3dhwcCDJPlZjjzZ0tbovzFs051o5yJEp7 +/q0he1Oj9TN4UzqfZoq8ApaFRHCBaXPps97bQiaKo4ECgYEA2OfUfDwlVYLbNphb +g8NKjTImhSrBGFXREOOCIE9HirpABR4FCXon0qKDaq3IkMenfuF9Wb7qb4cOA+g6 +xwYNxZAtXAzQ+AqjFiZOzJlyaYhToqKE5Pxific+x1VSNSk8DDkbS1IrTQU+hN0q +y++UDiRm5GQnx3wzJ1UgziD4P+MCgYEAxfqRlnu344ZQssBgU35UmdMupDOPpzwL +l/auo2TgQEqS35nSwqibSZ5rqh2WR7mkLTQuCyt3GFDyWHqMqUFzi0eFDzzZGEZt +omjCJfhNUjZEoxWp3iVg1WDVpD0IIGeGWunTi8rw7AVO2SyAZrPrtr6d9/K1taxP +ZTiQHSzuQlcCgYAJUDsBcpuvxkSfXX9gcvw6f9LDmQhdgSHO9dXaiUzrGgAxuA5D +T+lx0+SMqhWYkdoRSqFVPytVypjBdjE/5nSk7QHll+9JFzvVcaOkiVouSdo9e3j1 +VBjujcTWTkWPXsvjQnh3jXmqfvUmQ1DZHNpgmROJ7vr+R8jygWc9MpE2PQKBgQC6 +GcjjIRcBvI99CBNESPtzwa0VUxaVSH9JcOxG0ZtvM+qOX8VbkCyw7kccmUVb1Oi8 +SVGC1G/WHrlAbKpurATWBvvQEA2uoP2L7leaY6cjQboRZ1rPZGl7CtSo12odM9N7 +AFQIE1OXOYId6ZQldrl7hgFuQuuGhBv59Uqa8lJhbwKBgEjjbYo+lSH1KeyK6goG +lA944pJq8foYHRI23DPyl3E2ARRQgI2j5maJ80PV/1ECS3EaIQOqDaoMaMSTW2P2 +ZEHD8GKd+hoLot2iMjDXEKX0A3GsFR6380qSamJ0sv0dz5sANMB1KSNjdLZ/ZooN +aEaBRM8DuT+ttKylj4B+uNDn +-----END PRIVATE KEY----- diff --git a/docker/nginx/soc_collector.pem b/docker/nginx/soc_collector.pem new file mode 100644 index 0000000..4c9afc8 --- /dev/null +++ b/docker/nginx/soc_collector.pem @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIEWzCCAsOgAwIBAgIQFFGAJROQSltNZhThNIJnLzANBgkqhkiG9w0BAQsFADCB +hzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMS4wLAYDVQQLDCVraG5A +S3Jpc3RvZmVycy1NQlAgKEtyaXN0b2ZlciBIYWxsaW4pMTUwMwYDVQQDDCxta2Nl +cnQga2huQEtyaXN0b2ZlcnMtTUJQIChLcmlzdG9mZXIgSGFsbGluKTAeFw0yMjAy +MDQwODIyMjNaFw0yNDA1MDQwNzIyMjNaMGcxJzAlBgNVBAoTHm1rY2VydCBkZXZl +bG9wbWVudCBjZXJ0aWZpY2F0ZTE8MDoGA1UECwwza2huQEtyaXN0b2ZlcnMtTWFj +Qm9vay1Qcm8ubG9jYWwgKEtyaXN0b2ZlciBIYWxsaW4pMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAp760Q+ufh7eMoocgOIFWf3wD8nKZBN4FeI/4Tjyk +Nh0OPx4LuIC72G11lUm46FU9FZIqBLaWEDAOBGUcM51dvKXunEEtQXRtU5CaU+I0 +wWtCWEVg9EpOrgA7VrXbhGCDdmZ/10cHN+fGO4qLN9qawCc3q+jmiC4RX+MxHQvC +u8//aVsR9p07IAMxXHEXjfutgJGlX1pkgh5OSD6bKFNO+rdfIxxU7H75da/rtn00 +IKJAvahSe85OtptzYSYeg+J9yfys0IuGb3VO2X+Vx0nHX3KtkaGmDeecEuszeWkr +3HZLCTLBY/4DktFsubDFkvTFH9uZnq5apMMmZ4kKneA8JQIDAQABo2IwYDAOBgNV +HQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHwYDVR0jBBgwFoAUzcpu +HwNfeGSOBcv5b4qtfePeuDMwGAYDVR0RBBEwD4INc29jX2NvbGxlY3RvcjANBgkq +hkiG9w0BAQsFAAOCAYEAx4b3jIymleUw+Bt/zUnKllmSOA581MrWT9tdLu/uC7hj +KM2YidbzqmI7vnSCIp9YZGNZIK+7/lWopFWsIsqsd4BOaVuodZ/WK3e22+7h/yzd +imde2bv0mSNHxFeaU4x++MNpjKStziC/UwD2PqNqoACXOIcXMqFL/esluKW1APKZ +xTSxBcHmesNeFQL8wkK3HTYm7TYuKx/gcVnySvxnaPqJCRgF6jVtua83RTQXpS1b +i8NW1sfF5La1/Biy0rnCIbOvQwWwPcou2hRQPMIS68dTFu0fJkhrrI/BVQj9doJp +8WMCM1805uymn7OMEkJU4n3g7iicNWBnFr8C0UXvSVEkh35AG4J2CxMyixm83NaY +1w0hDGcan0XPVTElRhXjmPO1aWQFwfUmfQm94GfJD4biGdAAhSU+ejuiGxCIS79e +G4Av3Ax5ixqqnGboW4QSK04brqfBASLcg10kv60QEDp/Rj+VCMPnwa21FU0V1hBT +8jMbIUkUrNlHLwGLZLPW +-----END CERTIFICATE----- diff --git a/quickstart.sh b/quickstart.sh index 950475b..7c14a1f 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -1,6 +1,14 @@ #!/bin/sh source env-vars.sh +build="" + +while getopts "b" flag +do + case "$flag" in + b) build="--build";; + esac +done # Create a directory to store the certificates in. if [ ! -d ${DOCKER_JWT_PUBKEY_PATH} ]; then @@ -34,5 +42,5 @@ if [ ! -f ${DOCKER_JWT_HTPASSWD_PATH}/userdb.yaml ]; then fi # Launch the containers. -docker-compose -f docker/docker-compose-dev.yaml up -d -docker-compose -f auth-server-poc/docker-compose.yml up -d +docker-compose -f docker/docker-compose-dev.yaml up -d $build +docker-compose -f auth-server-poc/docker-compose.yml up -d $build |