shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-14 01:57:24 +03:00
Code Releases Wiki Activity

F #3951: fix get fireedge-server.conf in production (#747)

Browse Source 
Signed-off-by: Jorge Lobo <jlobo@opennebula.io>
This commit is contained in:
Jorge Miguel Lobo Escalona 2021-02-03 12:19:48 +01:00 committed by GitHub
parent 8016b9b872
commit 2dba7c5cd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1652 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1646
src/fireedge/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

15
src/fireedge/src/server/routes/api/provision/functions.js
View File

@ -32,10 +32,6 @@ const { getConfig } = require('server/utils/yml')
const { spawnSync, spawn } = require('child_process')
const { messageTerminal } = require('server/utils/general')
const appConfig = getConfig()
const prependCommand = appConfig.oneprovision_prepend_command || ''
const optionalCreateCommand = appConfig.oneprovision_optional_create_command || ''
const eventsEmitter = new events.EventEmitter()
const defaultError = (err = '', message = 'Error: %s') => ({
color: 'red',
@ -222,8 +218,10 @@ const moveToFolder = (path = '', relative = '/../') => {
}
const addPrependCommand = (command = '', resource = '') => {
const rsc = Array.isArray(resource) ? resource : [resource]
const appConfig = getConfig()
const prependCommand = appConfig.oneprovision_prepend_command || ''
const rsc = Array.isArray(resource) ? resource : [resource]
let newCommand = command
let newRsc = rsc
@ -245,7 +243,11 @@ const addPrependCommand = (command = '', resource = '') => {
}
}
const addOptionalCreateCommand = () => [optionalCreateCommand].filter(Boolean)
const addOptionalCreateCommand = () => {
const appConfig = getConfig()
const optionalCreateCommand = appConfig.oneprovision_optional_create_command || ''
return [optionalCreateCommand].filter(Boolean)
}
const executeCommandAsync = (
command = '',
@ -320,6 +322,7 @@ const findRecursiveFolder = (path = '', finder = '', rtn = false) => {
const getEndpoint = () => {
let rtn = []
const appConfig = getConfig()
if (appConfig && appConfig.one_xmlrpc) {
const parseUrl = parse(appConfig.one_xmlrpc)
const protocol = parseUrl.protocol || ''