diff --git a/src/main/assembly/dist/cfg/config.yml b/src/main/assembly/dist/cfg/config.yml index a44fc09..edd02c3 100644 --- a/src/main/assembly/dist/cfg/config.yml +++ b/src/main/assembly/dist/cfg/config.yml @@ -11,6 +11,25 @@ server: - type: http port: 20361 +dataverse: + baseUrl: 'http://localhost:8080' + apiKey: 'changeme' + awaitLockStateMaxNumberOfRetries: 30 + awaitLockStateMillisecondsBetweenRetries: 500 + httpClient: + timeout: 30s + connectionTimeout: 15s + connectionRequestTimeout: 15s + timeToLive: 1h + retries: 2 + userAgent: dd-dataverse-ingest + +ingest: + inbox: /var/opt/dans.knaw.nl/tmp/import/inbox + outbox: /var/opt/dans.knaw.nl/tmp/import/outbox + +tempDir: /var/opt/dans.knaw.nl/tmp/zip-wrapping + # # See https://www.dropwizard.io/en/latest/manual/configuration.html#logging # diff --git a/src/test/resources/debug-etc/config.yml b/src/test/resources/debug-etc/config.yml index 308a10a..4564fec 100644 --- a/src/test/resources/debug-etc/config.yml +++ b/src/test/resources/debug-etc/config.yml @@ -11,7 +11,7 @@ server: dataverse: baseUrl: 'http://dev.archaeology.datastations.nl:8080' - apiKey: '93423e09-848c-47cb-a979-219dafcfa4da' + apiKey: 'changeme' unblockKey: 's3kretKey' awaitLockStateMaxNumberOfRetries: 30 awaitLockStateMillisecondsBetweenRetries: 500 @@ -24,8 +24,8 @@ dataverse: userAgent: dd-dataverse-ingest ingest: - inbox: data/inbox - outbox: data/outbox + inbox: data/imports/inbox + outbox: data/imports/outbox tempDir: data/tmp diff --git a/src/test/resources/debug-etc/db.properties b/src/test/resources/debug-etc/db.properties deleted file mode 100644 index adbe299..0000000 --- a/src/test/resources/debug-etc/db.properties +++ /dev/null @@ -1,4 +0,0 @@ -# Start this database with the start-hsqldb.sh command from dans-dev-tools. -# Note that you need to add the dependency org.hsqldb:hsqldb to your pom.xml for this to work. -server.database.0=file:data/database/dd-dataverse-ingest -server.dbname.0=dd-dataverse-ingest