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

fits ansible separation into separate hosts #162

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open
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
6 changes: 6 additions & 0 deletions inventory/vagrant/group_vars/all/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

3 changes: 2 additions & 1 deletion inventory/vagrant/group_vars/all/passwords.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ islandora_syn_token: islandora
cantaloupe_admin_password: islandora

# Fedora
fcrepo_db_password: islandora
fcrepo_db_password: islandora
fcrepo_db_root_password: "{{ islandora_db_root_password }}"
2 changes: 2 additions & 0 deletions inventory/vagrant/group_vars/crayfish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
2 changes: 2 additions & 0 deletions inventory/vagrant/group_vars/karaf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 0 additions & 3 deletions inventory/vagrant/group_vars/solr.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
#solr_version: "6.6.0"

solr_cores:
- ISLANDORA

solr_install_path: /opt/solr

solr_user: solr
Expand Down
1 change: 0 additions & 1 deletion inventory/vagrant/group_vars/webserver/apache.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---

apache_listen_port: 8000
apache_create_vhosts: true
apache_vhosts_filename: "islandora.conf"
apache_remove_default_vhost: true
Expand Down
12 changes: 6 additions & 6 deletions requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
9 changes: 9 additions & 0 deletions roles/internal/webserver-app/tasks/drupal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"