Merge branch 'hotfix/1.10.2'

ocariot · Jul 13, 2020 · eb894c0 · eb894c0
2 parents 8a4fa73 + bc67bfb
commit eb894c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/.env.example b/.env.example
@@ -24,6 +24,13 @@ AG_PORT_HTTPS=443
 ####################################### CERTIFICATES/KEYS #######################################
 #################################################################################################
 
+# SSL_IOT_CA_PATH:          Certificate from certificate authority
+#                           default value: .certs/ca.crt
+#
+#                           To generate self-signed certificates,
+#                           see: https://devcenter.heroku.com/articles/ssl-certificate-self
+SSL_IOT_CA_PATH=.certs/ca.crt
+
 # SSL_KEY_PATH:             Private key for SSL certificate
 #                           default value: ./certs/server.key
 #

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -243,10 +243,14 @@ services:
       - NODE_ENV=${NODE_ENV}
       - PORT_HTTP=${AG_PORT_HTTP}
       - PORT_HTTPS=${AG_PORT_HTTPS}
+      - SSL_IOT_KEY_PATH=/etc/.certs/server.key
+      - SSL_IOT_CERT_PATH=/etc/.certs/server.cert
+      - SSL_IOT_CA_PATH=/etc/.certs/ca.cert
       - SSL_KEY_PATH=/etc/.certs/server.key
       - SSL_CERT_PATH=/etc/.certs/server.cert
       - JWT_PUBLIC_KEY_PATH=/etc/.certs/jwt.key.pub
       - ISSUER=ocariot
+      - API_IOT_HOSTNAME=iot.localhost
       - API_GATEWAY_HOSTNAME=localhost
       - VAULT_HOSTNAME=vault.localhost
       - RABBIT_MGT_HOSTNAME=rabbit.localhost
@@ -267,6 +271,7 @@ services:
       - PORT_REDIS=6379
       - HOST_REDIS=redis-api-gateway
     volumes:
+      - ${SSL_IOT_CA_PATH}:/etc/.certs/ca.cert:ro
       - ${SSL_KEY_PATH}:/etc/.certs/server.key:ro
       - ${SSL_CERT_PATH}:/etc/.certs/server.cert:ro
       - ${JWT_PUBLIC_KEY_PATH}:/etc/.certs/jwt.key.pub:ro