From bb5f0c0198a919ecf7ae9a06f208b5283b6321f6 Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 9 Jun 2020 17:34:25 +0200 Subject: [PATCH] splitted application.properties to ws and gui profiles --- .../config/application-gui.properties | 26 ++++++ .../config/application-ws.properties | 54 ++++++++++++ .../resources/config/application.properties | 82 ------------------- 3 files changed, 80 insertions(+), 82 deletions(-) create mode 100644 src/main/resources/config/application-gui.properties create mode 100644 src/main/resources/config/application-ws.properties diff --git a/src/main/resources/config/application-gui.properties b/src/main/resources/config/application-gui.properties new file mode 100644 index 00000000..e5662679 --- /dev/null +++ b/src/main/resources/config/application-gui.properties @@ -0,0 +1,26 @@ +########################################################## +### SEB Server GUI configuration + +# theme +sebserver.gui.theme=css/sebserver.css +sebserver.gui.list.page.size=20 +sebserver.gui.defaultLogo=classpath:/static/images/sebserver-logo.png + +# User Account +sebserver.gui.self-registering=true +sebserver.gui.multilingual=false +sebserver.gui.supported.languages=en +sebserver.gui.date.displayformat=de + +# GUI API +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 +sebserver.gui.webservice.mock-lms-enabled=true +sebserver.gui.seb.client.config.download.filename=SEBServerSettings.seb +sebserver.gui.seb.exam.config.download.filename=SEBExamSettings.seb + diff --git a/src/main/resources/config/application-ws.properties b/src/main/resources/config/application-ws.properties new file mode 100644 index 00000000..559f1061 --- /dev/null +++ b/src/main/resources/config/application-ws.properties @@ -0,0 +1,54 @@ +########################################################## +### SEB Server Webservice configuration + +sebserver.test.property=This is the default/root configuration + +### webservice initialization +sebserver.init.adminaccount.gen-on-init=true +sebserver.init.organisation.name=SEB Server +sebserver.init.adminaccount.username=sebserver-admin + +### webservice data source configuration +spring.datasource.username=root +spring.datasource.initialize=true +spring.datasource.initialization-mode=always +spring.datasource.url=jdbc:mariadb://${datastore.mariadb.server.address}:${datastore.mariadb.server.port}/SEBServer?useSSL=false&createDatabaseIfNotExist=true +spring.flyway.enabled=true +spring.flyway.locations=classpath:config/sql/base +spring.flyway.cleanDisabled=true +spring.datasource.driver-class-name=org.mariadb.jdbc.Driver +spring.datasource.hikari.initializationFailTimeout=3000 +spring.datasource.hikari.connectionTimeout=30000 +spring.datasource.hikari.idleTimeout=600000 +spring.datasource.hikari.maxLifetime=1800000 + +### webservice security +spring.datasource.password=${sebserver.mariadb.password} +sebserver.webservice.api.admin.clientSecret=${sebserver.password} +sebserver.webservice.internalSecret=${sebserver.password} + +### webservice networking +sebserver.webservice.distributed=false +sebserver.webservice.http.external.scheme=https +sebserver.webservice.http.external.servername= +sebserver.webservice.http.external.port= +sebserver.webservice.http.redirect.gui=/gui + +### webservice API +sebserver.webservice.api.admin.clientId=guiClient +sebserver.webservice.api.admin.endpoint=/admin-api/v1 +sebserver.webservice.api.admin.accessTokenValiditySeconds=3600 +sebserver.webservice.api.admin.refreshTokenValiditySeconds=25200 +sebserver.webservice.api.exam.config.init.permittedProcesses=config/initialPermittedProcesses.xml +sebserver.webservice.api.exam.config.init.prohibitedProcesses=config/initialProhibitedProcesses.xml +sebserver.webservice.api.exam.endpoint=/exam-api +sebserver.webservice.api.exam.endpoint.discovery=${sebserver.webservice.api.exam.endpoint}/discovery +sebserver.webservice.api.exam.endpoint.v1=${sebserver.webservice.api.exam.endpoint}/v1 +sebserver.webservice.api.exam.accessTokenValiditySeconds=3600 +sebserver.webservice.api.exam.event-handling-strategy=SINGLE_EVENT_STORE_STRATEGY +sebserver.webservice.api.exam.enable-indicator-cache=true +sebserver.webservice.api.pagination.maxPageSize=500 +# comma separated list of known possible OpenEdX API access token request endpoints +sebserver.webservice.lms.openedx.api.token.request.paths=/oauth2/access_token +sebserver.webservice.lms.moodle.api.token.request.paths=/login/token.php +sebserver.webservice.lms.address.alias= \ No newline at end of file diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties index 865d7213..f53b0aa1 100644 --- a/src/main/resources/config/application.properties +++ b/src/main/resources/config/application.properties @@ -54,85 +54,3 @@ security.require-ssl=false # Disable this if a redirect is done by a reverse proxy for example sebserver.ssl.redirect.enabled=false sebserver.ssl.redirect.html.port=8080 - -########################################################## -### SEB Server Webservice configuration - -sebserver.test.property=This is the default/root configuration - -### webservice initialization -sebserver.init.adminaccount.gen-on-init=true -sebserver.init.organisation.name=SEB Server -sebserver.init.adminaccount.username=sebserver-admin - -### webservice data source configuration -spring.datasource.username=root -spring.datasource.initialize=true -spring.datasource.initialization-mode=always -spring.datasource.url=jdbc:mariadb://${datastore.mariadb.server.address}:${datastore.mariadb.server.port}/SEBServer?useSSL=false&createDatabaseIfNotExist=true -spring.flyway.enabled=true -spring.flyway.locations=classpath:config/sql/base -spring.flyway.cleanDisabled=true -spring.datasource.driver-class-name=org.mariadb.jdbc.Driver -spring.datasource.hikari.initializationFailTimeout=3000 -spring.datasource.hikari.connectionTimeout=30000 -spring.datasource.hikari.idleTimeout=600000 -spring.datasource.hikari.maxLifetime=1800000 - -### webservice security -spring.datasource.password=${sebserver.mariadb.password} -sebserver.webservice.api.admin.clientSecret=${sebserver.password} -sebserver.webservice.internalSecret=${sebserver.password} - -### webservice networking -sebserver.webservice.distributed=false -sebserver.webservice.http.external.scheme=https -sebserver.webservice.http.external.servername= -sebserver.webservice.http.external.port= -sebserver.webservice.http.redirect.gui=/gui - -### webservice API -sebserver.webservice.api.admin.clientId=guiClient -sebserver.webservice.api.admin.endpoint=/admin-api/v1 -sebserver.webservice.api.admin.accessTokenValiditySeconds=3600 -sebserver.webservice.api.admin.refreshTokenValiditySeconds=25200 -sebserver.webservice.api.exam.config.init.permittedProcesses=config/initialPermittedProcesses.xml -sebserver.webservice.api.exam.config.init.prohibitedProcesses=config/initialProhibitedProcesses.xml -sebserver.webservice.api.exam.endpoint=/exam-api -sebserver.webservice.api.exam.endpoint.discovery=${sebserver.webservice.api.exam.endpoint}/discovery -sebserver.webservice.api.exam.endpoint.v1=${sebserver.webservice.api.exam.endpoint}/v1 -sebserver.webservice.api.exam.accessTokenValiditySeconds=3600 -sebserver.webservice.api.exam.event-handling-strategy=SINGLE_EVENT_STORE_STRATEGY -sebserver.webservice.api.exam.enable-indicator-cache=true -sebserver.webservice.api.pagination.maxPageSize=500 -# comma separated list of known possible OpenEdX API access token request endpoints -sebserver.webservice.lms.openedx.api.token.request.paths=/oauth2/access_token -sebserver.webservice.lms.moodle.api.token.request.paths=/login/token.php -sebserver.webservice.lms.address.alias= - -########################################################## -### SEB Server GUI configuration - -# theme -sebserver.gui.theme=css/sebserver.css -sebserver.gui.list.page.size=20 -sebserver.gui.defaultLogo=classpath:/static/images/sebserver-logo.png - -# User Account -sebserver.gui.self-registering=true -sebserver.gui.multilingual=false -sebserver.gui.supported.languages=en -sebserver.gui.date.displayformat=de - -# GUI API -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 -sebserver.gui.webservice.mock-lms-enabled=true -sebserver.gui.seb.client.config.download.filename=SEBServerSettings.seb -sebserver.gui.seb.exam.config.download.filename=SEBExamSettings.seb -