diff --git a/CMakeLists.txt b/CMakeLists.txt index aa8ce19..29b8ac6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.13) -project(ucentralsec) +project(ucentralsec VERSION 0.3.0) set(CMAKE_CXX_STANDARD 17) diff --git a/src/MicroService.cpp b/src/MicroService.cpp index 5e411b4..a344f5d 100644 --- a/src/MicroService.cpp +++ b/src/MicroService.cpp @@ -140,11 +140,6 @@ namespace uCentral { } void MicroService::initialize(Poco::Util::Application &self) { - - std::string V{APP_VERSION}; - std::string B{BUILD_NUMBER}; - Version_ = V + "(" + B + ")"; - // add the default services SubSystems_.push_back(KafkaManager()); SubSystems_.push_back(ALBHealthCheckServer()); diff --git a/src/MicroService.h b/src/MicroService.h index 7569c52..1174a19 100644 --- a/src/MicroService.h +++ b/src/MicroService.h @@ -79,7 +79,11 @@ namespace uCentral { DAEMON_CONFIG_ENV_VAR(std::move(ConfigVar)), DAEMON_APP_NAME(std::move(AppName)), DAEMON_BUS_TIMER(BusTimer), - SubSystems_(std::move(Subsystems)) {} + SubSystems_(std::move(Subsystems)) { + std::string V{APP_VERSION}; + std::string B{BUILD_NUMBER}; + Version_ = V + "(" + B + ")"; + } int main(const ArgVec &args) override; void initialize(Application &self) override; diff --git a/ucentralsec.properties b/ucentralsec.properties index 782af2e..19fd214 100644 --- a/ucentralsec.properties +++ b/ucentralsec.properties @@ -71,6 +71,9 @@ ucentral.kafka.brokerlist = debfarm1-node-c.arilia.com:9092 ucentral.kafka.auto.commit = false ucentral.kafka.queue.buffering.max.ms = 50 +ucentral.document.policy.access = /wwwassets/access_policy.html +ucentral.document.policy.password = /wwwassets/password_policy.html + # # 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 diff --git a/ucentralsec.properties.aws b/ucentralsec.properties.aws index 4dde0ec..6f5d9a8 100644 --- a/ucentralsec.properties.aws +++ b/ucentralsec.properties.aws @@ -40,6 +40,9 @@ ucentral.system.commandchannel = /tmp/app.ucentralsec ucentral.service.key = $UCENTRALSEC_ROOT/certs/restapi-key.pem ucentral.service.key.password = mypassword +ucentral.document.policy.access = /wwwassets/access_policy.html +ucentral.document.policy.password = /wwwassets/password_policy.html + # # Security Microservice Specific Section # diff --git a/ucentralsec.properties.priv b/ucentralsec.properties.priv index 08f6eff..40d40ca 100644 --- a/ucentralsec.properties.priv +++ b/ucentralsec.properties.priv @@ -25,6 +25,9 @@ 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 +ucentral.document.policy.access = /wwwassets/access_policy.html +ucentral.document.policy.password = /wwwassets/password_policy.html + # # Generic section that all microservices must have #