Skip to content

Commit 12393cf

Browse files
committed
Migrated to yml file for PDP
1 parent b2def9a commit 12393cf

File tree

3 files changed

+131
-106
lines changed

3 files changed

+131
-106
lines changed

roles/pdp/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
group: root
1616
mode: "0644"
1717
with_items:
18-
- serverapplication.properties
18+
- serverapplication.yml
1919
- logback.xml
2020
- xacml.conext.properties
2121
notify: restart pdpserver
@@ -38,8 +38,8 @@
3838
state: started
3939
networks: "{{ pdp_docker_networks }}"
4040
mounts:
41-
- source: /opt/openconext/pdp/serverapplication.properties
42-
target: /application.properties
41+
- source: /opt/openconext/pdp/serverapplication.yml
42+
target: /application.yml
4343
type: bind
4444
- source: /opt/openconext/pdp/logback.xml
4545
target: /logback.xml

roles/pdp/templates/serverapplication.properties.j2

Lines changed: 0 additions & 103 deletions
This file was deleted.
Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
spring:
2+
flyway:
3+
enabled: {{ pdp_spring_flyway_enabled }}
4+
table: schema_version
5+
validate-on-migrate: 'false'
6+
mail:
7+
host: {{ smtp_server }}
8+
port: 25
9+
profiles:
10+
active: {{ pdp.spring_profiles_active }}
11+
datasource:
12+
password: {{ pdp.db_password }}
13+
url: jdbc:mariadb://{{ pdp.db_host }}/{{ pdp.db_name }}?socketTimeout=30000
14+
driverClassName: org.mariadb.jdbc.Driver
15+
username: {{ pdp.db_user }}
16+
mvc:
17+
dispatch-options-request: 'true'
18+
security:
19+
oauth2:
20+
client:
21+
registration:
22+
voot:
23+
client-id: {{ pdp_oauth2_clientid }}
24+
client-secret: {{ pdp_client_secret }}
25+
authorization-grant-type: client_credentials
26+
scope: {{ pdp_manage_provision_oidcrp_scopes }}
27+
provider:
28+
voot:
29+
token-uri: {{ pdp_oauth2_token_url }}
30+
invalid:
31+
policies:
32+
email:
33+
to: {{ pdp_invalid_policies_error_mail_to }}
34+
xacml:
35+
properties:
36+
path: file:///xacml.conext.properties
37+
email:
38+
base_url: https://pdp.{{ base_domain }}/conflicts
39+
to: {{ error_mail_to }}
40+
from: {{ pdp_email_from }}
41+
voot:
42+
serviceUrl: https://voot.{{ base_domain }}
43+
sab:
44+
password: {{ aa.sab_rest_password }}
45+
userName: {{ aa.sab_rest_username }}
46+
endpoint: {{ aa.sab_rest_endpoint }}
47+
policies:
48+
cachePolicies: {{ pdp.cache_policies }}
49+
manage:
50+
pushTestMode: {{ pdp_manage_push_testmode }}
51+
username: pdp
52+
password: {{ manage_pdp_secret }}
53+
manageBaseUrl: https://manage.{{ base_domain }}
54+
policy:
55+
enforcement:
56+
point:
57+
user:
58+
password: {{ pdp.password }}
59+
name: {{ pdp.username }}
60+
include:
61+
aggregated:
62+
attributes: 'true'
63+
base:
64+
dir: file:///xacml-policies
65+
violation:
66+
retention:
67+
period:
68+
days: '30'
69+
session-timeout: '28800'
70+
# Log configuration
71+
logging:
72+
config: "file:///logback.xml"
73+
endpoints:
74+
health:
75+
sensitive: 'false'
76+
enabled: 'true'
77+
enabled: 'false'
78+
info:
79+
enabled: 'true'
80+
pdpCronJobResponsible: {{ pdp_cronjobmaster }}
81+
server:
82+
error:
83+
path: /error
84+
port: '8080'
85+
servlet:
86+
context-path:
87+
performance:
88+
pre:
89+
policy:
90+
loader:
91+
count: '0'
92+
period:
93+
policies:
94+
refresh:
95+
minutes: '1'
96+
loa:
97+
levels: {{ stepup_loa_values_supported | join(",") }}
98+
provision:
99+
policies:
100+
directory: provision-policies
101+
management:
102+
endpoints:
103+
web:
104+
exposure:
105+
include: "health,info,prometheus"
106+
base-path: "/internal"
107+
endpoint:
108+
info:
109+
access: unrestricted
110+
health:
111+
access: unrestricted
112+
show-details: when_authorized
113+
prometheus:
114+
access: unrestricted
115+
show-details: always
116+
mappings:
117+
access: none
118+
metrics:
119+
access: unrestricted
120+
info:
121+
git:
122+
mode: full
123+
124+
# used by the git plugin
125+
info:
126+
build:
127+
artifact: "@project.artifactId@"
128+
version: "@project.version@"

0 commit comments

Comments
 (0)