Skip to content

Commit

Permalink
Tweaking config exports.
Browse files Browse the repository at this point in the history
  • Loading branch information
alxp committed Jul 19, 2024
1 parent 1a3d029 commit db354cc
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 58 deletions.
3 changes: 0 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
99 changes: 50 additions & 49 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions config/sync/islandora.settings.yml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion config/sync/key.key.islandora_rsa_key.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: { }
2 changes: 1 addition & 1 deletion config/sync/media.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/sync/views.view.iiif_manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ display:
type: mini
options:
offset: 0
pagination_heading_level: h4
items_per_page: 10
total_pages: null
id: 0
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions config/sync/views.view.search_in_hocr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 10
total_pages: null
id: 0
Expand Down

0 comments on commit db354cc

Please sign in to comment.