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

install for content-modeing-overhaul branches of everything #66

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ VAGRANTFILE_API_VERSION = "2"
Vagrant.require_version ">= 1.8.5", "<= 2.0.1"

$cpus = ENV.fetch("ISLANDORA_VAGRANT_CPUS", "1")
$memory = ENV.fetch("ISLANDORA_VAGRANT_MEMORY", "3072")
$memory = ENV.fetch("ISLANDORA_VAGRANT_MEMORY", "4096")
$hostname = ENV.fetch("ISLANDORA_VAGRANT_HOSTNAME", "claw")
$virtualBoxDescription = ENV.fetch("ISLANDORA_VAGRANT_VIRTUALBOXDESCRIPTION", "IslandoraCLAW")

Expand Down
18 changes: 11 additions & 7 deletions inventory/vagrant/group_vars/webserver/drupal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ drupal_composer_dependencies:
- "drupal/devel:^1.0@beta"
- "drupal/rdfui:1.x-dev"
- "drupal/restui:^1.13"
- "drupal/media_entity:^1.6"
- "drupal/media_entity_image:^1.2"
- "drupal/search_api_solr:1.0.0"
- "drupal/facets:1.x-dev"
- "islandora/carapace:dev-8.x-1.x"
- "islandora/islandora_image:dev-8.x-1.x"
drupal_composer_project_package: "islandora/drupal-project:8.4"
- "drupal/jwt:1.0.0-alpha6"
# Comment this back in once code gets merged and is available on packagist
# - "islandora/islandora:dev-8.x-1.x"
# - "islandora/openseadragon:dev-8.x-1.x"
# - "islandora/islandora_image:dev-8.x-1.x"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dannylamb I think we are up-to-date in packagist. These can be uncommented now.

drupal_composer_project_package: "islandora/drupal-project:8.5"
drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
drupal_core_path: "{{ drupal_composer_install_dir }}/web"
drupal_db_user: drupal8
Expand All @@ -34,14 +36,16 @@ drupal_enable_modules:
- rest
- simpletest
- restui
- media_entity
- media_entity_image
- devel
- search_api
- islandora_image
- search_api_solr
- search_api_solr_defaults
- facets
- jwt
# Comment this back in once code gets merged and is available on packagist
# - islandora_feature
# - islandora_openseadragon
# - islandora_image_feature
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto

drupal_trusted_hosts:
- ^localhost$
drupal_trusted_hosts_file: "{{ drupal_core_path }}/sites/default/settings.php"
Expand Down

This file was deleted.

5 changes: 0 additions & 5 deletions roles/internal/webserver-app/files/filehash.settings.yml

This file was deleted.

28 changes: 0 additions & 28 deletions roles/internal/webserver-app/files/rest.resource.entity.file.yml

This file was deleted.

40 changes: 0 additions & 40 deletions roles/internal/webserver-app/files/rest.resource.entity.media.yml

This file was deleted.

40 changes: 0 additions & 40 deletions roles/internal/webserver-app/files/rest.resource.entity.node.yml

This file was deleted.

26 changes: 13 additions & 13 deletions roles/internal/webserver-app/tasks/drupal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,20 @@
owner: "{{ webserver_app_user }}"
group: "{{ webserver_app_user }}"

- name: Copy drupal config
copy:
src: "."
dest: "{{ webserver_app_drupal_config_path }}/"
mode: "0644"
owner: "{{ webserver_app_user }}"
group: "{{ webserver_app_user }}"
register: drupal_config
#- name: Import features
# command: "{{ drush_path }} -y fim --bundle=islandora islandora_feature,islandora_openseadragon,islandora_image_feature"
# args:
# chdir: "{{ drupal_core_path }}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should/Can this be re-enabled?


- name: Install config
command: "{{ drush_path }} config-import -y --partial --source={{ webserver_app_drupal_config_path }}"
args:
chdir: "{{ drupal_core_path }}"
when: drupal_config.changed is defined and drupal_config.changed
#- name: Run tag migrations
# command: "{{ drush_path }} -y mim --group=islandora"
# args:
# chdir: "{{ drupal_core_path }}"

#- name: Index tags
# command: "{{ drush_path }} -y php:eval 'array_walk(\\Drupal::service('entity_type.manager')->getStorage('taxonomy_term')->loadMultiple(), function($term) { $term->save(); });'"
# args:
# chdir: "{{ drupal_core_path }}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto re: re-enabling.


- name: Set default solr server to point to CLAW core
command: "{{ drush_path }} -y config-set search_api.server.default_solr_server backend_config.connector_config.core CLAW"
Expand Down