Merge pull request #12 from IvanKuchin/development

infrastructure: dedicated folder for secret
IvanKuchin · Jun 8, 2021 · d8c7119 · d8c7119
2 parents fe3d0ad + 96d7c6e
commit d8c7119
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,7 +88,6 @@ set(GIT_INSTALL_DIR		${LOCAL_INSTALL_DIR}/git)
 set(PDF_FONT_INSTALL_DIR	${LOCAL_INSTALL_DIR}/libpdf-font)
 set(LIBXL_INSTALL_DIR		${LOCAL_INSTALL_DIR}/libxl)
 set(CONFIG_INSTALL_DIR		${LOCAL_INSTALL_DIR}/config)
-set(SECRET_INSTALL_DIR		${LOCAL_INSTALL_DIR}/secret)
 set(SSMTP_INSTALL_DIR		${LOCAL_INSTALL_DIR}/ssmtp)
 
 # ---- libxl library is not in apt-reporsitory, therefore is not installed on the OS

diff --git a/src/pd/c_smartway.cpp b/src/pd/c_smartway.cpp
@@ -364,7 +364,7 @@ string C_Smartway::GetAuthJSON()
 	MESSAGE_DEBUG("", "", "start");
 
 	vector<string>	config_keys 		= {"SMARTWAY_LOGIN", "SMARTWAY_PASSWORD"};
-    auto	        auth_map        	= config->GetFromFullPathFile(SECRET_DIR, SECRET_FILE, config_keys);
+    auto	        auth_map        	= config->GetFromFile(SECRET_FILE, config_keys);
     auto	        is_auth_valid   	= (auth_map["SMARTWAY_LOGIN"].length() > 0);
     auto	        __SMARTWAY_LOGIN    = (is_auth_valid ? auth_map["SMARTWAY_LOGIN"] : "");
     auto	        __SMARTWAY_PASSWORD = (is_auth_valid ? auth_map["SMARTWAY_PASSWORD"] : "");