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

Update versions #222

Merged
merged 3 commits into from
Jul 14, 2022
Merged
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
4 changes: 2 additions & 2 deletions roles/internal/Islandora-Devops.matomo/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Install location

matomo_version: "4.4.1"
matomo_version: "4.10.1"
matomo_host: localhost
webserver_document_root: /var/www/html
matomo_install_dir: /var/www/html/matomo
Expand Down Expand Up @@ -31,7 +31,7 @@ matomo_admin_user: admin
## More info about pwd: https://matomo.org/faq/how-to/faq_191/
matomo_admin_user_password: $2y$10$vMQuIJ8tgqswNDd3hzBksuOnPPJ/EDcYCBGdPb8pKdnyWXVhf.qB2
matomo_admin_user_email: [email protected]
matomo_site_name: "Islandora CLAW"
matomo_site_name: "Islandora"
matomo_site_url: http://localhost:8000
matomo_site_timezone: "America/Toronto"

Expand Down
745 changes: 575 additions & 170 deletions roles/internal/Islandora-Devops.matomo/templates/matomo.sql.j2

Large diffs are not rendered by default.

22 changes: 1 addition & 21 deletions roles/internal/webserver-app/tasks/drupal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,26 +56,6 @@
command: "{{ drush_path }} --root {{ drupal_core_path }} -y fim islandora_search"
when: islandora_profile == "standard"

# masonry library is required by content_browser and not installed by composer due to issue 2971165.
- name: Create drupal library directory.
file:
state: directory
path: "{{ drupal_external_libraries_directory }}"
owner: "{{ webserver_app_user }}"
group: "{{ webserver_app_user }}"

- name: Unarchive masonry library.
unarchive:
src: "https://github.com/desandro/masonry/archive/v3.3.2.zip"
dest: "{{ drupal_external_libraries_directory }}"
creates: "{{ drupal_external_libraries_directory }}/masonry"
remote_src: yes

- name: Rename masonry directory.
command: mv "{{ drupal_external_libraries_directory }}/masonry-3.3.2" "{{ drupal_external_libraries_directory }}/masonry"
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"
Expand All @@ -95,7 +75,7 @@

- name: Unarchive pdf.js library
unarchive:
src: "https://github.com/mozilla/pdf.js/releases/download/v2.0.943/pdfjs-2.0.943-dist.zip"
src: "https://github.com/mozilla/pdf.js/releases/download/v2.14.305/pdfjs-2.14.305-dist.zip"
dest: "{{ drupal_external_libraries_directory }}/pdf.js"
creates: "{{ drupal_external_libraries_directory }}/pdf.js/build"
remote_src: yes
Expand Down
26 changes: 10 additions & 16 deletions vars/standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,18 @@ drupal_build_composer_project: true


drupal_composer_dependencies:
- "zaporylie/composer-drupal-optimizations:^1.1"
- "drupal/devel:^4.0"
- "drush/drush:^10.3"
- "drupal/rdfui:^1.0-beta1"
- "drupal/restui:^1.16"
- "drupal/search_api_solr:^4.1"
- "drupal/facets:^1.6"
- "drupal/content_browser:^1.0@alpha"
- "drupal/matomo:^1.7"
- "drupal/pdf:1.x-dev"
- "drupal/admin_toolbar:^2.0"
- "drupal/rest_oai_pmh:^1.0@beta"
- "drupal/transliterate_filenames:^1.3"
- "easyrdf/easyrdf:^1.1"
- "drupal/context:^4.0@beta"
- "drupal/flysystem:^2@beta"
- "islandora/islandora:^2.3"
- "drupal/restui:^1.20"
- "drupal/search_api_solr:^4.2"
- "drupal/facets:^2"
- "drupal/matomo:^1.19"
- "drupal/pdf:^1.1"
- "drupal/admin_toolbar:^3.1"
- "drupal/rest_oai_pmh:^2.0@beta"
- "drupal/transliterate_filenames:^2.0"
- "drupal/flysystem:^2.0@alpha"
- "islandora/islandora:^2.4"
- "islandora/islandora_defaults:^2.1"
- "islandora-rdm/islandora_fits:dev-8.x-1.x"
drupal_composer_project_package: "drupal/recommended-project:^9@stable"
Expand All @@ -37,7 +32,6 @@ drupal_enable_modules:
- devel
- search_api_solr
- facets
- content_browser
- matomo
- pdf
- admin_toolbar
Expand Down