From ed628caace33a54dc0b5f4f4cd8bbc4ca951e015 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Sun, 22 Aug 2021 20:10:18 -0700 Subject: [PATCH] Removing credentials from config file --- build | 2 +- src/StorageService.h | 12 ++++++------ ucentralfms.properties | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build b/build index 3cacc0b..da2d398 100644 --- a/build +++ b/build @@ -1 +1 @@ -12 \ No newline at end of file +14 \ No newline at end of file diff --git a/src/StorageService.h b/src/StorageService.h index af7f802..24f1ae1 100644 --- a/src/StorageService.h +++ b/src/StorageService.h @@ -61,7 +61,7 @@ namespace OpenWifi { int Start() override; void Stop() override; - int Setup_SQLite(); + [[nodiscard]] std::string ConvertParams(const std::string &S) const; [[nodiscard]] inline std::string ComputeRange(uint64_t From, uint64_t HowMany) { if(dbType_==sqlite) { @@ -92,11 +92,6 @@ namespace OpenWifi { return instance_; } -#ifndef SMALL_BUILD - int Setup_MySQL(); - int Setup_PostgreSQL(); -#endif - private: static Storage *instance_; std::unique_ptr Pool_= nullptr; @@ -111,6 +106,11 @@ namespace OpenWifi { SubSystemServer("Storage", "STORAGE-SVR", "storage") { } + + int Setup_SQLite(); + int Setup_MySQL(); + int Setup_PostgreSQL(); + }; inline Storage * Storage() { return Storage::instance(); }; diff --git a/ucentralfms.properties b/ucentralfms.properties index f647568..3855036 100644 --- a/ucentralfms.properties +++ b/ucentralfms.properties @@ -41,8 +41,8 @@ ucentral.system.uri.ui = ucentral-ui.arilia.com # s3.bucketname = ucentral-ap-firmware s3.region = us-east-1 -s3.secret = EuLw8ATOcP80UbEj1qGqP9F/I7GvJl8xo6p7LoFt -s3.key = AKIATXEXGKF345T2LXE7 +s3.secret = ******************************************* +s3.key = ******************************************* s3.retry = 60 s3.bucket.uri = ucentral-ap-firmware.s3.amazonaws.com