Commit 62f8dc198d0dc8e1c7738ed99b1c123f62b2f1cb

Authored by Valerii Sosliuk
1 parent f649ef57

X509 cert saved in db

@@ -76,10 +76,11 @@ mqtt: @@ -76,10 +76,11 @@ mqtt:
76 adaptor: "${MQTT_ADAPTOR_NAME:JsonMqttAdaptor}" 76 adaptor: "${MQTT_ADAPTOR_NAME:JsonMqttAdaptor}"
77 timeout: "${MQTT_TIMEOUT:10000}" 77 timeout: "${MQTT_TIMEOUT:10000}"
78 # Uncomment the following lines to enable ssl for MQTT 78 # Uncomment the following lines to enable ssl for MQTT
79 - ssl:  
80 - key_store: keystore/mqttserver.jks  
81 - key_store_password: password  
82 - key_store_type: JKS 79 +# ssl:
  80 +# key_store: keystore/mqttserver.jks
  81 +# key_store_password: server_ks_password
  82 +# key_password: server_key_password
  83 +# key_store_type: JKS
83 84
84 # CoAP server parameters 85 # CoAP server parameters
85 coap: 86 coap:
1 /** 1 /**
2 * Copyright © 2016-2017 The Thingsboard Authors 2 * Copyright © 2016-2017 The Thingsboard Authors
3 - * 3 + * <p>
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at 6 * You may obtain a copy of the License at
7 - *  
8 - * http://www.apache.org/licenses/LICENSE-2.0  
9 - * 7 + * <p>
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + * <p>
10 * Unless required by applicable law or agreed to in writing, software 10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS, 11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,7 +51,7 @@ public class MqttSslHandlerProvider { @@ -51,7 +51,7 @@ public class MqttSslHandlerProvider {
51 private String keyStorePassword; 51 private String keyStorePassword;
52 @Value("${mqtt.ssl.key_store_type}") 52 @Value("${mqtt.ssl.key_store_type}")
53 private String keyStoreType; 53 private String keyStoreType;
54 - 54 +
55 @Autowired 55 @Autowired
56 private DeviceCredentialsService deviceCredentialsService; 56 private DeviceCredentialsService deviceCredentialsService;
57 57