Skip to content

Commit 0ded8c2

Browse files
committed
iam-voms-aa: update application.yml to use environment variables
- Current version cannot be used out of the shelf - Be consistent with variable already used for the login service - Add variables VOMS_AA_HOST, VOMS_AA_PORT, VOMS_AA_VO and VOMS_AA_USE_LEGACY_FQAN_ENCODING specific to VOMS AA
1 parent e38c73c commit 0ded8c2

File tree

1 file changed

+29
-34
lines changed

1 file changed

+29
-34
lines changed
Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,41 @@
1-
#
2-
# Copyright (c) Istituto Nazionale di Fisica Nucleare (INFN). 2016-2021
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
#
16-
171
server:
18-
address: localhost
19-
port: 15000
2+
address: 0.0.0.0
3+
port: 8080
4+
use-forward-headers: true
205
max-http-header-size: 16000
21-
22-
6+
237
spring:
24-
flyway:
25-
table: schema_version
26-
278
main:
28-
banner-mode: "off"
29-
allow-circular-references: true
9+
banner-mode: "off"
3010

3111
jpa:
32-
open-in-view: false
12+
open-in-view: true
13+
14+
datasource:
15+
dataSourceClassName: com.mysql.jdbc.jdbc2.optional.MysqlDataSource
16+
url: jdbc:mysql://${IAM_DB_HOST}:${IAM_DB_PORT:3306}/${IAM_DB_NAME}?useLegacyDatetimeCode=false&serverTimezone=UTC&useSSL=false
17+
username: ${IAM_DB_USERNAME}
18+
password: ${IAM_DB_PASSWORD}
19+
max-active: ${IAM_DB_MAX_ACTIVE:10}
20+
max-idle: ${IAM_DB_MAX_IDLE:5}
21+
initial-size: ${IAM_DB_INITIAL_SIZE:1}
22+
test-while-idle: ${IAM_DB_TEST_WHILE_IDLE:true}
23+
test-on-borrow: ${IAM_DB_TEST_ON_BORROW:true}
24+
validation-query: ${IAM_DB_VALIDATION_QUERY:SELECT 1}
25+
time-between-eviction-runs-millis: ${IAM_DB_TIME_BETWEEN_EVICTION_RUNS_MILLIS:5000}
26+
min-evictable-idle-time-millis: ${IAM_DB_MIN_EVICTABLE_IDLE_TIME_MILLIS:60000}
3327

28+
flyway:
29+
enabled: false
30+
3431
voms:
3532
tls:
36-
certificate-path: /etc/grid-security/voms/hostcert.pem
37-
private-key-path: /etc/grid-security/voms/hostkey.pem
33+
certificate-path: /certs/hostcert.pem
34+
private-key-path: /certs/hostkey.pem
3835
trust-anchors-dir: /etc/grid-security/certificates
3936
trust-anchors-refresh-interval-secs: 14400
4037
aa:
41-
host: ${server.address}
42-
port: ${server.port}
43-
vo-name: test
44-
optional-group-label: wlcg.optional-group
45-
voms-role-label: voms.role
46-
use-legacy-fqan-encoding: false
38+
host: ${VOMS_AA_HOST:undefined}
39+
port: ${VOMS_AA_PORT:undefined}
40+
vo-name: ${VOMS_AA_VO:undefined}
41+
use-legacy-fqan-encoding: ${VOMS_AA_USE_LEGACY_FQAN_ENCODING:true}

0 commit comments

Comments
 (0)