From 068d3b660206834a03cee4378d5a18fb7352542a Mon Sep 17 00:00:00 2001 From: Drasko DRASKOVIC Date: Sat, 11 Feb 2017 18:53:30 +0100 Subject: [PATCH] Add lora http certs, fix docekr-compose Signed-off-by: Drasko DRASKOVIC --- .../docker-compose.yml | 0 lora/certs/http-tls.crt | 60 +++++++++++++++++++ lora/certs/http-tls.key | 15 +++++ .../docker-compose.yml | 4 ++ 4 files changed, 79 insertions(+) rename docker-compose-auth.yml => auth/docker-compose.yml (100%) create mode 100644 lora/certs/http-tls.crt create mode 100644 lora/certs/http-tls.key rename docker-compose-lora.yml => lora/docker-compose.yml (94%) diff --git a/docker-compose-auth.yml b/auth/docker-compose.yml similarity index 100% rename from docker-compose-auth.yml rename to auth/docker-compose.yml diff --git a/lora/certs/http-tls.crt b/lora/certs/http-tls.crt new file mode 100644 index 00000000..67852264 --- /dev/null +++ b/lora/certs/http-tls.crt @@ -0,0 +1,60 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha256WithRSAEncryption + Issuer: C=GB, ST=Derbyshire, O=Paho Project, OU=Testing, CN=Signing CA + Validity + Not Before: Feb 11 17:30:14 2017 GMT + Not After : Feb 10 17:30:14 2022 GMT + Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=localhost + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (1024 bit) + Modulus: + 00:ba:71:18:56:10:64:82:7c:e6:25:2d:92:0a:3a: + 52:84:ef:4f:50:7c:e5:24:f8:59:b0:9c:a5:3b:09: + 09:f6:20:56:11:27:0f:46:10:ec:5d:ef:42:d8:1d: + d2:4c:7c:a6:4c:da:21:30:a4:6b:f7:65:8c:b5:72: + cd:ac:4a:5e:08:8c:60:e3:a5:6e:97:33:72:60:af: + 48:e4:6d:6d:01:a1:dd:6c:c2:16:1f:32:9a:29:14: + 9b:55:6f:19:69:b3:09:a7:22:38:a4:2c:f7:bd:f0: + 49:a9:7e:49:a5:b4:42:36:73:57:27:c8:54:36:a1: + 7e:b5:b0:5f:fa:cb:22:fb:f1 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + Netscape Comment: + OpenSSL Generated Certificate + X509v3 Subject Key Identifier: + F9:02:B5:33:C6:DC:D3:42:8F:5E:2A:C5:3A:6D:D7:84:58:AE:B0:B8 + X509v3 Authority Key Identifier: + keyid:AF:16:3A:2B:68:A4:6A:89:8A:85:A2:8A:E1:09:38:B9:11:A9:EA:7B + + Signature Algorithm: sha256WithRSAEncryption + 79:ef:46:49:c7:46:f1:d4:a2:ce:01:bd:18:24:d9:6f:c7:44: + 6f:e7:4a:aa:95:30:c4:75:31:73:ed:ad:1a:ff:c1:6a:17:1a: + 5e:56:de:85:a1:7d:f4:fd:d4:39:98:2a:e9:07:bb:34:e0:2c: + 1a:f0:35:38:8d:a3:93:0f:20:48:a3:17:92:39:4f:bf:52:28: + df:6b:fa:f7:5d:14:e8:bc:ad:30:43:f5:37:ec:02:f9:6e:75: + 94:04:38:18:39:f7:02:b4:12:10:48:8d:1c:88:84:ad:ae:80: + 11:7c:7d:49:4e:08:94:5f:ba:82:1c:cb:0c:24:81:0f:81:6c: + bb:78 +-----BEGIN CERTIFICATE----- +MIICxzCCAjCgAwIBAgIBATANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJHQjET +MBEGA1UECAwKRGVyYnlzaGlyZTEVMBMGA1UECgwMUGFobyBQcm9qZWN0MRAwDgYD +VQQLDAdUZXN0aW5nMRMwEQYDVQQDDApTaWduaW5nIENBMB4XDTE3MDIxMTE3MzAx +NFoXDTIyMDIxMDE3MzAxNFowdjELMAkGA1UEBhMCR0IxGDAWBgNVBAgMD05vdHRp +bmdoYW1zaGlyZTETMBEGA1UEBwwKTm90dGluZ2hhbTEPMA0GA1UECgwGU2VydmVy +MRMwEQYDVQQLDApQcm9kdWN0aW9uMRIwEAYDVQQDDAlsb2NhbGhvc3QwgZ8wDQYJ +KoZIhvcNAQEBBQADgY0AMIGJAoGBALpxGFYQZIJ85iUtkgo6UoTvT1B85ST4WbCc +pTsJCfYgVhEnD0YQ7F3vQtgd0kx8pkzaITCka/dljLVyzaxKXgiMYOOlbpczcmCv +SORtbQGh3WzCFh8ymikUm1VvGWmzCaciOKQs973wSal+SaW0QjZzVyfIVDahfrWw +X/rLIvvxAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T +U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT5ArUzxtzTQo9eKsU6 +bdeEWK6wuDAfBgNVHSMEGDAWgBSvFjoraKRqiYqFoorhCTi5EanqezANBgkqhkiG +9w0BAQsFAAOBgQB570ZJx0bx1KLOAb0YJNlvx0Rv50qqlTDEdTFz7a0a/8FqFxpe +Vt6FoX30/dQ5mCrpB7s04Cwa8DU4jaOTDyBIoxeSOU+/Uijfa/r3XRTovK0wQ/U3 +7AL5bnWUBDgYOfcCtBIQSI0ciIStroARfH1JTgiUX7qCHMsMJIEPgWy7eA== +-----END CERTIFICATE----- diff --git a/lora/certs/http-tls.key b/lora/certs/http-tls.key new file mode 100644 index 00000000..e63728f5 --- /dev/null +++ b/lora/certs/http-tls.key @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQC6cRhWEGSCfOYlLZIKOlKE709QfOUk+FmwnKU7CQn2IFYRJw9G +EOxd70LYHdJMfKZM2iEwpGv3ZYy1cs2sSl4IjGDjpW6XM3Jgr0jkbW0Bod1swhYf +MpopFJtVbxlpswmnIjikLPe98EmpfkmltEI2c1cnyFQ2oX61sF/6yyL78QIDAQAB +AoGAVcqm5SuD5Juul5sBoZ02zZ8FQ0dFdh6lvuRGEAVXxR8aG6h6mcY9zffELYiD +ddjB+YlCTozKdbwP5IrgY5CQ9dq5JVD5Y3V+rYUnu1J9DJzAujsMu9CcB2P/fcbF +tXH788CCuENoBGYQCcer8/+D3aZ0cqyo0oBIBHsblaJAEAECQQDlza5GHrAqXBhf +GBYBpFe4kgUGkfXFVn6fxGTVSwrqK6kXcAtzE22HDI210iM7l5l3AX8UZ+i3gSnR +M0Bs+VsBAkEAz7H/VuKYeunk0xzpqyZ/ztlFoD3f89CZRCGaCYQbgRCJnOHWBgJv +NUqXGplqyrRU5Si3tdZb8f/iAfYyi/RQ8QJAK4oxx8VOuWfjkjjdCoiZujWoUBtd +hnsh2KF8PVFPixikm/U1piL7MIg3XUioNkU95WdaLYKWfBYz1xgvz7XbAQJBAMZj +N4s+lneRwskE7Q5Wj+59C0yszaaOslep4QEF91+o9EmuTkkfOiqlPQBjWuaUqiLa +aeB/CQR3buKA0Hduv4ECQF3EfFTL0fwwJ3dSNFzaLUSGUNmpovbx7vp+AU5+hFLy +3MqE4grMTLbpUfAj3Tb2dGfkEFIEo47I+JRDPzJgeRo= +-----END RSA PRIVATE KEY----- diff --git a/docker-compose-lora.yml b/lora/docker-compose.yml similarity index 94% rename from docker-compose-lora.yml rename to lora/docker-compose.yml index 03f09920..dfac65bf 100644 --- a/docker-compose-lora.yml +++ b/lora/docker-compose.yml @@ -128,6 +128,8 @@ services: # LoRaWAN Application Server ### lora-app-server: + volumes: + - ./certs:/etc/lora-app-server/certs image: mainflux/lora-app-server:latest container_name: mainflux-lora-app-server command: dockerize -wait tcp://postgres:5432 -wait tcp://mosquitto:1883 -wait tcp://redis:6379 -timeout 10s ./build/lora-app-server @@ -137,6 +139,8 @@ services: - REDIS_URL=redis://redis:6379 - MQTT_SERVER=tcp://mosquitto:1883 - NS_SERVER=lora-network-server:8000 + - HTTP_TLS_CERT=/etc/lora-app-server/certs/http-tls.crt + - HTTP_TLS_KEY=/etc/lora-app-server/certs/http-tls.key networks: - lora