From 95cd7370afa328b3138cc46fa540fbbb832696fd Mon Sep 17 00:00:00 2001 From: Mumshad Mannambeth Date: Sat, 8 Jul 2017 14:32:27 -0400 Subject: [PATCH] Move ansible projects folder to config directory --- server/api/project/project.controller.js | 4 ++-- server/components/ansible/ansible_tool.js | 2 +- server/config/environment/shared.js | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/api/project/project.controller.js b/server/api/project/project.controller.js index bf53f14..e2212cc 100644 --- a/server/api/project/project.controller.js +++ b/server/api/project/project.controller.js @@ -130,8 +130,8 @@ export function create(req, res) { if(!ansibleEngine.projectFolder){ let projectFolderName = util.format('%s_%s',req.user._id, req.body.name); - ansibleEngine.projectFolder = util.format('/opt/ansible-projects/test_%s', projectFolderName); - ansibleEngine.customModules = util.format('/opt/ansible-projects/test_%s/library', projectFolderName); + ansibleEngine.projectFolder = util.format(config.paths.ansible_projects + '/test_%s', projectFolderName); + ansibleEngine.customModules = util.format(config.paths.ansible_projects + '/test_%s/library', projectFolderName); // Update project request body to save in db req.body.ansibleEngine.projectFolder = ansibleEngine.projectFolder; diff --git a/server/components/ansible/ansible_tool.js b/server/components/ansible/ansible_tool.js index c410779..31d07ce 100644 --- a/server/components/ansible/ansible_tool.js +++ b/server/components/ansible/ansible_tool.js @@ -451,7 +451,7 @@ exports.deleteProjectFolder = function(project){ var ansibleEngine = project.ansibleEngine; var project_folder = ansibleEngine.projectFolder; - var archive_folder = '/opt/ansible-projects/archive'; + var archive_folder = config.paths.ansible_projects + '/archive'; var command = util.format('mkdir -p %s && tar -cvf %s/%s.tar %s && rm -rf %s', archive_folder, archive_folder, ansibleEngine.projectFolderName, project_folder, project_folder); diff --git a/server/config/environment/shared.js b/server/config/environment/shared.js index 1a87bfb..4f4d92c 100644 --- a/server/config/environment/shared.js +++ b/server/config/environment/shared.js @@ -7,5 +7,9 @@ exports = module.exports = { 'host' : process.env.SCRIPT_ENGINE_HOST || 'localhost', 'user' : process.env.SCRIPT_ENGINE_USER || 'root', 'password' : process.env.SCRIPT_ENGINE_PASSWORD || 'P@ssw0rd@123' + }, + + paths: { + ansible_projects: '/opt/ansible-projects' } };