zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/development' into development_VDI

Browse source
This commit is contained in:
anhefti 2021-02-11 15:13:05 +01:00
commit 08e82ee899
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/resources/config/application-gui.properties
View file

@ -16,10 +16,12 @@ sebserver.gui.date.displayformat=de
sebserver.gui.http.external.scheme=${sebserver.webservice.http.external.scheme}
sebserver.gui.http.external.servername=${sebserver.webservice.http.external.servername}
sebserver.gui.http.external.port=${sebserver.webservice.http.external.port}
sebserver.gui.http.webservice.scheme=https
sebserver.gui.http.webservice.servername=localhost
sebserver.gui.http.webservice.port=8080
sebserver.gui.entrypoint=/gui
sebserver.gui.webservice.protocol=http
sebserver.gui.webservice.address=localhost
sebserver.gui.webservice.port=8080
sebserver.gui.webservice.apipath=${sebserver.webservice.api.admin.endpoint}
# defines the polling interval that is used to poll the webservice for client connection data on a monitored exam page
sebserver.gui.webservice.poll-interval=1000
@ -39,4 +41,9 @@ sebserver.webservice.api.exam.endpoint.discovery=${sebserver.webservice.api.exam
sebserver.webservice.http.redirect.gui=${sebserver.gui.entrypoint}
sebserver.webservice.api.admin.endpoint=/admin-api/v1
sebserver.webservice.api.admin.clientId=guiClient
sebserver.webservice.api.admin.clientSecret=${sebserver.password}
sebserver.webservice.api.admin.clientSecret=${sebserver.password}
# NOTE: this is for convinience to have the same as in webservice (ws)
sebserver.gui.webservice.protocol=${sebserver.gui.http.webservice.scheme}
sebserver.gui.webservice.address=${sebserver.gui.http.webservice.servername}
sebserver.gui.webservice.port=${sebserver.gui.http.webservice.port}

11
src/main/resources/config/sql/base/V4__insert_data_v1_1.sql
View file

@ -1,6 +1,6 @@
INSERT INTO view (name, columns, position, template_id) VALUES
('proctoring', 12, 12, 0);
SET @proct_view_id = LAST_INSERT_ID();
@ -39,9 +39,9 @@ INSERT IGNORE INTO configuration_attribute VALUES
(1132, 'jitsiMeetSendAudio', 'CHECKBOX', null, null, null, null, 'true'),
(1133, 'jitsiMeetSendVideo', 'CHECKBOX', null, null, null, null, 'true')
;
UPDATE orientation SET width='4' WHERE id='68';
INSERT IGNORE INTO orientation (config_attribute_id, template_id, view_id, group_id, x_position, y_position, width, height, title) VALUES
(942, 0, 5, 'quitLink', 4, 5, 4, 1, 'NONE'),
@ -74,7 +74,4 @@ INSERT IGNORE INTO orientation (config_attribute_id, template_id, view_id, group
(1125, 0, @proct_view_id, 'ai_faces_angle', 0, 11, 6, 1, 'NONE'),
(1124, 0, @proct_view_id, 'ai_faces_angle', 0, 12, 6, 1, 'NONE'),
(1121, 0, @proct_view_id, 'ai_faces_angle', 0, 13, 6, 1, 'NONE')
;
;