diff --git a/GapsWeb/src/main/resources/application.yaml b/GapsWeb/src/main/resources/application.yaml index 8eadd99..add6808 100755 --- a/GapsWeb/src/main/resources/application.yaml +++ b/GapsWeb/src/main/resources/application.yaml @@ -48,6 +48,45 @@ info: version: 0.4.0-SNAPSHOT loginEnabled: true --- +spring: + profiles: ssl-no-login + mvc: + async: + request-timeout: -1 + resources: + cache: + cachecontrol: + max-age: 120 + must-revalidate: true + cache-public: true +logging: + level: + root: INFO +server: + port: 8484 + compression: + enabled: true + mime-types: text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json + min-response-size: 1024 + error: + whitelabel: + enabled: false + http2: + enabled: true + ssl: + key-store-type: PKCS12 + key-store: classpath:keystore/gaps.p12 + key-store-password: gapsgapsgaps + key-alias: gaps +security: + require-ssl: true +info: + app: + name: Gaps + description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course. + version: 0.4.0-SNAPSHOT + loginEnabled: false +--- spring: profiles: no-ssl mvc: diff --git a/GapsWeb/src/test/resources/application.yaml b/GapsWeb/src/test/resources/application.yaml new file mode 100755 index 0000000..b96bf6b --- /dev/null +++ b/GapsWeb/src/test/resources/application.yaml @@ -0,0 +1,17 @@ +#Copyright 2019 Jason H House +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# Maximum time the response should be cached (in seconds) +# The cache must re-validate stale resources with the server. Any expired resources must not be used without re-validating. +# The resources are public and any cache may store the response. +info: + app: + name: Gaps + description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course. + version: 0.4.0-SNAPSHOT + loginEnabled: false \ No newline at end of file diff --git a/build.sh b/build.sh index bb205ff..432d324 100755 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ npm run uglifyjs-payload-js npm run uglifyjs-mislabeled-js mvn clean install spotbugs:check docker build -f Dockerfile -t $DOCKER_LATEST . -docker run -p 8484:8484 -e profile=-Dspring.profiles.active=no-ssl-no-login --name gaps-dev-no-ssl-no-login -v /home/jason/gaps:/usr/data:Z gaps-dev +docker run -p 8484:8484 --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev cypress run docker push $DOCKER_LATEST mkdir -p GapsOnWindows diff --git a/buildVersion.sh b/buildVersion.sh index bef44f2..147549d 100755 --- a/buildVersion.sh +++ b/buildVersion.sh @@ -13,7 +13,7 @@ npm run uglifyjs-payload-js npm run uglifyjs-mislabeled-js mvn clean install spotbugs:check docker build -f Dockerfile -t $DOCKER_LATEST . -docker run -p 8484:8484 -e profile=-Dspring.profiles.active=no-ssl-no-login --name gaps-dev-no-ssl-no-login -v /home/jason/gaps:/usr/data:Z gaps-dev +docker run -p 8484:8484 --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev cypress run docker push $DOCKER_LATEST mkdir -p GapsOnWindows