Commit 4dee2a58 authored by j.hoerdt's avatar j.hoerdt
Browse files

deactivate encryption, as it is not needed,

because we are only communicating through localhost
parent bc22845b
......@@ -21,4 +21,4 @@ RUN chmod -R o+w .
ENTRYPOINT ["bash", "-c", "umask 0007 && java -Djava.util.logging.config.file=logging.properties -jar sensor2graph.jar"]
RUN mkdir logs
COPY --from=compile /sensor2graph/build/libs/sensor2graph.jar /sensor2graph/
COPY --from=compile /sensor2graph/logging.properties /sensor2graph/graphdb.gwdg.de.pem /sensor2graph/sensor2graph.properties /sensor2graph/sensor_type_info.json /sensor2graph/
COPY --from=compile /sensor2graph/logging.properties /sensor2graph/sensor2graph.properties /sensor2graph/sensor_type_info.json /sensor2graph/
-----BEGIN CERTIFICATE-----
MIIIDDCCBvSgAwIBAgIMIqVn2gwKHXHTeZnWMA0GCSqGSIb3DQEBCwUAMIGNMQsw
CQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVz
IERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4t
UEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTIw
MDQwMjEzMzYxMloXDTIyMDcwNTEzMzYxMlowgZQxCzAJBgNVBAYTAkRFMRYwFAYD
VQQIDA1OSUVERVJTQUNIU0VOMRMwEQYDVQQHDApHT0VUVElOR0VOMT4wPAYDVQQK
DDVHZXNlbGxzY2hhZnQgZnVlciB3aXNzZW5zY2hhZnRsaWNoZSBEYXRlbnZlcmFy
YmVpdHVuZzEYMBYGA1UEAwwPZ3JhcGhkYi5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
AQEFAAOCAQ8AMIIBCgKCAQEAuFtEPyLy1HuBwm/l5ruy17rSUPCJiiFVXmJtZ9Rg
YQoBX+F8At2ooYOPUwen78l7vGo7O5o0Yg5YAWbpWia3+DAxTKuEedHC3eIJVYXd
LShWA8ah82jyNXmkjRnF9Vcov0DT7AaBprlMiMOZKoEBIvq2jrYkNSKohVZ/8ALV
uJRKN69zxx/6AMzSRsOn8VkMy0NU8LhdThH/ePCS96d8WgJG2OUfy0jkWjuoaetB
xW6ZViqVeZr7rQYj4wvGvXnGQ2AYe0eMCMBAUg9lEV0cNU6skG2IojbREH56+liG
E8RusNHOjIYpDr0PzHZdPOjYjyR9o3uud8J4AjLNzR3P1QIDAQABo4IEYTCCBF0w
VwYDVR0gBFAwTjAIBgZngQwBAgIwDQYLKwYBBAGBrSGCLB4wDwYNKwYBBAGBrSGC
LAEBBDAQBg4rBgEEAYGtIYIsAQEEBTAQBg4rBgEEAYGtIYIsAgEEBTAJBgNVHRME
AjAAMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
FgQU2AkKC3t7HzrDG72ymd6lV99h5zQwHwYDVR0jBBgwFoAUazqYi/nyU4na4K2y
Mh4JH+iqO3QwKQYDVR0RBCIwIIIPZ3JhcGhkYi5nd2RnLmRlgg1uZW80ai5nd2Rn
LmRlMIGNBgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
ZGZuLWNhLWdsb2JhbC1nMi9wdWIvY3JsL2NhY3JsLmNybDA/oD2gO4Y5aHR0cDov
L2NkcDIucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jcmwvY2Fjcmwu
Y3JsMIHbBggrBgEFBQcBAQSBzjCByzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3Au
cGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEkGCCsGAQUFBzAChj1odHRwOi8v
Y2RwMS5wY2EuZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NhY2VydC9jYWNl
cnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1j
YS1nbG9iYWwtZzIvcHViL2NhY2VydC9jYWNlcnQuY3J0MIIB9wYKKwYBBAHWeQIE
AgSCAecEggHjAeEAdgDuS723dc5guuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAA
AXE7G0dYAAAEAwBHMEUCIH5zWNzhSmpeuqddV2qUSy8qQQDNiXCdzwDowI4Vsgy4
AiEAj1nAxa/eQz0xOA7pim0Bf3vpBM2FFWhuOXLf96TsKvgAdgCkuQmQtBhYFIe7
E6LMZ3AKPDWYBPkb37jjd80OyA3cEAAAAXE7G0eWAAAEAwBHMEUCIQD+5fuTNxPE
3PT7jmtSADX8flsrwsokTO4So+vYCEAfmAIgPuDvN6fRjry1dGfqNjuEz4gHkNnB
MAtnUMw9JodeeYkAdgBvU3asMfAxGdiZAKRRFf93FRwR2QLBACkGjbIImjfZEwAA
AXE7G0mOAAAEAwBHMEUCIQDQCCW0+b0+Ql4UUK0m8Fs8EOu41RJuSimXk30mHlrL
ZQIgeCBRmDL+tmU6+N8eHlG9U6p2vaOOCptH8YZeDBXaeuIAdwBVgdTCFpA2AUrq
C5tXPFPwwOQ4eHAlCBcvo6odBxPTDAAAAXE7G0qnAAAEAwBIMEYCIQCin5CAI4qE
lCzaSOr8o8K1O2sjeJaSlEjUqST+YZBrDAIhAMoPq4ACBQr4A7/Cri2W88yZKCsO
dz7c7rx6YnCRJHD1MA0GCSqGSIb3DQEBCwUAA4IBAQBaCB8K9TUPk87Cb6g65dVD
zWX/+XffWRSamHXnkhObFL1t1oxHxeAU4k+BS2wYItxVoS4dDuTlvxC+eAe5o3+V
Wc2nCowwunYJlqUTyzWZvdrzmdKQCfb2WS4yIvvvyNIrnfCtX3vrSs4qIJVflVc4
QdjWMRam0jAwWcS041Osg89GxiZCGQuHzCHyok9kwHGRn9hYtzPLRF80emvB/4Ew
gn7B3MkfTzk4eAFoqrJyAxsK9n3ngQY7iRYg6qpDEQT6kL30028NQS59xaBbpBlJ
zG3DTJhwZCSjLpCPEEdqqBSY+3/h4HAk0tvg9jwVZz12LqUNBW0fIr2pLfaENSQu
-----END CERTIFICATE-----
......@@ -59,8 +59,8 @@ public class Main {
//.withMaxTransactionRetryTime(3, TimeUnit.SECONDS)
//.withLeakedSessionsLogging()
.withMaxConnectionPoolSize(concurrency)
.withEncryption()
.withTrustStrategy(TrustStrategy.trustCustomCertificateSignedBy(neo4j_server_certificate_file))
// .withEncryption()
// .withTrustStrategy(TrustStrategy.trustCustomCertificateSignedBy(neo4j_server_certificate_file))
.build()
);
}
......@@ -218,7 +218,7 @@ public class Main {
Properties defaults = new Properties();
defaults.setProperty("already_uploaded_days_file", "already_uploaded_days.txt" );
defaults.setProperty("failed_to_upload_sensors_file", "failed_to_upload.txt" );
defaults.setProperty("database_name", "sensor" );
defaults.setProperty("database_name", "neo4j" );
defaults.setProperty("csv_directory", "data/csv_files/" );
defaults.setProperty("geocoding_cache", "data/geocoding_cache/" );
defaults.setProperty("concurrency", "10" );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment