diff --git a/src/main/resources/config/application-gui.properties b/src/main/resources/config/application-gui.properties index 55aa7396..8e729d65 100644 --- a/src/main/resources/config/application-gui.properties +++ b/src/main/resources/config/application-gui.properties @@ -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} \ No newline at end of file +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} \ No newline at end of file diff --git a/src/main/resources/config/sql/base/V4__insert_data_v1_1.sql b/src/main/resources/config/sql/base/V4__insert_data_v1_1.sql index 575cb0f2..9b12fa23 100644 --- a/src/main/resources/config/sql/base/V4__insert_data_v1_1.sql +++ b/src/main/resources/config/sql/base/V4__insert_data_v1_1.sql @@ -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') - ; - - - \ No newline at end of file + ; \ No newline at end of file