From 1663b208141630d3e62284a1f5936c38bd980099 Mon Sep 17 00:00:00 2001
From: dannylamb <dlamb@islandora.ca>
Date: Fri, 17 Aug 2018 16:10:41 -0300
Subject: [PATCH] Flysystem Install (#72)

* Workaround for content_translation columns not getting added when importing config

* First pass at flysystem install

* Installing now

* Adding alpaca config and removing temp modules for composer and drush

* Bumping crayfish external role version in requirements.yml
---
 inventory/vagrant/group_vars/karaf.yml        | 21 ++++++++++++++-----
 inventory/vagrant/group_vars/tomcat.yml       |  2 ++
 requirements.yml                              |  2 +-
 roles/internal/webserver-app/tasks/drupal.yml |  8 +++++++
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/inventory/vagrant/group_vars/karaf.yml b/inventory/vagrant/group_vars/karaf.yml
index 984ca4df..792e8ebb 100644
--- a/inventory/vagrant/group_vars/karaf.yml
+++ b/inventory/vagrant/group_vars/karaf.yml
@@ -1,19 +1,30 @@
 ---
 
 alpaca_settings:
+  - pid: ca.islandora.alpaca.http.client
+    settings:
+      token.value: islandora
   - pid: ca.islandora.alpaca.connector.broadcast
     settings:
       input.stream: activemq:queue:islandora-connector-broadcast
   - pid: ca.islandora.alpaca.indexing.triplestore
     settings:
       error.maxRedeliveries: 10
-      input.stream: activemq:queue:islandora-indexing-triplestore
+      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
   - pid: ca.islandora.alpaca.indexing.fcrepo
     settings:
-      error.maxRedeliveries: 10
-      content.stream: activemq:queue:islandora-indexing-fcrepo-content
-      file.stream: activemq:queue:islandora-indexing-fcrepo-file
+      error.maxRedeliveries: 5
+      node.stream: activemq:queue:islandora-indexing-fcrepo-content
+      node.delete.stream: activemq:queue:islandora-indexing-fcrepo-delete
       media.stream: activemq:queue:islandora-indexing-fcrepo-media
-      delete.stream: activemq:queue:islandora-indexing-fcrepo-delete
+      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/
+  - pid: ca.islandora.alpaca.connector.houdini
+    settings:
+      error.maxRedeliveries: 10
+      in.stream: activemq:queue:islandora-connector-houdini
+      houdini.convert.url: http://localhost:8000/houdini/convert
diff --git a/inventory/vagrant/group_vars/tomcat.yml b/inventory/vagrant/group_vars/tomcat.yml
index 571fad1b..db367ec2 100644
--- a/inventory/vagrant/group_vars/tomcat.yml
+++ b/inventory/vagrant/group_vars/tomcat.yml
@@ -55,3 +55,5 @@ cantaloupe_processor_jp2: OpenJpegProcessor
 cantaloupe_cache_source: FilesystemCache
 cantaloupe_cache_derivative: FilesystemCache
 cantaloupe_create_FilesystemCache_dir: yes
+cantaloupe_resolver_static: HttpResolver
+cantaloupe_HttpResolver_BasicLookupStrategy_url_prefix: http://localhost:8000/
diff --git a/requirements.yml b/requirements.yml
index e14dae46..a554e519 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -59,7 +59,7 @@
 
 - src: https://github.com/Islandora-Devops/ansible-role-crayfish
   name: Islandora-Devops.crayfish
-  version: 0.0.3
+  version: 0.0.4
 
 - src: https://github.com/Islandora-Devops/ansible-role-drupal-openseadragon
   name: Islandora-Devops.drupal-openseadragon
diff --git a/roles/internal/webserver-app/tasks/drupal.yml b/roles/internal/webserver-app/tasks/drupal.yml
index 5ef65950..812d1ad7 100644
--- a/roles/internal/webserver-app/tasks/drupal.yml
+++ b/roles/internal/webserver-app/tasks/drupal.yml
@@ -9,6 +9,14 @@
         '{{ host }}',
       {% endfor %}
       );
+      $settings['flysystem'] = [
+        'fedora' => [
+          'driver' => 'fedora',
+          'config' => [
+            'root' => 'http://localhost:8080/fcrepo/rest/',
+          ],
+        ],
+      ];
     path: "{{ drupal_trusted_hosts_file }}"
     marker: // {mark} ANSIBLE MANAGED BLOCK