smishchuk/svc-api-x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.mgmt.nubes.ru/deck/svc-api into dev

Browse Source
This commit is contained in:
smishchuk
2025-10-08 15:12:50 +03:00
parent e56fcc6c56 4193c0a92e
commit e33a9700af
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/vars/build.yaml
+2
View File
@@ -25,6 +25,8 @@ needStoreVaultSecret: true
storedSecretsList: storedSecretsList:
- "LUCEE_EXTENSIONS" - "LUCEE_EXTENSIONS"
- "ORCHESTRATOR_AUTH" - "ORCHESTRATOR_AUTH"
- "VAULT_ROLE_ID"
- "VAULT_SECRET_ID"
- "cfconfig_datasources_cmdb_database" - "cfconfig_datasources_cmdb_database"
- "cfconfig_datasources_cmdb_dbdriver" - "cfconfig_datasources_cmdb_dbdriver"
- "cfconfig_datasources_cmdb_host" - "cfconfig_datasources_cmdb_host"
v1/resources/instance.cfc
+4 -2
View File
@@ -358,9 +358,11 @@
<cfelseif structKeyExists(instanceData,"vault")> <cfelseif structKeyExists(instanceData,"vault")>
<cfset vaultUrl=instanceData.vault.Url/><!--- v002 ---> <cfset vaultUrl=instanceData.vault.Url/><!--- v002 --->
</cfif> </cfif>
<!--- url="https://vault.adl.nubes.ru:8200/v1/auth/approle/login" --->
<cfhttp method="post" <cfhttp method="post"
url="https://vault.adl.nubes.ru:8200/v1/auth/approle/login" url="https://vault.lk.adl.nubes.ru/v1/auth/approle/login"
timeout="3" timeout="3"
charset="utf-8" charset="utf-8"
result="res" result="res"