diff --git a/inventory/vagrant/group_vars/all/main.yml b/inventory/vagrant/group_vars/all/main.yml index 44bff0ea..af94f76c 100644 --- a/inventory/vagrant/group_vars/all/main.yml +++ b/inventory/vagrant/group_vars/all/main.yml @@ -39,3 +39,9 @@ mysql_users: # Used by both the webserver and crayfish role for CentOS. php_enablerepo: "remi-php72" php_packages_state: "latest" + +solr_cores: + - ISLANDORA + +apache_listen_port: 8000 + diff --git a/inventory/vagrant/group_vars/all/passwords.yml b/inventory/vagrant/group_vars/all/passwords.yml index a0baba8d..ec98a3f1 100644 --- a/inventory/vagrant/group_vars/all/passwords.yml +++ b/inventory/vagrant/group_vars/all/passwords.yml @@ -17,4 +17,5 @@ islandora_syn_token: islandora cantaloupe_admin_password: islandora # Fedora -fcrepo_db_password: islandora \ No newline at end of file +fcrepo_db_password: islandora +fcrepo_db_root_password: "{{ islandora_db_root_password }}" \ No newline at end of file diff --git a/inventory/vagrant/group_vars/crayfish.yml b/inventory/vagrant/group_vars/crayfish.yml index 90e16ead..1dad311c 100644 --- a/inventory/vagrant/group_vars/crayfish.yml +++ b/inventory/vagrant/group_vars/crayfish.yml @@ -5,3 +5,5 @@ crayfish_db: "{{ claw_db }}" crayfish_fedora_base_url: "http://{{ hostvars[groups['tomcat'][0]].ansible_host }}:8080/fcrepo/rest" crayfish_drupal_base_url: "http://{{ hostvars[groups['webserver'][0]].ansible_host }}:{{ apache_listen_port }}" crayfish_gemini_base_url: "http://{{ hostvars[groups['webserver'][0]].ansible_host }}:{{ apache_listen_port }}/gemini" + +crayfits_web_service_url: "http://{{ hostvars[groups['tomcat'][0]].ansible_host }}:8080/fits/" diff --git a/inventory/vagrant/group_vars/karaf.yml b/inventory/vagrant/group_vars/karaf.yml index d197f337..d6e6d12f 100644 --- a/inventory/vagrant/group_vars/karaf.yml +++ b/inventory/vagrant/group_vars/karaf.yml @@ -15,3 +15,5 @@ alpaca_gemini_base_url: "http://{{ hostvars[groups['webserver'][0]].ansible_host }}:{{ apache_listen_port }}/gemini/" alpaca_houdini_base_url: "http://{{ hostvars[groups['webserver'][0]].ansible_host }}:{{ apache_listen_port }}/houdini" alpaca_homarus_base_url: "http://{{ hostvars[groups['webserver'][0]].ansible_host }}:{{ apache_listen_port }}/homarus" + alpaca_fits_base_url: "http://{{ hostvars[groups['webserver'][0]].ansible_host }}:{{ apache_listen_port }}/crayfits" + alpaca_hypercube_base_url: "http://{{ hostvars[groups['webserver'][0]].ansible_host }}:{{ apache_listen_port }}/hypercube" \ No newline at end of file diff --git a/inventory/vagrant/group_vars/solr.yml b/inventory/vagrant/group_vars/solr.yml index cf505fe1..74cba021 100644 --- a/inventory/vagrant/group_vars/solr.yml +++ b/inventory/vagrant/group_vars/solr.yml @@ -1,8 +1,5 @@ #solr_version: "6.6.0" -solr_cores: - - ISLANDORA - solr_install_path: /opt/solr solr_user: solr diff --git a/inventory/vagrant/group_vars/webserver/apache.yml b/inventory/vagrant/group_vars/webserver/apache.yml index 57773676..66f9a0e9 100644 --- a/inventory/vagrant/group_vars/webserver/apache.yml +++ b/inventory/vagrant/group_vars/webserver/apache.yml @@ -1,6 +1,5 @@ --- -apache_listen_port: 8000 apache_create_vhosts: true apache_vhosts_filename: "islandora.conf" apache_remove_default_vhost: true diff --git a/requirements.yml b/requirements.yml index d263ab18..508af9a5 100644 --- a/requirements.yml +++ b/requirements.yml @@ -47,9 +47,9 @@ name: Islandora-Devops.activemq version: master -- src: https://github.com/Islandora-Devops/ansible-role-alpaca +- src: https://github.com/Natkeeran/ansible-role-alpaca name: Islandora-Devops.alpaca - version: master + version: fits #- src: https://github.com/Islandora-Devops/ansible-role-apix # name: Islandora-Devops.apix @@ -63,9 +63,9 @@ name: Islandora-Devops.cantaloupe version: master -- src: https://github.com/Islandora-Devops/ansible-role-crayfish +- src: https://github.com/Natkeeran/ansible-role-crayfish name: Islandora-Devops.crayfish - version: master + version: fits - src: https://github.com/Islandora-Devops/ansible-role-drupal-openseadragon name: Islandora-Devops.drupal-openseadragon @@ -83,9 +83,9 @@ name: Islandora-Devops.tomcat8 version: master -- src: https://github.com/Islandora-Devops/ansible-role-fits +- src: https://github.com/Natkeeran/ansible-role-fits name: Islandora-Devops.fits - version: master + version: fits - src: https://github.com/Islandora-Devops/ansible-role-grok name: Islandora-Devops.grok diff --git a/roles/internal/webserver-app/tasks/drupal.yml b/roles/internal/webserver-app/tasks/drupal.yml index d6fa1705..bb96873a 100644 --- a/roles/internal/webserver-app/tasks/drupal.yml +++ b/roles/internal/webserver-app/tasks/drupal.yml @@ -106,3 +106,12 @@ dest: "{{ drupal_external_libraries_directory }}/pdf.js" creates: "{{ drupal_external_libraries_directory }}/pdf.js/build" remote_src: yes + +- name: Download Islandora FITS + composer: + command: require + arguments: islandora-rdm/islandora_fits + working_dir: "{{ drupal_core_path }}/.." + +- name: Enable Islansdora FITS + command: "{{ drush_path }} --root {{ drupal_core_path }} -y en islandora_fits"