From 5f0daa6c2c951ae65a423e4d6921d1e43270a3e5 Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Fri, 19 Jul 2024 06:56:01 -0300 Subject: [PATCH] Tweaking config exports. --- .gitattributes | 3 --- composer.json | 2 +- config/sync/islandora.settings.yml | 4 ++-- config/sync/key.key.islandora_rsa_key.yml | 2 +- config/sync/media.settings.yml | 2 +- config/sync/views.view.iiif_manifest.yml | 2 +- config/sync/views.view.search_in_hocr.yml | 1 + 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitattributes b/.gitattributes index e7b792f84..76ea8feeb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -42,9 +42,6 @@ *.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.yml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -# PHPStan's baseline uses tabs instead of spaces. -core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php - # Define binary file attributes. # - Do not treat them as text. # - Include binary diff in patches instead of "binary files differ." diff --git a/composer.json b/composer.json index 2da715e2c..bb7953c03 100755 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "drupal/flysystem": "^2.2@alpha", "drupal/fpa": "^4.0", "drupal/hal": "^1.0||^2.0", - "drupal/islandora": "^2", + "drupal/islandora": "^2.12.3", "drupal/islandora_mirador": "^2", "drupal/matomo": "^1.19", "drupal/openseadragon": "^2", diff --git a/config/sync/islandora.settings.yml b/config/sync/islandora.settings.yml index c2131fbed..4b617521f 100644 --- a/config/sync/islandora.settings.yml +++ b/config/sync/islandora.settings.yml @@ -1,11 +1,11 @@ _core: default_config_hash: XgeYJpPmZIOwE_nA73tYvFw-Rcj-HtlbNwfktqSVsaQ -broker_url: 'tcp://activemq:61613' +broker_url: 'tcp://127.0.0.1:61613' jwt_expiry: '+2 hour' delete_media_and_files: true -redirect_after_media_save: false upload_form_location: '' upload_form_allowed_mimetypes: '' +gemini_url: '' gemini_pseudo_bundles: 'islandora_object:node': 'islandora_object:node' 'audio:media': 'audio:media' diff --git a/config/sync/key.key.islandora_rsa_key.yml b/config/sync/key.key.islandora_rsa_key.yml index 9e75e6f06..883398e4c 100644 --- a/config/sync/key.key.islandora_rsa_key.yml +++ b/config/sync/key.key.islandora_rsa_key.yml @@ -12,6 +12,6 @@ key_type_settings: algorithm: RS256 key_provider: file key_provider_settings: - file_location: /opt/keys/jwt/private.key + file_location: /opt/islandora/auth/private.key key_input: none key_input_settings: { } diff --git a/config/sync/media.settings.yml b/config/sync/media.settings.yml index d672e9d06..32d79b30d 100644 --- a/config/sync/media.settings.yml +++ b/config/sync/media.settings.yml @@ -3,4 +3,4 @@ _core: icon_base_uri: 'public://media-icons/generic' iframe_domain: null oembed_providers_url: 'https://oembed.com/providers.json' -standalone_url: true +standalone_url: false diff --git a/config/sync/views.view.iiif_manifest.yml b/config/sync/views.view.iiif_manifest.yml index dde9bee81..82a769411 100644 --- a/config/sync/views.view.iiif_manifest.yml +++ b/config/sync/views.view.iiif_manifest.yml @@ -166,6 +166,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -180,7 +181,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/config/sync/views.view.search_in_hocr.yml b/config/sync/views.view.search_in_hocr.yml index 08b97e3d2..d42e3b8c0 100644 --- a/config/sync/views.view.search_in_hocr.yml +++ b/config/sync/views.view.search_in_hocr.yml @@ -116,6 +116,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0