diff --git a/docker/ansible/Dockerfile b/docker/ansible/Dockerfile
index 1ab5c73..281a536 100644
--- a/docker/ansible/Dockerfile
+++ b/docker/ansible/Dockerfile
@@ -6,7 +6,9 @@ ENV ISLANDORA_DISTRO="centos/7" \
WORKDIR /root/playbook
RUN yum -y install epel-release && \
- yum -y install git ansible openssh-clients
+ yum -y install git openssh-clients && \
+ yum -y install python-pip python-dev && \
+ pip install ansible==2.7.10
COPY entrypoint.sh /bin/
diff --git a/inventory/docker/group_vars/webserver/drupal.yml b/inventory/docker/group_vars/webserver/drupal.yml
index 80018b3..62f1ab0 100644
--- a/inventory/docker/group_vars/webserver/drupal.yml
+++ b/inventory/docker/group_vars/webserver/drupal.yml
@@ -6,7 +6,9 @@ drupal_core_owner: "{{ ansible_user }}"
drupal_composer_dependencies:
- "zaporylie/composer-drupal-optimizations:^1.0"
- "drupal/console:~1.0"
+ - "drush/drush:^9.0"
- "drupal/devel:^2.0"
+ - "drupal/features:^3.8"
- "drupal/rdfui:^1.0-beta1"
- "drupal/restui:^1.16"
- "drupal/search_api_solr:^2.0"
@@ -14,9 +16,12 @@ drupal_composer_dependencies:
- "drupal/content_browser:^1.0@alpha"
- "drupal/matomo:^1.7"
- "drupal/pdf:1.x-dev"
+ - "islandora/openseadragon:dev-8.x-1.x"
+ - "islandora/islandora:dev-8.x-1.x"
+ - "islandora/islandora_defaults:dev-8.x-1.x"
+ - "islandora/controlled_access_terms:dev-8.x-1.x"
- "islandora/carapace:1.0.0"
- - "islandora/islandora_defaults:1.0.0"
-drupal_composer_project_package: "islandora/drupal-project:8.6.10"
+drupal_composer_project_package: "islandora/drupal-project:dev-8.x-1.x"
drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
drupal_core_path: "{{ drupal_composer_install_dir }}/web"
drupal_db_user: drupal8
@@ -28,6 +33,7 @@ drupal_site_name: "Islandora 8"
drupal_install_profile: standard
drupal_account_name: admin
drupal_enable_modules:
+ - features
- rdf
- responsive_image
- syslog
@@ -43,8 +49,9 @@ drupal_enable_modules:
- content_browser
- matomo
- pdf
- - islandora_core_feature
- controlled_access_terms_defaults
+ - controlled_access_terms
+ - islandora_core_feature
drupal_trusted_hosts:
- ^localhost$
drupal_trusted_hosts_file: "{{ drupal_core_path }}/sites/default/settings.php"
diff --git a/inventory/vagrant/group_vars/webserver/drupal.yml b/inventory/vagrant/group_vars/webserver/drupal.yml
index 80018b3..f412053 100644
--- a/inventory/vagrant/group_vars/webserver/drupal.yml
+++ b/inventory/vagrant/group_vars/webserver/drupal.yml
@@ -6,7 +6,9 @@ drupal_core_owner: "{{ ansible_user }}"
drupal_composer_dependencies:
- "zaporylie/composer-drupal-optimizations:^1.0"
- "drupal/console:~1.0"
+ - "drush/drush:^9.0"
- "drupal/devel:^2.0"
+ - "drupal/features:^3.8"
- "drupal/rdfui:^1.0-beta1"
- "drupal/restui:^1.16"
- "drupal/search_api_solr:^2.0"
@@ -14,9 +16,12 @@ drupal_composer_dependencies:
- "drupal/content_browser:^1.0@alpha"
- "drupal/matomo:^1.7"
- "drupal/pdf:1.x-dev"
+ - "islandora/openseadragon:dev-8.x-1.x"
+ - "islandora/islandora:dev-8.x-1.x
+ - "islandora/islandora_defaults:dev-8.x-1.x"
+ - "islandora/controlled_access_terms:dev-8.x-1.x"
- "islandora/carapace:1.0.0"
- - "islandora/islandora_defaults:1.0.0"
-drupal_composer_project_package: "islandora/drupal-project:8.6.10"
+drupal_composer_project_package: "islandora/drupal-project:dev-8.x-1.x"
drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
drupal_core_path: "{{ drupal_composer_install_dir }}/web"
drupal_db_user: drupal8
@@ -28,6 +33,7 @@ drupal_site_name: "Islandora 8"
drupal_install_profile: standard
drupal_account_name: admin
drupal_enable_modules:
+ - features
- rdf
- responsive_image
- syslog
@@ -43,8 +49,9 @@ drupal_enable_modules:
- content_browser
- matomo
- pdf
- - islandora_core_feature
- controlled_access_terms_defaults
+ - controlled_access_terms
+ - islandora_core_feature
drupal_trusted_hosts:
- ^localhost$
drupal_trusted_hosts_file: "{{ drupal_core_path }}/sites/default/settings.php"
diff --git a/roles/internal/webserver-app/tasks/drupal.yml b/roles/internal/webserver-app/tasks/drupal.yml
index 608b035..067412f 100644
--- a/roles/internal/webserver-app/tasks/drupal.yml
+++ b/roles/internal/webserver-app/tasks/drupal.yml
@@ -60,7 +60,7 @@
group: "{{ webserver_app_user }}"
- name: Import features
- command: "{{ drush_path }} --root {{ drupal_core_path }} -y fim islandora_core_feature,controlled_access_terms_defaults"
+ command: "{{ drush_path }} --root {{ drupal_core_path }} -y fim islandora_core_feature"
# masonry library is required by content_browser and not installed by composer due to issue 2971165.
- name: Create drupal library directory.
@@ -82,17 +82,6 @@
args:
creates: "{{ drupal_external_libraries_directory }}/masonry"
-# Set Matomo Settings
-- name: Set Matomo site id.
- command: "{{ drush_path }} --root {{ drupal_core_path }} -y config-set matomo.settings site_id 1"
- register: set_search_api_config
- changed_when: "'Do you want to update site_id' in set_search_api_config.stdout"
-
-- name: Set Matmo sever url.
- command: "{{ drush_path }} --root {{ drupal_core_path }} -y config-set matomo.settings url_http http://localhost:8000/matomo/"
- register: set_search_api_config
- changed_when: "'Do you want to update site_id' in set_search_api_config.stdout"
-
# pdf.js library
- name: ensure pdf.js directory exists
file:
diff --git a/roles/internal/webserver-app/tasks/solr.yml b/roles/internal/webserver-app/tasks/solr.yml
index cae8a22..66fb78a 100644
--- a/roles/internal/webserver-app/tasks/solr.yml
+++ b/roles/internal/webserver-app/tasks/solr.yml
@@ -1,9 +1,9 @@
---
-- name: Set default solr server to point to CLAW core
- command: "{{ drush_path }} --root {{ drupal_core_path }} -y config-set search_api.server.default_solr_server backend_config.connector_config.core CLAW"
- register: set_search_api_config
- changed_when: "'Do you want to update' in set_search_api_config.stdout"
+#- name: Set default solr server to point to CLAW core
+# command: "{{ drush_path }} --root {{ drupal_core_path }} -y config-set search_api.server.default_solr_server backend_config.connector_config.core CLAW"
+# register: set_search_api_config
+# changed_when: "'Do you want to update' in set_search_api_config.stdout"
- name: Get solr config files to copy
command: "find {{ webserver_document_root }}/drupal/web/modules/contrib/search_api_solr/solr-conf/7.x -type f"
diff --git a/webserver.yml b/webserver.yml
index f799879..6288785 100644
--- a/webserver.yml
+++ b/webserver.yml
@@ -5,6 +5,7 @@
vars:
php_version: "7.2"
+ php_memory_limit: "2G"
roles:
- name: geerlingguy.repo-remi