diff --git a/crayfish.yml b/crayfish.yml index 13633fae..a6ce61a9 100644 --- a/crayfish.yml +++ b/crayfish.yml @@ -4,9 +4,10 @@ become: yes roles: + - name: geerlingguy.repo-remi + when: ansible_os_family == "RedHat" - geerlingguy.apache - geerlingguy.php - geerlingguy.git - geerlingguy.composer - Islandora-Devops.crayfish - diff --git a/inventory/vagrant/group_vars/all/main.yml b/inventory/vagrant/group_vars/all/main.yml index 17e54949..2f000bed 100644 --- a/inventory/vagrant/group_vars/all/main.yml +++ b/inventory/vagrant/group_vars/all/main.yml @@ -34,3 +34,7 @@ mysql_users: host: "%" password: "{{ drupal_db_password }}" priv: "{{ drupal_db_name }}.*:ALL" + +# Used by both the webserver and crayfish role for CentOS. +php_enablerepo: "remi-php72" +php_packages_state: "latest" diff --git a/requirements.yml b/requirements.yml index ed85f0c0..2a2a98e4 100644 --- a/requirements.yml +++ b/requirements.yml @@ -59,7 +59,7 @@ - src: https://github.com/Islandora-Devops/ansible-role-crayfish name: Islandora-Devops.crayfish - version: 0.0.2 + version: 0.0.3 - src: https://github.com/Islandora-Devops/ansible-role-drupal-openseadragon name: Islandora-Devops.drupal-openseadragon @@ -83,11 +83,11 @@ - src: https://github.com/Islandora-Devops/ansible-role-grok name: Islandora-Devops.grok - version: 0.0.1 + version: 0.0.2 - src: https://github.com/Islandora-Devops/ansible-role-karaf name: Islandora-Devops.karaf - version: 0.0.1 + version: 0.0.2 - src: https://github.com/Islandora-Devops/ansible-role-keymaster name: Islandora-Devops.keymaster diff --git a/webserver.yml b/webserver.yml index 33513c85..c367f809 100644 --- a/webserver.yml +++ b/webserver.yml @@ -2,9 +2,6 @@ - hosts: webserver become: yes - vars: - php_enablerepo: "remi-php70" - php_packages_state: "latest" roles: - name: geerlingguy.repo-remi