From 2f6bfbe28ec5e92b73b8458ca5346403efcf17c5 Mon Sep 17 00:00:00 2001 From: Natkeeran Date: Thu, 11 Jul 2019 15:24:20 -0400 Subject: [PATCH 1/4] make is easy to configure this via inventory --- defaults/main.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f07bbcd..b91ebce 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -25,6 +25,12 @@ alpaca_karaf_deploy_dir: "{{ alpaca_karaf_dir }}/deploy" alpaca_karaf_user: karaf alpaca_local_mvn_path: /opt/maven/repo +alpaca_triplestore_base_url: http://localhost:8080/bigdata +alpaca_milliner_base_url: http://localhost:8000/milliner/ +alpaca_gemini_base_url: http://localhost:8000/gemini/ +alpaca_houdini_base_url: http://localhost:8000/houdini/convert +alpaca_homarus_base_url: http://localhost:8000/homarus/convert + alpaca_settings: - pid: ca.islandora.alpaca.http.client settings: @@ -33,13 +39,13 @@ alpaca_settings: settings: input.stream: activemq:topic:fedora triplestore.reindex.stream: activemq:queue:triplestore.reindex - triplestore.baseUrl: http://localhost:8080/bigdata/namespace/islandora/sparql + triplestore.baseUrl: "{{ alpaca_triplestore_base_url }}/namespace/islandora/sparql" - pid: ca.islandora.alpaca.indexing.triplestore settings: error.maxRedeliveries: 10 index.stream: activemq:queue:islandora-indexing-triplestore-index delete.stream: activemq:queue:islandora-indexing-triplestore-delete - triplestore.baseUrl: http://localhost:8080/bigdata/namespace/islandora/sparql + triplestore.baseUrl: "{{ alpaca_triplestore_base_url }}/namespace/islandora/sparql" - pid: ca.islandora.alpaca.indexing.fcrepo settings: error.maxRedeliveries: 5 @@ -48,17 +54,17 @@ alpaca_settings: media.stream: activemq:queue:islandora-indexing-fcrepo-media file.stream: activemq:queue:islandora-indexing-fcrepo-file file.delete.stream: activemq:queue:islandora-indexing-fcrepo-file-delete - milliner.baseUrl: http://localhost:8000/milliner/ - gemini.baseUrl: http://localhost:8000/gemini/ + milliner.baseUrl: "{{ alpaca_milliner_base_url }}" + gemini.baseUrl: "{{ alpaca_gemini_base_url }}" alpaca_blueprint_settings: - pid: ca.islandora.alpaca.connector.houdini in_stream: activemq:queue:islandora-connector-houdini - derivative_service_url: http://localhost:8000/houdini/convert + derivative_service_url: "{{ alpaca_houdini_base_url }}" error_max_redeliveries: 5 camel_context_id: IslandoraConnectorHoudini - pid: ca.islandora.alpaca.connector.homarus in_stream: activemq:queue:islandora-connector-homarus - derivative_service_url: http://localhost:8000/homarus/convert + derivative_service_url: "{{ alpaca_homarus_base_url }}" error_max_redeliveries: 5 camel_context_id: IslandoraConnectorHomarus From 8af8e2576a53b5a08b43843a6aacd4a34cd806c3 Mon Sep 17 00:00:00 2001 From: Natkeeran Date: Mon, 15 Jul 2019 16:31:16 -0400 Subject: [PATCH 2/4] Update main.yml --- defaults/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b91ebce..617bb0b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -26,10 +26,10 @@ alpaca_karaf_user: karaf alpaca_local_mvn_path: /opt/maven/repo alpaca_triplestore_base_url: http://localhost:8080/bigdata -alpaca_milliner_base_url: http://localhost:8000/milliner/ -alpaca_gemini_base_url: http://localhost:8000/gemini/ +alpaca_milliner_base_url: http://localhost:8000/milliner +alpaca_gemini_base_url: http://localhost:8000/gemini alpaca_houdini_base_url: http://localhost:8000/houdini/convert -alpaca_homarus_base_url: http://localhost:8000/homarus/convert +alpaca_homarus_base_url: http://localhost:8000/homarus alpaca_settings: - pid: ca.islandora.alpaca.http.client @@ -60,11 +60,11 @@ alpaca_settings: alpaca_blueprint_settings: - pid: ca.islandora.alpaca.connector.houdini in_stream: activemq:queue:islandora-connector-houdini - derivative_service_url: "{{ alpaca_houdini_base_url }}" + derivative_service_url: "{{ alpaca_houdini_base_url }}/convert" error_max_redeliveries: 5 camel_context_id: IslandoraConnectorHoudini - pid: ca.islandora.alpaca.connector.homarus in_stream: activemq:queue:islandora-connector-homarus - derivative_service_url: "{{ alpaca_homarus_base_url }}" + derivative_service_url: "{{ alpaca_homarus_base_url }}/convert" error_max_redeliveries: 5 camel_context_id: IslandoraConnectorHomarus From 7f21c4412fd893a295a7e4e703500ebedbc97893 Mon Sep 17 00:00:00 2001 From: Natkeeran Date: Mon, 15 Jul 2019 16:39:32 -0400 Subject: [PATCH 3/4] Update main.yml --- defaults/main.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 617bb0b..cb09518 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -25,11 +25,12 @@ alpaca_karaf_deploy_dir: "{{ alpaca_karaf_dir }}/deploy" alpaca_karaf_user: karaf alpaca_local_mvn_path: /opt/maven/repo -alpaca_triplestore_base_url: http://localhost:8080/bigdata -alpaca_milliner_base_url: http://localhost:8000/milliner -alpaca_gemini_base_url: http://localhost:8000/gemini -alpaca_houdini_base_url: http://localhost:8000/houdini/convert -alpaca_homarus_base_url: http://localhost:8000/homarus +triplestore_namespace: islandora +triplestore_base_url: http://localhost:8080/bigdata +milliner_base_url: http://localhost:8000/milliner +gemini_base_url: http://localhost:8000/gemini +houdini_base_url: http://localhost:8000/houdini +homarus_base_url: http://localhost:8000/homarus alpaca_settings: - pid: ca.islandora.alpaca.http.client @@ -39,13 +40,13 @@ alpaca_settings: settings: input.stream: activemq:topic:fedora triplestore.reindex.stream: activemq:queue:triplestore.reindex - triplestore.baseUrl: "{{ alpaca_triplestore_base_url }}/namespace/islandora/sparql" + triplestore.baseUrl: "{{ triplestore_base_url }}/namespace/{{ triplestore_namespace }}/sparql" - pid: ca.islandora.alpaca.indexing.triplestore settings: error.maxRedeliveries: 10 index.stream: activemq:queue:islandora-indexing-triplestore-index delete.stream: activemq:queue:islandora-indexing-triplestore-delete - triplestore.baseUrl: "{{ alpaca_triplestore_base_url }}/namespace/islandora/sparql" + triplestore.baseUrl: "{{ triplestore_base_url }}/namespace/{{ triplestore_namespace }}/sparql" - pid: ca.islandora.alpaca.indexing.fcrepo settings: error.maxRedeliveries: 5 @@ -54,17 +55,17 @@ alpaca_settings: media.stream: activemq:queue:islandora-indexing-fcrepo-media file.stream: activemq:queue:islandora-indexing-fcrepo-file file.delete.stream: activemq:queue:islandora-indexing-fcrepo-file-delete - milliner.baseUrl: "{{ alpaca_milliner_base_url }}" - gemini.baseUrl: "{{ alpaca_gemini_base_url }}" + milliner.baseUrl: "{{ milliner_base_url }}" + gemini.baseUrl: "{{ gemini_base_url }}" alpaca_blueprint_settings: - pid: ca.islandora.alpaca.connector.houdini in_stream: activemq:queue:islandora-connector-houdini - derivative_service_url: "{{ alpaca_houdini_base_url }}/convert" + derivative_service_url: "{{ houdini_base_url }}/convert" error_max_redeliveries: 5 camel_context_id: IslandoraConnectorHoudini - pid: ca.islandora.alpaca.connector.homarus in_stream: activemq:queue:islandora-connector-homarus - derivative_service_url: "{{ alpaca_homarus_base_url }}/convert" + derivative_service_url: "{{ homarus_base_url }}/convert" error_max_redeliveries: 5 camel_context_id: IslandoraConnectorHomarus From cbe3d2c4f5f674565f97ec40c5e924d9fd030778 Mon Sep 17 00:00:00 2001 From: Natkeeran Date: Tue, 16 Jul 2019 11:04:26 -0400 Subject: [PATCH 4/4] Update main.yml --- defaults/main.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index cb09518..8b914cf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -26,11 +26,11 @@ alpaca_karaf_user: karaf alpaca_local_mvn_path: /opt/maven/repo triplestore_namespace: islandora -triplestore_base_url: http://localhost:8080/bigdata -milliner_base_url: http://localhost:8000/milliner -gemini_base_url: http://localhost:8000/gemini -houdini_base_url: http://localhost:8000/houdini -homarus_base_url: http://localhost:8000/homarus +alpaca_triplestore_base_url: http://localhost:8080/bigdata +alpaca_milliner_base_url: http://localhost:8000/milliner +alpaca_gemini_base_url: http://localhost:8000/gemini +alpaca_houdini_base_url: http://localhost:8000/houdini +alpaca_homarus_base_url: http://localhost:8000/homarus alpaca_settings: - pid: ca.islandora.alpaca.http.client @@ -40,13 +40,13 @@ alpaca_settings: settings: input.stream: activemq:topic:fedora triplestore.reindex.stream: activemq:queue:triplestore.reindex - triplestore.baseUrl: "{{ triplestore_base_url }}/namespace/{{ triplestore_namespace }}/sparql" + triplestore.baseUrl: "{{ alpaca_triplestore_base_url }}/namespace/{{ triplestore_namespace }}/sparql" - pid: ca.islandora.alpaca.indexing.triplestore settings: error.maxRedeliveries: 10 index.stream: activemq:queue:islandora-indexing-triplestore-index delete.stream: activemq:queue:islandora-indexing-triplestore-delete - triplestore.baseUrl: "{{ triplestore_base_url }}/namespace/{{ triplestore_namespace }}/sparql" + triplestore.baseUrl: "{{ alpaca_triplestore_base_url }}/namespace/{{ triplestore_namespace }}/sparql" - pid: ca.islandora.alpaca.indexing.fcrepo settings: error.maxRedeliveries: 5 @@ -55,17 +55,17 @@ alpaca_settings: media.stream: activemq:queue:islandora-indexing-fcrepo-media file.stream: activemq:queue:islandora-indexing-fcrepo-file file.delete.stream: activemq:queue:islandora-indexing-fcrepo-file-delete - milliner.baseUrl: "{{ milliner_base_url }}" - gemini.baseUrl: "{{ gemini_base_url }}" + milliner.baseUrl: "{{ alpaca_milliner_base_url }}" + gemini.baseUrl: "{{ alpaca_gemini_base_url }}" alpaca_blueprint_settings: - pid: ca.islandora.alpaca.connector.houdini in_stream: activemq:queue:islandora-connector-houdini - derivative_service_url: "{{ houdini_base_url }}/convert" + derivative_service_url: "{{ alpaca_houdini_base_url }}/convert" error_max_redeliveries: 5 camel_context_id: IslandoraConnectorHoudini - pid: ca.islandora.alpaca.connector.homarus in_stream: activemq:queue:islandora-connector-homarus - derivative_service_url: "{{ homarus_base_url }}/convert" + derivative_service_url: "{{ alpaca_homarus_base_url }}/convert" error_max_redeliveries: 5 camel_context_id: IslandoraConnectorHomarus