From a5105227b030784ea6c2cf38d7c58edc0355c110 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Tue, 31 Aug 2021 11:33:26 -0700 Subject: [PATCH] Refactoring namespace for OpenWifi. --- owsec.properties | 71 ++++++++++++++++++++++++------------------------ owsec.service | 4 +-- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/owsec.properties b/owsec.properties index 781dd61..45b00ff 100644 --- a/owsec.properties +++ b/owsec.properties @@ -7,24 +7,24 @@ # # REST API access # -ucentral.restapi.host.0.backlog = 100 -ucentral.restapi.host.0.security = relaxed -ucentral.restapi.host.0.rootca = $UCENTRALSEC_ROOT/certs/restapi-ca.pem -ucentral.restapi.host.0.address = * -ucentral.restapi.host.0.port = 16001 -ucentral.restapi.host.0.cert = $UCENTRALSEC_ROOT/certs/restapi-cert.pem -ucentral.restapi.host.0.key = $UCENTRALSEC_ROOT/certs/restapi-key.pem -ucentral.restapi.host.0.key.password = mypassword -ucentral.restapi.wwwassets = $UCENTRALSEC_ROOT/wwwassets +openwifi.restapi.host.0.backlog = 100 +openwifi.restapi.host.0.security = relaxed +openwifi.restapi.host.0.rootca = $OWSEC_ROOT/certs/restapi-ca.pem +openwifi.restapi.host.0.address = * +openwifi.restapi.host.0.port = 16001 +openwifi.restapi.host.0.cert = $OWSEC_ROOT/certs/restapi-cert.pem +openwifi.restapi.host.0.key = $OWSEC_ROOT/certs/restapi-key.pem +openwifi.restapi.host.0.key.password = mypassword +openwifi.restapi.wwwassets = $OWSEC_ROOT/wwwassets -ucentral.internal.restapi.host.0.backlog = 100 -ucentral.internal.restapi.host.0.security = relaxed -ucentral.internal.restapi.host.0.rootca = $UCENTRALSEC_ROOT/certs/restapi-ca.pem -ucentral.internal.restapi.host.0.address = * -ucentral.internal.restapi.host.0.port = 17001 -ucentral.internal.restapi.host.0.cert = $UCENTRALSEC_ROOT/certs/restapi-cert.pem -ucentral.internal.restapi.host.0.key = $UCENTRALSEC_ROOT/certs/restapi-key.pem -ucentral.internal.restapi.host.0.key.password = mypassword +openwifi.internal.restapi.host.0.backlog = 100 +openwifi.internal.restapi.host.0.security = relaxed +openwifi.internal.restapi.host.0.rootca = $OWSEC_ROOT/certs/restapi-ca.pem +openwifi.internal.restapi.host.0.address = * +openwifi.internal.restapi.host.0.port = 17001 +openwifi.internal.restapi.host.0.cert = $OWSEC_ROOT/certs/restapi-cert.pem +openwifi.internal.restapi.host.0.key = $OWSEC_ROOT/certs/restapi-key.pem +openwifi.internal.restapi.host.0.key.password = mypassword # # Generic section that all microservices must have @@ -32,13 +32,13 @@ ucentral.internal.restapi.host.0.key.password = mypassword authentication.enabled = true authentication.default.username = tip@ucentral.com authentication.default.password = 13268b7daa751240369d125e79c873bd8dd3bef7981bdfd38ea03dbb1fbe7dcf -ucentral.system.data = $UCENTRALSEC_ROOT/data -ucentral.system.uri.private = https://localhost:17001 -ucentral.system.uri.public = https://local.dpaas.arilia.com:16001 -ucentral.system.uri.ui = https://ucentral-ui.arilia.com -ucentral.system.commandchannel = /tmp/app.ucentralsec -ucentral.service.key = $UCENTRALSEC_ROOT/certs/restapi-key.pem -ucentral.service.key.password = mypassword +openwifi.system.data = $OWSEC_ROOT/data +openwifi.system.uri.private = https://localhost:17001 +openwifi.system.uri.public = https://local.dpaas.arilia.com:16001 +openwifi.system.uri.ui = https://ucentral-ui.arilia.com +openwifi.system.commandchannel = /tmp/app.ucentralsec +openwifi.service.key = $OWSEC_ROOT/certs/restapi-key.pem +openwifi.service.key.password = mypassword # # Security Microservice Specific Section @@ -48,7 +48,7 @@ mailer.username = ************************ mailer.password = ************************ mailer.loginmethod = login mailer.port = 587 -mailer.templates = $UCENTRALSEC_ROOT/templates +mailer.templates = $OWSEC_ROOT/templates ############################# @@ -63,17 +63,16 @@ alb.port = 16101 # # Kafka # -ucentral.kafka.group.id = security -ucentral.kafka.client.id = security1 -ucentral.kafka.enable = true -# ucentral.kafka.brokerlist = a1.arilia.com:9092 -ucentral.kafka.brokerlist = debfarm1-node-c.arilia.com:9092 -ucentral.kafka.auto.commit = false -ucentral.kafka.queue.buffering.max.ms = 50 +openwifi.kafka.group.id = security +openwifi.kafka.client.id = security1 +openwifi.kafka.enable = true +openwifi.kafka.brokerlist = a1.arilia.com:9092 +openwifi.kafka.auto.commit = false +openwifi.kafka.queue.buffering.max.ms = 50 +openwifi.document.policy.access = /wwwassets/access_policy.html +openwifi.document.policy.password = /wwwassets/password_policy.html +openwifi.avatar.maxsize = 2000000 -ucentral.document.policy.access = /wwwassets/access_policy.html -ucentral.document.policy.password = /wwwassets/password_policy.html -ucentral.avatar.maxsize = 2000000 # # This section select which form of persistence you need # Only one selected at a time. If you select multiple, this service will die if a horrible @@ -121,7 +120,7 @@ logging.channels.c1.formatter = f1 # This is where the logs will be written. This path MUST exist logging.channels.c2.class = FileChannel -logging.channels.c2.path = $UCENTRALSEC_ROOT/logs/log +logging.channels.c2.path = $OWSEC_ROOT/logs/log logging.channels.c2.formatter.class = PatternFormatter logging.channels.c2.formatter.pattern = %Y-%m-%d %H:%M:%S %s: [%p] %t logging.channels.c2.rotation = 20 M diff --git a/owsec.service b/owsec.service index 513d815..4ba60f9 100644 --- a/owsec.service +++ b/owsec.service @@ -5,8 +5,8 @@ Wants=network-online.target [Service] Type=simple -Environment="UCENTRALSEC_ROOT=/home/admin/dev/wlan-cloud-ucentralsec" -ExecStart=/home/admin/dev/wlan-cloud-ucentralsec/cmake-build/ucentralsec +Environment="OWSEC_ROOT=/home/admin/dev/wlan-cloud-ucentralsec" +ExecStart=/home/admin/dev/wlan-cloud-ucentralsec/cmake-build/owsec WorkingDirectory=/home/admin/dev/wlan-cloud-ucentralsec # ExecReload=/bin/kill -s HUP $MAINPID User=admin