From 7161a1a9e5842b6f244387e4e1968cab3a9a5447 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Tue, 22 Nov 2016 14:07:28 -0800 Subject: [PATCH] Add additional DOR configuration from deployed configs --- .rubocop.yml | 3 +++ config/initializers/dor_config.rb | 12 +++++++++++- config/settings.yml | 25 +++++++++++++++---------- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 91746e047..2ae06a8d1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -37,3 +37,6 @@ Style/SpaceAroundOperators: # Configuration parameters: AllowURI, URISchemes. Metrics/LineLength: Max: 200 + +Metrics/BlockLength: + Enabled: false diff --git a/config/initializers/dor_config.rb b/config/initializers/dor_config.rb index a03d2b8a2..5dea13224 100644 --- a/config/initializers/dor_config.rb +++ b/config/initializers/dor_config.rb @@ -32,7 +32,6 @@ end metadata do - exist.url Settings.METADATA.EXIST_URL catalog.url Settings.METADATA.CATALOG_URL end @@ -61,6 +60,11 @@ storage_root Settings.STACKS.STORAGE_ROOT host Settings.STACKS.HOST user Settings.STACKS.USER + local_stacks_root Settings.STACKS.LOCAL_STACKS_ROOT + local_document_cache_root Settings.STACKS.LOCAL_DOCUMENT_CACHE_ROOT + local_recent_changes Settings.STACKS.LOCAL_RECENT_CHANGES + url Settings.STACKS.URL + iiif_profile 'http://iiif.io/api/image/2/level1.json' end indexing_svc do @@ -73,6 +77,12 @@ url Settings.SDR_URL end + cleanup do + local_workspace_root Settings.CLEANUP.LOCAL_WORKSPACE_ROOT + local_assembly_root Settings.CLEANUP.LOCAL_ASSEMBLY_ROOT + local_export_home Settings.CLEANUP.LOCAL_EXPORT_HOME + end + dor do service_user Settings.DOR.SERVICE_USER service_password Settings.DOR.SERVICE_PASSWORD diff --git a/config/settings.yml b/config/settings.yml index fde5e9a9b..adc62c651 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -19,27 +19,27 @@ INDEXER: # Metadata METADATA: - EXIST_URL: 'https://user:password@metadata.example.com/exist/rest' CATALOG_URL: 'https://catalog.example.com/catalog/mods' # SSL SSL: - CERT_FILE: 'cert_name.crt' - KEY_FILE: 'key_name.key' + CERT_FILE: "/etc/pki/tls/certs/<%= (`echo $HOSTNAME`).strip.gsub('.stanford.edu', '') %>-dor-prod.crt" + KEY_FILE: "/etc/pki/tls/private/<%= (`echo $HOSTNAME`).strip.gsub('.stanford.edu', '') %>-dor-prod.key" KEY_PASS: 'password' # Stacks STACKS: - DOCUMENT_CACHE_STORAGE_ROOT: '/foo/document_cache' + DOCUMENT_CACHE_STORAGE_ROOT: '/purl/document_cache' DOCUMENT_CACHE_HOST: 'cache.example.com' DOCUMENT_CACHE_USER: 'user' - LOCAL_WORKSPACE_ROOT: '/foo/workspace' - STORAGE_ROOT: '/bar' + LOCAL_WORKSPACE_ROOT: '/dor/workspace' + STORAGE_ROOT: '/stacks' HOST: 'stacks.example.com' USER: 'user' - -# Stomp -STOMP_CLIENT_ID: 'fedora_stomper' + LOCAL_STACKS_ROOT: '/stacks' + LOCAL_DOCUMENT_CACHE_ROOT: '/purl/document_cache' + LOCAL_RECENT_CHANGES: '/purl/recent_changes' + URL: 'https://stacks.stanford.edu' # Suri SURI: @@ -64,6 +64,11 @@ STATUS_INDEXER_URL: 'https://status.example.com/render/?format=json&other=params WORKFLOW_URL: 'https://workflow.example.com/workflow' SDR_URL: 'http://localhost/sdr' +CLEANUP: + LOCAL_WORKSPACE_ROOT: '/dor/workspace' + LOCAL_ASSEMBLY_ROOT: '/dor/assembly' + LOCAL_EXPORT_HOME: '/dor/export' + DOR: SERVICE_USER: 'user' SERVICE_PASSWORD: 'password' @@ -76,7 +81,7 @@ RELEASE: GOOBI: URL: 'http://localhost:9292' DPG_WORKFLOW_NAME: 'goobiWF' - DEFAULT_GOOBI_WORKFLOW_NAME: 'Example Workflow' + DEFAULT_GOOBI_WORKFLOW_NAME: 'Example_Workflow' MAX_TRIES: 3 MAX_SLEEP_SECONDS: 20 BASE_SLEEP_SECONDS: 2