mirror of
https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git
synced 2025-11-03 12:08:07 +00:00
replaced references to whizcontrol with tip.wlan
This commit is contained in:
Dmitry Toptygin
@@ -85,7 +85,7 @@ PROFILES=" -Dspring.profiles.include=mqtt_receiver,ovsdb_redirector,ovsdb_manage
|
||||
|
||||
SSL_PROPS=" "
|
||||
SSL_PROPS="$SSL_PROPS -Dssl.props=file:/app/ssl.properties"
|
||||
SSL_PROPS="$SSL_PROPS -Dwhizcontrol.httpClientConfig=file:/app/httpClientConfig.json"
|
||||
SSL_PROPS="$SSL_PROPS -Dtip.wlan.httpClientConfig=file:/app/httpClientConfig.json"
|
||||
|
||||
CLIENT_MQTT_SSL_PROPS=" "
|
||||
CLIENT_MQTT_SSL_PROPS="$CLIENT_MQTT_SSL_PROPS -Djavax.net.ssl.keyStore=$MQTT_CLIENT_KEYSTORE_FILE"
|
||||
|
||||
@@ -3,7 +3,7 @@ PROFILES=" -Dspring.profiles.include=mqtt_receiver,ovsdb_redirector,ovsdb_manage
|
||||
|
||||
SSL_PROPS=" "
|
||||
SSL_PROPS+=" -Dssl.props=file:/opt/tip-wlan/certs/ssl.properties"
|
||||
SSL_PROPS+=" -Dwhizcontrol.httpClientConfig=file:/opt/tip-wlan/certs/httpClientConfig.json"
|
||||
SSL_PROPS+=" -Dtip.wlan.httpClientConfig=file:/opt/tip-wlan/certs/httpClientConfig.json"
|
||||
|
||||
CLIENT_MQTT_SSL_PROPS=" "
|
||||
CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.keyStore=/opt/tip-wlan/certs/client_keystore.jks"
|
||||
|
||||
@@ -16,7 +16,7 @@ app.name=OpenSyncManager
|
||||
# System property -Dspring.profiles.active=production
|
||||
# or specified on the command line using the switch --spring.profiles.active=dev,hsqldb
|
||||
#
|
||||
# This does not work: spring.profiles.active=${whizcontrol.core.server.security},${whizcontrol.core.server.auth},Extra_${app.name}
|
||||
# This does not work: spring.profiles.active=${tip.wlan.core.server.security},${tip.wlan.core.server.auth},Extra_${app.name}
|
||||
# Substitution of ${} in application.properties works in general, but not for spring.profiles.active and not for spring.profiles.include properties
|
||||
#
|
||||
# *** Do not set spring.profiles.active property in this file, or be prepared for the World of Weird.
|
||||
@@ -76,35 +76,21 @@ app.name=OpenSyncManager
|
||||
#spring.profiles.include=use_ssl,client_certificate_auth
|
||||
spring.profiles.include=use_ssl_with_client_cert_and_basic_auth,client_certificate_and_basic_auth,rest-template-single-user-per-service-digest-auth,use_single_ds,opensync_static_config
|
||||
|
||||
whizcontrol.equipmentAndNetworkManagementServiceBaseUrl=https://localhost:9094
|
||||
|
||||
#used by *-remote client classes when they authenticate their requests
|
||||
whizcontrol.httpClientConfig=classpath:httpClientConfig.json
|
||||
tip.wlan.httpClientConfig=classpath:httpClientConfig.json
|
||||
|
||||
#this user/password is used together with http_digest_auth and http_basic_auth spring profiles
|
||||
whizcontrol.serviceUser=user
|
||||
whizcontrol.servicePassword=password
|
||||
tip.wlan.serviceUser=user
|
||||
tip.wlan.servicePassword=password
|
||||
|
||||
spring.main.show-banner=false
|
||||
server.port=9096
|
||||
|
||||
#this port is used by secondary server connector, it is protected by digest authentication, while primary server.port is protected by client certificate auth
|
||||
whizcontrol.secondaryPort=7071
|
||||
tip.wlan.secondaryPort=7071
|
||||
|
||||
#this server only supports REST requests, CSRF would get in the way
|
||||
whizcontrol.csrf-enabled=false
|
||||
whizcontrol.emailVerificationTokenExpiryMs=600
|
||||
whizcontrol.passwordResetTokenExpiryMs=3600
|
||||
|
||||
whizcontrol.customerAccountManagementServiceBaseUrl=https://localhost:9092
|
||||
whizcontrol.orderAndSubscriptionManagementServiceBaseUrl=https://localhost:9093
|
||||
whizcontrol.equipmentAndNetworkManagementServiceBaseUrl=https://localhost:9094
|
||||
whizcontrol.equipmentConfigurationManagerServiceBaseUrl=https://localhost:9082
|
||||
whizcontrol.equipmentStatusAndAlarmCollectorServiceBaseUrl=https://localhost:9083
|
||||
whizcontrol.equipmentMetricsCollectorServiceBaseUrl=https://localhost:9085
|
||||
whizcontrol.equipmentRoutingServiceBaseUrl=https://localhost:9081
|
||||
whizcontrol.firmwareManagementServiceBaseUrl=https://localhost:9072
|
||||
whizcontrol.equipmentEventCollectorServiceBaseUrl=https://localhost:9076
|
||||
tip.wlan.csrf-enabled=false
|
||||
|
||||
#server.session-timeout= # session timeout in seconds
|
||||
#server.tomcat.max-threads = 0 # number of threads in protocol handler
|
||||
|
||||
@@ -13,5 +13,5 @@
|
||||
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.telecominfraproject.wlan.opensync.experiment.OpenSyncProcess"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync-gateway-static-process"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED -Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties -Dwhizcontrol.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json -Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks -Djavax.net.ssl.keyStorePassword=mypassword -Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks -Djavax.net.ssl.trustStorePassword=mypassword -Dconnectus.ovsdb.managerAddr=${local_server_address} -Dconnectus.ovsdb.listenPort=6640 -Dconnectus.ovsdb.redirector.listenPort=6643 -Dconnectus.ovsdb.timeoutSec=30 -Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks -Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12 -Dconnectus.ovsdb.configFileName=${project_loc:opensync-ext-static}/src/main/resources/config_2_ssids.json -Dconnectus.mqttBroker.address=${local_server_address} -Dconnectus.mqttBroker.listenPort=1883 -Dspring.profiles.include=mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED -Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties -Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json -Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks -Djavax.net.ssl.keyStorePassword=mypassword -Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks -Djavax.net.ssl.trustStorePassword=mypassword -Dconnectus.ovsdb.managerAddr=${local_server_address} -Dconnectus.ovsdb.listenPort=6640 -Dconnectus.ovsdb.redirector.listenPort=6643 -Dconnectus.ovsdb.timeoutSec=30 -Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks -Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12 -Dconnectus.ovsdb.configFileName=${project_loc:opensync-ext-static}/src/main/resources/config_2_ssids.json -Dconnectus.mqttBroker.address=${local_server_address} -Dconnectus.mqttBroker.listenPort=1883 -Dspring.profiles.include=mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
|
||||
</launchConfiguration>
|
||||
|
||||
@@ -6,7 +6,7 @@ public class SslUtil {
|
||||
* Examples:<br>
|
||||
* <code>
|
||||
* subject=CN = PP302X-EX, C = US, O = Plume Design Inc., L = Palo Alto, ST = CA, emailAddress = support@plumewifi.com<br>
|
||||
* subject=C = CA, ST = Ontario, L = Ottawa, O = WhizControl Canada Inc, OU = Research and Develpoment, CN = dev-ap-0001, emailAddress = devadmin@123wlan.com
|
||||
* subject=C = CA, ST = Ontario, L = Ottawa, O = KodaCloud Canada Inc, OU = Research and Develpoment, CN = dev-ap-0001, emailAddress = devadmin@123wlan.com
|
||||
* </code>
|
||||
* @param subjectDn
|
||||
* @return Value of the CN attribute of the supplied subject DN, or empty string if it cannot be extracted
|
||||
|
||||
Reference in New Issue
Block a user