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.

Sign up for GitHub

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

Fits #129

Merged
merged 7 commits into from
Jan 8, 2020
Merged

Fits #129

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb28282
Pulling in FITS work
dannylamb Aug 6, 2019
0ed7454
Pushing before making PR
dannylamb Aug 7, 2019
f5679b7
Merge branch 'dev' into fits
dannylamb Aug 7, 2019
e1f8b06
Un-derping the feature import
dannylamb Aug 7, 2019
1a09995
Merge branch 'dev' of https://github.com/Islandora-Devops/claw-playbo…
dannylamb Aug 9, 2019
f84baa0
Merge branch 'dev' into fits
dannylamb Oct 31, 2019
ed205fd
Pointing back to Origin
dannylamb Jan 8, 2020
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
3 changes: 3 additions & 0 deletions inventory/vagrant/group_vars/webserver/drupal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ drupal_composer_dependencies:
- "drupal/pdf:1.x-dev"
- "islandora/carapace:1.0.0"
- "islandora/islandora_defaults:dev-8.x-1.x"
- "islandora-rdm/islandora_fits:dev-master"
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"
Expand Down Expand Up @@ -45,6 +46,8 @@ drupal_enable_modules:
- pdf
- islandora_core_feature
- controlled_access_terms_defaults
- islandora_defaults
- islandora_fits
drupal_trusted_hosts:
- ^localhost$
drupal_trusted_hosts_file: "{{ drupal_core_path }}/sites/default/settings.php"
Expand Down
8 changes: 1 addition & 7 deletions post-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,9 @@

tasks:

- 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"
Copy link
Member

Choose a reason for hiding this comment

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

Why are you not enabling islandora_defaults and importing it anymore? Did it move somewhere else? When I ran a fresh build, I lost a lot of the settings like having media use on the media types.

Copy link
Member

Choose a reason for hiding this comment

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

I think it is being enabled (as a module) @dannylamb added it to the drupal_enabled_modules ansible variable, but we probably still need this line to import the feature because it is not imported by default.

Copy link
Member

Choose a reason for hiding this comment

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

Indeed, I manually ran drush en and it was already enabled, then I ran the drush fim and it fixed the missing things 👍 (and then a FITS media object was made! )


- 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"

Expand Down
6 changes: 3 additions & 3 deletions requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

- src: https://github.com/Islandora-Devops/ansible-role-alpaca
name: Islandora-Devops.alpaca
version: 1.0.1
version: master

#- src: https://github.com/Islandora-Devops/ansible-role-apix
# name: Islandora-Devops.apix
Expand Down Expand Up @@ -80,9 +80,9 @@
name: Islandora-Devops.tomcat8
version: 1.0.0

- src: https://github.com/Islandora-Devops/ansible-role-fits
- src: https://github.com/ajstanley/ansible-role-fits
name: Islandora-Devops.fits
version: 1.0.0
version: master

- src: https://github.com/Islandora-Devops/ansible-role-grok
name: Islandora-Devops.grok
Expand Down
1 change: 1 addition & 0 deletions tomcat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
- Islandora-Devops.grok
- Islandora-Devops.cantaloupe
- Islandora-Devops.activemq
- Islandora-Devops.fits