Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
memoriav
Memobase 2020
services
postprocessing
Fedora Metadata Extractor
Commits
404ed424
Commit
404ed424
authored
Jul 21, 2020
by
Jonas Waeber
Browse files
Fix configuration
parent
17e25bde
Pipeline
#11781
passed with stages
in 4 minutes and 46 seconds
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
helm-charts/values.yaml
View file @
404ed424
...
...
@@ -9,6 +9,6 @@ tag: "latest"
deploymentName
:
fedora-metadata-extractor
kafkaConfigs
:
prod-kafka-bootstrap-servers
fedoraConfigs
:
prod-
fedora-
config
s
fedoraConfigs
:
fedora-
admin-credential
s
outputTopic
:
fedora-output
inputTopic
:
fedora-events
\ No newline at end of file
src/main/kotlin/KafkaTopology.kt
View file @
404ed424
...
...
@@ -50,14 +50,7 @@ class KafkaTopology(
private
val
objectMapper
=
ObjectMapper
().
registerKotlinModule
()
private
val
fedora
=
FedoraClientImpl
.
builder
()
.
urls
(
settings
.
appSettings
.
getProperty
(
"fedora.internalDomain"
),
settings
.
appSettings
.
getProperty
(
"fedora.externalDomain"
)
)
.
credentials
(
settings
.
appSettings
.
getProperty
(
"fedora.user"
),
settings
.
appSettings
.
getProperty
(
"fedora.password"
)
)
.
properties
(
settings
.
appSettings
)
.
build
()
fun
build
():
Topology
{
...
...
src/main/kotlin/Service.kt
View file @
404ed424
...
...
@@ -27,10 +27,10 @@ class Service(file: String = "app.yml") {
val
settings
=
SettingsLoader
(
listOf
(
"fedora.user"
,
"fedora.user
name
"
,
"fedora.password"
,
"fedora.internal
Domain
"
,
"fedora.external
Domain
"
"fedora.internal
BaseUrl
"
,
"fedora.external
BaseUrl
"
),
file
,
useStreamsConfig
=
true
...
...
src/main/resources/app.yml
View file @
404ed424
app
:
fedora
:
user
:
${FEDORA_USER:?system}
user
name
:
${FEDORA_USER:?system}
password
:
${FEDORA_PASSWORD:?system}
internal
Domain
:
${FEDORA_INTERNAL_
DOMAIN
:?system}
external
Domain
:
${FEDORA_EXTERNAL_
DOMAIN
:?system}
internal
BaseUrl
:
${FEDORA_INTERNAL_
BASE_URL
:?system}
external
BaseUrl
:
${FEDORA_EXTERNAL_
BASE_URL
:?system}
kafka
:
streams
:
bootstrap.servers
:
${KAFKA_BOOTSTRAP_SERVERS:?system}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment