From 7b91a2c26a677db769d40da8bcd328e5259c4d4d Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Wed, 6 Jul 2016 19:49:44 +0200
Subject: [PATCH] Sync test configuration
---
src/test/resources/arsnova.properties.example | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index b9bd4b789..ee1bab973 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -64,13 +64,14 @@ security.authentication.login-try-limit=50
# Guest authentication
#
security.guest.enabled=true
+security.guest.allowed-roles=speaker,student
security.guest.order=0
-security.guest.lecturer.enabled=true
# Setup combined login if you want to use a single, customized login page
# which is used for multiple authentication services.
#
security.custom-login.enabled=false
+security.custom-login.allowed-roles=speaker,student
security.custom-login.title=University
security.custom-login.login-dialog-path=
security.custom-login.image=
@@ -88,6 +89,7 @@ security.custom-login.order=0
# replaced by the value of activation-path.
#
security.user-db.enabled=true
+security.user-db.allowed-roles=speaker,student
security.user-db.title=ARSnova
security.user-db.login-dialog-path=account.html
security.user-db.activation-path=account.html
@@ -111,6 +113,7 @@ security.user-db.reset-password-mail.body=You requested to reset your \
# server. {0} will be replaced with the user ID by ARSnova.
#
security.ldap.enabled=false
+security.ldap.allowed-roles=speaker,student
security.ldap.title=LDAP
security.ldap.login-dialog-path=login-ldap.html
security.ldap.image=
@@ -128,6 +131,7 @@ security.ldap.user-dn-pattern=uid={0},ou=arsnova
# CAS authentication
#
security.cas.enabled=false
+security.cas.allowed-roles=speaker,student
security.cas.title=CAS
security.cas.image=
security.cas.order=0
@@ -141,6 +145,7 @@ security.cas-server-url=https://example.com/cas
# Facebook
#
security.facebook.enabled=false
+security.facebook.allowed-roles=speaker,student
security.facebook.order=0
security.facebook.key=
security.facebook.secret=
@@ -148,6 +153,7 @@ security.facebook.secret=
# Twitter
#
security.twitter.enabled=false
+security.twitter.allowed-roles=speaker,student
security.twitter.order=0
security.twitter.key=
security.twitter.secret=
@@ -155,6 +161,7 @@ security.twitter.secret=
# Google
#
security.google.enabled=false
+security.google.allowed-roles=speaker,student
security.google.order=0
security.google.key=
security.google.secret=
@@ -223,7 +230,7 @@ question.answer-option-limit=8
# options should be used cautiously since it could lead to display errors.
# Answer options will still not be parsed in diagrams. This setting has no
# effect if neither MathJax nor Markdown are enabled.
-question.parse-answer-option-formatting=true
+question.parse-answer-option-formatting=false
# Demo session id to show above session login button
# You can freely use the demo session of https://arsnova.eu/mobile which can be
--
GitLab