From f2a4c88ff2aa1d9447b9db3adc325129f21c6e6d Mon Sep 17 00:00:00 2001 From: Lucas Alber Date: Thu, 28 Oct 2021 10:32:24 +0200 Subject: [PATCH] Move demo into own directory --- README.md | 6 ++--- demo/application.yml | 23 +++++++++++++++++++ .../credentials/idp-certificate.crt | 0 .../credentials/rp-certificate.crt | 0 .../credentials/rp-private.key | 0 {news => demo/news}/News Item 1.csv | 0 {news => demo/news}/News Item 2.csv | 0 {news => demo/news}/News Item 3.csv | 0 {news => demo/news}/News Item 4.csv | 0 {news => demo/news}/News Item 5.csv | 0 src/main/resources/application.yml | 20 ++++++++-------- 11 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 demo/application.yml rename {src/main/resources => demo}/credentials/idp-certificate.crt (100%) rename {src/main/resources => demo}/credentials/rp-certificate.crt (100%) rename {src/main/resources => demo}/credentials/rp-private.key (100%) rename {news => demo/news}/News Item 1.csv (100%) rename {news => demo/news}/News Item 2.csv (100%) rename {news => demo/news}/News Item 3.csv (100%) rename {news => demo/news}/News Item 4.csv (100%) rename {news => demo/news}/News Item 5.csv (100%) diff --git a/README.md b/README.md index a45a19d..4d41b6b 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ # Docker ```bash # Run the following commands to build a docker image -./gradlew build docker build -t repository/tag . -# Map a custom application.yml into /config and a news folder to /news. For example: -docker run -p 8080:8080 -v path/to/news:/news -v path/to/src/main/resources:/config repository/tag +# Newslist gets executed at /usr/src/newslist/news.jar +# Map a custom application.yml into /usr/src/newslist/config. For example: +docker run -p 8080:8080 -v $(pwd)/demo/:/usr/src/newslist/config/ repository/tag ``` \ No newline at end of file diff --git a/demo/application.yml b/demo/application.yml new file mode 100644 index 0000000..8c30295 --- /dev/null +++ b/demo/application.yml @@ -0,0 +1,23 @@ +spring: + security: + saml2: + relyingparty: + registration: + one: + signing.credentials: + - private-key-location: file:/usr/src/newslist/config/credentials/rp-private.key + certificate-location: file:/usr/src/newslist/config/credentials/rp-certificate.crt + identityprovider: + metadata-uri: https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php + +news: + # path to csv files containing (key, message) pairs + csv-path: /usr/src/newslist/config/news + # One of http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.Predefined.html + csv-format: Default + # The saml2 attribute used as key + saml2-key: uid + +logging.level: + org.springframework.security: TRACE + edu.kit: DEBUG diff --git a/src/main/resources/credentials/idp-certificate.crt b/demo/credentials/idp-certificate.crt similarity index 100% rename from src/main/resources/credentials/idp-certificate.crt rename to demo/credentials/idp-certificate.crt diff --git a/src/main/resources/credentials/rp-certificate.crt b/demo/credentials/rp-certificate.crt similarity index 100% rename from src/main/resources/credentials/rp-certificate.crt rename to demo/credentials/rp-certificate.crt diff --git a/src/main/resources/credentials/rp-private.key b/demo/credentials/rp-private.key similarity index 100% rename from src/main/resources/credentials/rp-private.key rename to demo/credentials/rp-private.key diff --git a/news/News Item 1.csv b/demo/news/News Item 1.csv similarity index 100% rename from news/News Item 1.csv rename to demo/news/News Item 1.csv diff --git a/news/News Item 2.csv b/demo/news/News Item 2.csv similarity index 100% rename from news/News Item 2.csv rename to demo/news/News Item 2.csv diff --git a/news/News Item 3.csv b/demo/news/News Item 3.csv similarity index 100% rename from news/News Item 3.csv rename to demo/news/News Item 3.csv diff --git a/news/News Item 4.csv b/demo/news/News Item 4.csv similarity index 100% rename from news/News Item 4.csv rename to demo/news/News Item 4.csv diff --git a/news/News Item 5.csv b/demo/news/News Item 5.csv similarity index 100% rename from news/News Item 5.csv rename to demo/news/News Item 5.csv diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 44fcf05..bbb0c92 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,21 +3,21 @@ spring: saml2: relyingparty: registration: - one: - signing.credentials: - - private-key-location: classpath:credentials/rp-private.key - certificate-location: classpath:credentials/rp-certificate.crt - identityprovider: - metadata-uri: https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php + # somerelayingpartyname: # This decides on the callback url! + # signing.credentials: + # - private-key-location: # file:path/to/private.key + # certificate-location: # file:path/to/certificate.crt + # identityprovider: + # metadata-uri: # https://../metadata.php news: # path to csv files containing (key, message) pairs - csv-path: news/ + csv-path: # Path to the csv files # One of http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.Predefined.html csv-format: Default # The saml2 attribute used as key - saml2-key: uid + saml2-key: # the saml2 key to use as key in csv files logging.level: - org.springframework.security: TRACE - edu.kit: DEBUG + org.springframework.security: WARN + edu.kit: WARN