From: 刘洪青 Date: Fri, 24 Dec 2021 09:59:30 +0000 (+0800) Subject: Merge branch '1.3.x' into 1.4.x X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=61f18c2800ff0722864f05d7fb9e537b17b0a801;p=institute%2Fdeploy-authx-service.git Merge branch '1.3.x' into 1.4.x --- 61f18c2800ff0722864f05d7fb9e537b17b0a801 diff --cc deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml index 5012b42,8d5d776..68cfc18 --- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml @@@ -65,26 -65,10 +65,26 @@@ data JOBS_RABBITMQ_ACCOUNTGROUPUSERSVC2JOBSRABBITSENDER_ENABLED: "false" + #ipaddr + IPADDR_API_URL: http://ipaddr.ipaddr.svc.cluster.local:9090/v1/find + + + CASSERVER_SA_API_SERVER_URL: http://cas-server-sa-api-svc.cas-server.svc.cluster.local:8080 + CASSERVER_SA_API_CLIENT_AUTH_ENABLED: "false" + #CASSERVER_SA_API_CLIENT_AUTH_KEY_PASSWORD: "" + #CASSERVER_SA_API_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/client/client.keystore + #CASSERVER_SA_API_CLIENT_AUTH_KEYSTORE_PASSWORD: "" + #CASSERVER_SA_API_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/client/client.truststore + #CASSERVER_SA_API_CLIENT_AUTH_TRUSTSTORE_PASSWORD: "" + + - #ipaddr - IPADDR_API_URL: http://ipaddr.ipaddr.svc.cluster.local:9090/v1/find - - + AUTHX_LOG_ENABLED: "true" + AUTHX_LOG_RABBITMQ_HOST: rabbitmq-server.authx-service.svc.cluster.local + AUTHX_LOG_RABBITMQ_PORT: "5672" + AUTHX_LOG_RABBITMQ_USERNAME: guest + AUTHX_LOG_RABBITMQ_PASSWORD: guest + + LOGGING_LEVEL_COM_SUPWISDOM_GOA: INFO LOGGING_LEVEL_COM_SUPWISDOM_INSTITUTE_GOA_COMMON_LOG: INFO