From ab6db5ec5eec5fe14978d1de31f5b89653e7a43e Mon Sep 17 00:00:00 2001 From: dannylamb Date: Thu, 26 Sep 2019 10:59:34 -0300 Subject: [PATCH 1/8] Paged content config --- inventory/vagrant/group_vars/webserver/drupal.yml | 10 ++++++++-- post-install.yml | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/inventory/vagrant/group_vars/webserver/drupal.yml b/inventory/vagrant/group_vars/webserver/drupal.yml index fee28fa6..9183cf8e 100644 --- a/inventory/vagrant/group_vars/webserver/drupal.yml +++ b/inventory/vagrant/group_vars/webserver/drupal.yml @@ -14,8 +14,10 @@ drupal_composer_dependencies: - "drupal/content_browser:^1.0@alpha" - "drupal/matomo:^1.7" - "drupal/pdf:1.x-dev" + - "drupal/admin_toolbar:^2.0" + - "drupal/rest_oai_pmh:^1.0" - "islandora/carapace:1.0.0" - - "islandora/islandora_defaults:dev-8.x-1.x" + - "islandora/islandora_defaults:dev-paged-content-config" drupal_composer_project_package: "islandora/drupal-project:8.7" drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction" drupal_core_path: "{{ drupal_composer_install_dir }}/web" @@ -43,8 +45,12 @@ drupal_enable_modules: - content_browser - matomo - pdf - - islandora_core_feature + - admin_toolbar + - islandora_defaults - controlled_access_terms_defaults + - islandora_breadcrumbs + - islandora_iiif + - islandora_oaipmh drupal_trusted_hosts: - ^localhost$ - "{{ hostvars[groups['webserver'][0]].ansible_host }}" diff --git a/post-install.yml b/post-install.yml index 8c309247..d3317c85 100644 --- a/post-install.yml +++ b/post-install.yml @@ -10,10 +10,7 @@ tasks: - - name: Install islandora_defaults module - command: "{{ drush_path }} --root {{ drupal_core_path }} -y en islandora_defaults" - - - name: Import feature + - name: Import features command: "{{ drush_path }} --root {{ drupal_core_path }} -y fim --bundle=islandora islandora_defaults" - name: Add admin to fedoraAdmin role @@ -36,6 +33,9 @@ - name: Set media urls command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml media.settings standalone_url true" + - name: Set iiif url + command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml islandora_iiif.settings iiif_server {{ openseadragon_iiiv_server }}" + - name: Run migrations command: "{{ drush_path }} --root {{ drupal_core_path }} -y -l localhost:{{ apache_listen_port }} --userid=1 mim --group=islandora" From 81a370df398a6d404870282aa40a64d45ca56abc Mon Sep 17 00:00:00 2001 From: dannylamb Date: Thu, 26 Sep 2019 12:45:10 -0300 Subject: [PATCH 2/8] Setting up sequence mode and the reference strip --- post-install.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/post-install.yml b/post-install.yml index d3317c85..ce6ed0b0 100644 --- a/post-install.yml +++ b/post-install.yml @@ -36,6 +36,12 @@ - name: Set iiif url command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml islandora_iiif.settings iiif_server {{ openseadragon_iiiv_server }}" + - name: Set sequence mode + command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml openseadragon.settings viewer_options.sequenceMode 1" + + - name: Set horizontal strip + command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml openseadragon.settings viewer_options.showReferenceStrip 1" + - name: Run migrations command: "{{ drush_path }} --root {{ drupal_core_path }} -y -l localhost:{{ apache_listen_port }} --userid=1 mim --group=islandora" From 779a0c96443f5f82555478f88675cb084ff79b54 Mon Sep 17 00:00:00 2001 From: dannylamb Date: Sun, 29 Sep 2019 16:57:44 -0300 Subject: [PATCH 3/8] Testing autodetecting sequence mode --- post-install.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/post-install.yml b/post-install.yml index ce6ed0b0..d3317c85 100644 --- a/post-install.yml +++ b/post-install.yml @@ -36,12 +36,6 @@ - name: Set iiif url command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml islandora_iiif.settings iiif_server {{ openseadragon_iiiv_server }}" - - name: Set sequence mode - command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml openseadragon.settings viewer_options.sequenceMode 1" - - - name: Set horizontal strip - command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml openseadragon.settings viewer_options.showReferenceStrip 1" - - name: Run migrations command: "{{ drush_path }} --root {{ drupal_core_path }} -y -l localhost:{{ apache_listen_port }} --userid=1 mim --group=islandora" From ff50c3a7dd473a0093ad137990138c02f190eab3 Mon Sep 17 00:00:00 2001 From: dannylamb Date: Sun, 29 Sep 2019 20:22:15 -0300 Subject: [PATCH 4/8] Missed an inventory var --- inventory/vagrant/group_vars/webserver/drupal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/vagrant/group_vars/webserver/drupal.yml b/inventory/vagrant/group_vars/webserver/drupal.yml index 9183cf8e..03c45348 100644 --- a/inventory/vagrant/group_vars/webserver/drupal.yml +++ b/inventory/vagrant/group_vars/webserver/drupal.yml @@ -65,4 +65,4 @@ drupal_gemini_pseudo_bundles: - file:media - audio:media - video:media -openseadragon_composer_item: "islandora/openseadragon:dev-8.x-1.x" +openseadragon_composer_item: "islandora/openseadragon:dev-paged-content-config" From fc63c03408d6c7cf3abcad036c7265c1cc29a962 Mon Sep 17 00:00:00 2001 From: dannylamb Date: Tue, 1 Oct 2019 15:32:40 -0300 Subject: [PATCH 5/8] Using new theme with better dependencies --- inventory/vagrant/group_vars/webserver/drupal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/vagrant/group_vars/webserver/drupal.yml b/inventory/vagrant/group_vars/webserver/drupal.yml index 03c45348..557a3485 100644 --- a/inventory/vagrant/group_vars/webserver/drupal.yml +++ b/inventory/vagrant/group_vars/webserver/drupal.yml @@ -16,7 +16,7 @@ drupal_composer_dependencies: - "drupal/pdf:1.x-dev" - "drupal/admin_toolbar:^2.0" - "drupal/rest_oai_pmh:^1.0" - - "islandora/carapace:1.0.0" + - "islandora/carapace:dev-paged-content-config" - "islandora/islandora_defaults:dev-paged-content-config" drupal_composer_project_package: "islandora/drupal-project:8.7" drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction" From e39bc7dec75a12e6af66b968d1826545dd9d04dc Mon Sep 17 00:00:00 2001 From: dannylamb Date: Wed, 2 Oct 2019 12:40:52 -0300 Subject: [PATCH 6/8] Setting iiif view in post-install.yml for better caching --- post-install.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/post-install.yml b/post-install.yml index d3317c85..cef67aa9 100644 --- a/post-install.yml +++ b/post-install.yml @@ -36,6 +36,9 @@ - name: Set iiif url command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml islandora_iiif.settings iiif_server {{ openseadragon_iiiv_server }}" + - name: Set iiif manifest view + command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml openseadragon.settings manifest_view iiif_manifest" + - name: Run migrations command: "{{ drush_path }} --root {{ drupal_core_path }} -y -l localhost:{{ apache_listen_port }} --userid=1 mim --group=islandora" From ae0ea1b847dc88f35109821374ab0951cb92dd11 Mon Sep 17 00:00:00 2001 From: dannylamb Date: Wed, 2 Oct 2019 16:37:41 -0300 Subject: [PATCH 7/8] Pointing back to 8.x branches --- inventory/vagrant/group_vars/webserver/drupal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/vagrant/group_vars/webserver/drupal.yml b/inventory/vagrant/group_vars/webserver/drupal.yml index 557a3485..2aa3b192 100644 --- a/inventory/vagrant/group_vars/webserver/drupal.yml +++ b/inventory/vagrant/group_vars/webserver/drupal.yml @@ -16,8 +16,8 @@ drupal_composer_dependencies: - "drupal/pdf:1.x-dev" - "drupal/admin_toolbar:^2.0" - "drupal/rest_oai_pmh:^1.0" - - "islandora/carapace:dev-paged-content-config" - - "islandora/islandora_defaults:dev-paged-content-config" + - "islandora/carapace:dev-8.x-3.x" + - "islandora/islandora_defaults:dev-8.x-1.x" drupal_composer_project_package: "islandora/drupal-project:8.7" drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction" drupal_core_path: "{{ drupal_composer_install_dir }}/web" From c7b67366141f76b30529828f7d314ba27212ef0e Mon Sep 17 00:00:00 2001 From: dannylamb Date: Thu, 3 Oct 2019 12:13:58 -0300 Subject: [PATCH 8/8] Update drupal.yml --- inventory/vagrant/group_vars/webserver/drupal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/vagrant/group_vars/webserver/drupal.yml b/inventory/vagrant/group_vars/webserver/drupal.yml index 2aa3b192..7a1c1fb6 100644 --- a/inventory/vagrant/group_vars/webserver/drupal.yml +++ b/inventory/vagrant/group_vars/webserver/drupal.yml @@ -65,4 +65,4 @@ drupal_gemini_pseudo_bundles: - file:media - audio:media - video:media -openseadragon_composer_item: "islandora/openseadragon:dev-paged-content-config" +openseadragon_composer_item: "islandora/openseadragon:dev-8.x-1.x"