Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PL-52: Address Domain Mismatches #12

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ If you update Vagrant, you may need to update your vagrant plugins with `vagrant
6. Build the `/src` directory and symlink modules there to make development easier: `phing init`
7. Visit your D8 (standalone) site at [http://d8.fs-demo.local](http://d8.fs-demo.local)
8. Visit your D8 (domain access) site at:
- [http://fs-demo.d8-1.local](http://d8-1.fs-demo.local)
- [http://d8-1.fs-demo.local](http://d8-1.fs-demo.local)
- [http://d8-2.fs-demo.local](http://d8-2.fs-demo.local)
- [http://d8-3.fs-demo.local](http://d8-3.fs-demo.local)
- These sites are for future use, as Domain support has not yet been ported to D8.
Expand Down
20 changes: 10 additions & 10 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,15 @@

<phingcall target="install-drupal-at-root" />

<!-- Import config to fix rogue blocks changing UUIDs -->
<drush command="config-import" assume="yes" root="${build.dir}/${drupal.root}" uri="${drupal.uri}"/>

<!-- Rebuild node acces permissions. No direct drush command for this
as per https://www.drupal.org/project/devel/issues/2677218#comment-10907984 -->
<drush command="php-eval" root="${build.dir}/${drupal.root}" uri="${drupal.uri}">
<param>'node_access_rebuild();'</param>
</drush>

<!-- Uninstall the module -->
<drush command="pm-uninstall" assume="yes" root="${build.dir}/${drupal.root}" uri="${drupal.uri}">
<param>demo_umami_content</param>
Expand All @@ -116,22 +125,13 @@
<drush command="pm-uninstall" assume="yes" root="${build.dir}/${drupal.root}" uri="${drupal.uri}">
<param>federated_terms</param>
</drush>
<!-- Index content in Solr -->
<drush command="sapi-c" assume="yes" root="${build.dir}/${drupal.root}" uri="${drupal.uri}">
<param>federated_search</param>
</drush>
<drush command="sapi-i" assume="yes" root="${build.dir}/${drupal.root}" uri="${drupal.uri}">
<param>federated_search</param>
</drush>

<!-- Import config to fix rogue blocks changing UUIDs -->
<drush command="config-import" assume="yes" root="${build.dir}/${drupal.root}" uri="${drupal.uri}"/>

<!-- Rebuild node acces permissions. No direct drush command for this
as per https://www.drupal.org/project/devel/issues/2677218#comment-10907984 -->
<drush command="php-eval" root="${build.dir}/${drupal.root}" uri="${drupal.uri}">
<param>'node_access_rebuild();'</param>
</drush>

</target>

<!-- Target: install -->
Expand Down
2 changes: 1 addition & 1 deletion conf/build.d7.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ drupal.database.host=127.0.0.1
drupal.settings.file_public_path=sites/default/files
drupal.settings.file_private_path=
drupal.twig.debug=
drupal.uri=http://fs-demo.d7.local
drupal.uri=http://d7.fs-demo.local
drupal.hash_salt=528a2e810ba1473af9118387b9ebb9fbe5634047cff5ab3bb29cc360dbf25c7a
drupal.root=web/d7/docroot
2 changes: 1 addition & 1 deletion conf/build.d8-domain.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ drupal.database.host=127.0.0.1
drupal.settings.file_public_path=sites/default/files
drupal.settings.file_private_path=
drupal.twig.debug=
drupal.uri=http://fs-demo.d8-1.local
drupal.uri=http://d8-1.fs-demo.local
drupal.hash_salt=528a2e810ba1473af9118387b9ebb9fbe5634047cff5ab3bb29cc360dbf25c7a
drupal.root=web/d8-domain/docroot
drupal.config_sync_directory=../../../config/sites/d8
2 changes: 1 addition & 1 deletion conf/build.d8.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ drupal.database.host=127.0.0.1
drupal.settings.file_public_path=sites/default/files
drupal.settings.file_private_path=
drupal.twig.debug=
drupal.uri=http://fs-demo.d8.local
drupal.uri=http://d8.fs-demo.local
drupal.hash_salt=528a2e810ba1473af9118387b9ebb9fbe5634047cff5ab3bb29cc360dbf25c7a
drupal.root=web/d8/docroot
drupal.config_sync_directory=../../../config/sites/d8
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
uuid: 334fdced-7b87-420b-9226-14b7d787d61b
langcode: en
status: true
dependencies:
config:
- search_api.server.local_solr
module:
- search_api
- search_api_federated_solr
- search_api_field_map
- node
id: federated_search_index
name: 'Federated Search Index'
description: ''
read_only: false
field_settings:
federated_date:
label: 'Federated Date'
property_path: mapped_field
type: date
configuration:
field_data:
node:
article: '[node:created:custom:Y-m-d\TH:i:s\Z]'
page: '[node:created:custom:Y-m-d\TH:i:s\Z]'
recipe: '[node:created:custom:Y-m-d\TH:i:s\Z]'
federated_image:
label: 'Federated Image'
property_path: mapped_field
type: string
configuration:
field_data:
node:
article: '[node:field_image:search_api_federated_solr_image:url]'
page: '[node:field_image:search_api_federated_solr_image:url]'
recipe: '[node:field_image:search_api_federated_solr_image:url]'
federated_terms:
label: 'Federated Terms'
property_path: mapped_terms
type: string
federated_title:
label: 'Federated Title'
property_path: mapped_field
type: string
configuration:
field_data:
node:
article: '[node:title]'
page: '[node:title]'
recipe: '[node:title]'
federated_type:
label: 'Federated Type'
property_path: mapped_field
type: string
configuration:
field_data:
node:
article: Article
page: Page
recipe: Recipe
rendered_item:
label: 'Rendered HTML output'
property_path: rendered_item
type: text
configuration:
roles:
anonymous: anonymous
view_mode:
'entity:node':
article: default
page: default
recipe: default
site_name:
label: 'Site Name'
property_path: site_name
type: string
configuration:
site_name: 'Federated Search Demo (D8, domain access)'
url:
label: URI
property_path: search_api_url
type: string
urls:
label: Urls
property_path: search_api_urls
type: string
datasource_settings:
'entity:node':
bundles:
default: true
selected: { }
languages:
default: true
selected: { }
processor_settings:
add_url: { }
aggregated_field: { }
entity_status: { }
federated_terms: { }
html_filter:
all_fields: false
fields:
- rendered_item
title: false
alt: false
tags:
b: 2
em: 1
h1: 5
h2: 3
h3: 2
strong: 2
u: 1
weights:
preprocess_index: -15
preprocess_query: -15
mapped_field: { }
mapped_terms: { }
rendered_item: { }
search_api_urls: { }
site_name: { }
tracker_settings:
default:
indexing_order: fifo
options:
index_directly: true
cron_limit: 50
server: local_solr
6 changes: 6 additions & 0 deletions config/config_split/d8-domain/search_api_solr.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
last_optimize: 0
index_prefix: ''
cron_action: spellcheck
site_hash: jbhd7f
_core:
default_config_hash: pBaH11SiBiDulMHrEUo_lI1kk4-8FpdEfuoHTXskMu0