christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into keycloak

Browse Source 
# Conflicts:
#	build.gradle
#	src/main/resources/application.properties
This commit is contained in:
Mahgs
2020-03-04 14:00:56 +01:00
parent ec69171458 cd18fa8cb4
commit 4d29d93fd5
5 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/application.properties
View File

@ -9,6 +9,9 @@ spring.datasource.username=root
spring.datasource.password=geheim
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
spring.security.user.name=root
spring.security.user.password=1234
spring.security.user.roles=ADMIN
keycloak.principal-attribute=preferred_username
keycloak.auth-server-url=https://keycloak.cs.hhu.de/auth