042 IAM_URL env

Application.cfc

@@ -28,6 +28,8 @@
 	<cfset this.client_secret = createObject("java", "java.lang.System").getEnv("IDP_CLIENT_SECRET")/>
 <!--- 	<cfset this.iam_url = "https://auth-api.ngcloud.ru/api/v1/auth/user"/>	 --->
 	<cfset this.iamServiceUrl = "https://auth-api.ngcloud.ru/api/v1/auth/user"/> 
+	<cfset this.iamServiceUrl = getFromEnv("IAM_URL", "https://auth-api.ngcloud.ru/api/v1/auth/user")/> 
+	
 	<cfset this.redirect_uri  = "https://#CGI.SERVER_NAME##CGI.SCRIPT_NAME#"/><!--- куда возвращаться от IDP --->
 	<cfset this.crm_cache_host  = "elma-cache.adl.nubes.ru"/><!--- *** почему-то приходится устанавливать серт sslCertificateInstall, иначе не коннектится --->
 	<cfset request.crm_cache_base  = "https://#this.crm_cache_host#/contract_ls.cfm"/>
@@ -103,13 +105,10 @@
 		<cfset request.PERMISSION_READ=1/>
 		<cfset request.PERMISSION_WRITE=2/>		
 	
-<!--- 		<cfset request.UNDEFINED_USR_ID=-1/>
-		<cfset request.ANONYMOUS_USR_ID=2/>
-		<cfset request.GUEST_USR_ID=3/> --->
 
 		<!--- global settings --->				
 		<!--- *************************************************************************************************************** --->
-		<cfset request.APP_VERSION="0.00.041"/><!--- ************************************************************************ --->
+		<cfset request.APP_VERSION="0.00.042"/><!--- ************************************************************************ --->
 		<!--- *************************************************************************************************************** --->
 		<cfheader name="X-Application-Version" value=#request.APP_VERSION#/>
 		<cfset request.STAND=getStand()/>	
@@ -117,10 +116,6 @@
 		
 		<!--- application constants --->
 		
-		<!---<cfset request.SMTP_SERVER="172.16.16.16"/>
-		<cfset request.MAIL_FROM_FOR_NOTIFICATION="Pipeline tracker <pipeline@mail.ru>"/>
-		<cfset request.SUBJECT_PREFIX="[PIPELINE TRACKER] "/>--->
-		<!---<cfset request.BASE_URL="https://smtest.dtln.local/pipeline/"/>*** сделать нормально. Внимание! При наличии прокси CGI.SERVER_NAME может быть заменено --->
 	
 		<cfset local = {} />
 
@@ -456,6 +451,24 @@
     </cffunction>
 	
 
+	<cffunction name="getFromEnv"
+        access="private"
+        returntype="string"
+        output="true"
+        hint="Obtain value from environment, if not found then return default">
+	
+		<cfargument name="name" type="string" required="true"/>
+		<cfargument name="default" type="string" required="true"/>
+
+		<cftry>
+			<cfset var value = createObject("java", "java.lang.System").getEnv(arguments.name)/>
+			<cfreturn isNull(value)? arguments.default : value/>
+		<cfcatch>
+			<cfreturn arguments.default/>
+		</cfcatch>
+		</cftry>
+	</cffunction>
+	
 	<cffunction
         name="getDS"
         access="private"

etc/deploy.txt

@@ -0,0 +1,5 @@
+$ git remote -v
+origin  https://gitea.services.ngcloud.ru/smishchuk/payg-report.git (fetch)
+origin  https://gitea.services.ngcloud.ru/smishchuk/payg-report.git (push)
+
+$ git push https://gitea.services.ngcloud.ru/smishchuk/payg-report-dev.git master