From bd771c7a15afa116b1f129f44ee1d1d858cdb68e Mon Sep 17 00:00:00 2001 From: dannylamb Date: Thu, 20 Jun 2019 10:20:11 -0300 Subject: [PATCH 1/5] Pulling in changes for 8.7, setting config, and clearing cache afterwards --- .../vagrant/group_vars/webserver/drupal.yml | 4 ++-- post-install.yml | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/inventory/vagrant/group_vars/webserver/drupal.yml b/inventory/vagrant/group_vars/webserver/drupal.yml index 2ac820d9..febcd221 100644 --- a/inventory/vagrant/group_vars/webserver/drupal.yml +++ b/inventory/vagrant/group_vars/webserver/drupal.yml @@ -15,8 +15,8 @@ drupal_composer_dependencies: - "drupal/matomo:^1.7" - "drupal/pdf:1.x-dev" - "islandora/carapace:1.0.0" - - "islandora/islandora_defaults:dev-8.x-1.x" -drupal_composer_project_package: "islandora/drupal-project:8.6.10" + - "islandora/islandora_defaults:dev-url-refactor" +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" drupal_db_user: drupal8 diff --git a/post-install.yml b/post-install.yml index 70b5a753..7b5bf959 100644 --- a/post-install.yml +++ b/post-install.yml @@ -12,17 +12,9 @@ # Some tomfoolery to get the demo module to install. # Subject to https://www.drupal.org/node/2599228 # Should be fixed in Drupal 8.7 - - name: Install islandora_defaults module (fail ok) + - name: Install islandora_defaults module command: "{{ drush_path }} --root {{ drupal_core_path }} -y en islandora_defaults" ignore_errors: yes - - name: Update entities - command: "{{ drush_path }} --root {{ drupal_core_path }} -y entity:updates" - - name: Uninstall islandora_defaults module - command: "{{ drush_path }} --root {{ drupal_core_path }} -y pmu islandora_defaults" - - name: Install islandora_defaults module (should not fail) - command: "{{ drush_path }} --root {{ drupal_core_path }} -y en islandora_defaults" - - name: Import feature - command: "{{ drush_path }} --root {{ drupal_core_path }} -y fim --bundle=islandora islandora_defaults" - name: Add admin to fedoraAdmin role command: "{{ drush_path }} --root {{ drupal_core_path }} -y urol fedoraadmin admin" - name: Install islandora_search @@ -39,6 +31,9 @@ command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml islandora.settings gemini_pseudo_bundles.{{ item.0 }} {{ item.1 }}" with_indexed_items: "{{ drupal_gemini_pseudo_bundles }}" + - name: Set media urls + command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml media.settings standalone_url true" + - name: Run migrations command: "{{ drush_path }} --root {{ drupal_core_path }} -y -l localhost:{{ apache_listen_port }} --userid=1 mim --group=islandora" @@ -64,7 +59,7 @@ group: "{{ webserver_app_user }}" mode: 0775 recurse: yes - + - name: Chown islandora core feature file: dest: "{{ drupal_core_path }}/modules/contrib/islandora/modules/islandora_core_feature" @@ -91,3 +86,7 @@ group: "{{ webserver_app_user }}" mode: 0775 recurse: yes + + - name: Clear cache + command: "{{ drush_path }} --root {{ drupal_core_path }} -y cr" + From 008175e3f69ccdefb7ce427fdce8d50ac3f3891e Mon Sep 17 00:00:00 2001 From: dannylamb Date: Thu, 20 Jun 2019 16:18:58 -0300 Subject: [PATCH 2/5] Update post-install.yml --- post-install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/post-install.yml b/post-install.yml index 7b5bf959..c87f0583 100644 --- a/post-install.yml +++ b/post-install.yml @@ -14,7 +14,7 @@ # Should be fixed in Drupal 8.7 - name: Install islandora_defaults module command: "{{ drush_path }} --root {{ drupal_core_path }} -y en islandora_defaults" - ignore_errors: yes + - name: Add admin to fedoraAdmin role command: "{{ drush_path }} --root {{ drupal_core_path }} -y urol fedoraadmin admin" - name: Install islandora_search From d4c4b730f5a0026291d1d5322412e55485c41aad Mon Sep 17 00:00:00 2001 From: dannylamb Date: Thu, 20 Jun 2019 16:20:10 -0300 Subject: [PATCH 3/5] Update post-install.yml --- post-install.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/post-install.yml b/post-install.yml index c87f0583..bf47d562 100644 --- a/post-install.yml +++ b/post-install.yml @@ -9,9 +9,7 @@ vagrant_user: "{% if ansible_os_family == 'RedHat' %}vagrant{% else %}ubuntu{% endif %}" tasks: - # Some tomfoolery to get the demo module to install. - # Subject to https://www.drupal.org/node/2599228 - # Should be fixed in Drupal 8.7 + - name: Install islandora_defaults module command: "{{ drush_path }} --root {{ drupal_core_path }} -y en islandora_defaults" From dc0b4859eb895564a75986738e8c39d5e9041dc7 Mon Sep 17 00:00:00 2001 From: dannylamb Date: Tue, 25 Jun 2019 14:53:47 -0300 Subject: [PATCH 4/5] Un-derping --- post-install.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/post-install.yml b/post-install.yml index bf47d562..ad4f5bb7 100644 --- a/post-install.yml +++ b/post-install.yml @@ -13,8 +13,12 @@ - name: Install islandora_defaults module command: "{{ drush_path }} --root {{ drupal_core_path }} -y en islandora_defaults" + - name: Import feature + command: "{{ drush_path }} --root {{ drupal_core_path }} -y fim --bundle=islandora islandora_defaults" + - name: Add admin to fedoraAdmin role command: "{{ drush_path }} --root {{ drupal_core_path }} -y urol fedoraadmin admin" + - name: Install islandora_search command: "{{ drush_path }} --root {{ drupal_core_path }} -y en islandora_search" From 5944161aa2345f24088f142c33339c91b5b78195 Mon Sep 17 00:00:00 2001 From: dannylamb Date: Tue, 25 Jun 2019 17:19:24 -0300 Subject: [PATCH 5/5] 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 febcd221..e87141e5 100644 --- a/inventory/vagrant/group_vars/webserver/drupal.yml +++ b/inventory/vagrant/group_vars/webserver/drupal.yml @@ -15,7 +15,7 @@ drupal_composer_dependencies: - "drupal/matomo:^1.7" - "drupal/pdf:1.x-dev" - "islandora/carapace:1.0.0" - - "islandora/islandora_defaults:dev-url-refactor" + - "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"