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

Deprecations, update mysql role, and set drush path. #281

Merged
merged 5 commits into from
Jul 10, 2024
Merged

Deprecations, update mysql role, and set drush path. #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d78fb5
Remove deprecated includes.
rosiel Jul 1, 2024
875670e
Remove more deprecated includes.
rosiel Jul 1, 2024
073c730
Update geerlingguy.mysql role.
rosiel Jul 1, 2024
27424ba
Fix roles permissions.
rosiel Jul 1, 2024
2b05a3d
Add drush_path.
rosiel Jul 2, 2024
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ roles/external
.project
.github
islandora_base
!inventory/vagrant
inventory/*
!inventory/vagrant
2 changes: 2 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 @@ -26,3 +26,5 @@ drupal_external_libraries_directory: "{{ drupal_core_path }}/libraries"
fedora_base_url: "http://{{ hostvars[groups['tomcat'][0]].ansible_host }}:8080/fcrepo/rest/"
drupal_jsonld_remove_format: true
openseadragon_composer_item: "islandora/openseadragon:^2"

drush_path: "{{ drupal_deploy_dir }}/vendor/bin/drush"
2 changes: 1 addition & 1 deletion requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
version: 2.0.2

- src: geerlingguy.mysql
version: 3.3.2
version: 4.3.4

- src: geerlingguy.postgresql
version: 1.4.3
Expand Down
4 changes: 2 additions & 2 deletions roles/internal/Islandora-Devops.activemq/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---

- include: user.yml
- import_tasks: user.yml
tags:
- activemq
- activemq-user

- include: install.yml
- import_tasks: install.yml
tags:
- activemq
- activemq-install
Expand Down
6 changes: 3 additions & 3 deletions roles/internal/Islandora-Devops.alpaca/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
---

- include: compile.yml
- import_tasks: compile.yml
tags:
- alpaca
- alpaca-compile
when: alpaca_from_source

- include: download.yml
- import_tasks: download.yml
tags:
- alpaca
- alpaca-download
when: not alpaca_from_source

- include: config.yml
- import_tasks: config.yml
tags:
- alpaca
- alpaca-config
12 changes: 6 additions & 6 deletions roles/internal/Islandora-Devops.blazegraph/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
---
- include: "define-home.yml"
- import_tasks: "define-home.yml"
tags:
- blazegraph
- blazegraph-config
- blazegraph-install

- include: "install-{{ ansible_os_family }}.yml"
- include_tasks: "install-{{ ansible_os_family }}.yml"
tags:
- blazegraph
- blazegraph-install

- include: download.yml
- import_tasks: download.yml
tags:
- blazegraph
- blazegraph-download

- include: logging.yml
- import_tasks: logging.yml
tags:
- blazegraph
- blazegraph-logging

- include: "config-{{ ansible_os_family }}.yml"
- include_tasks: "config-{{ ansible_os_family }}.yml"
tags:
- blazegraph
- blazegraph-config

- include: namespace.yml
- import_tasks: namespace.yml
tags:
- blazegraph
- blazegraph-namespace
10 changes: 5 additions & 5 deletions roles/internal/Islandora-Devops.cantaloupe/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
---

- include: os-vars.yml
- import_tasks: os-vars.yml
tags:
- cantaloupe
- cantaloupe-config
- cantaloupe-install

- include: "install-{{ ansible_os_family }}.yml"
- include_tasks: "install-{{ ansible_os_family }}.yml"
tags:
- cantaloupe
- cantaloupe-install

- include: config.yml
- import_tasks: config.yml
tags:
- cantaloupe
- cantaloupe-config

- include: web.yml
- import_tasks: web.yml
tags:
- cantaloupe
- cantaloupe-web
when: cantaloupe_deploy_war

- include: cache.yml
- import_tasks: cache.yml
tags:
- cantaloupe
- cantaloupe-cache
Expand Down
2 changes: 1 addition & 1 deletion roles/internal/Islandora-Devops.crayfish/tasks/install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
state: directory
owner: "{{ crayfish_user }}"
group: "{{ crayfish_user }}"
mode: "urwx,gr,o-rwx"
mode: "u=rwx,g=r,o-rwx"
recurse: yes

- name: Install crayfish code
Expand Down
4 changes: 2 additions & 2 deletions roles/internal/Islandora-Devops.crayfish/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
- crayfish-install
- crayfish-houdini

- include: install.yml
- import_tasks: install.yml
tags:
- crayfish
- crayfish-install

- include: houdini.yml
- import_tasks: houdini.yml
tags:
- crayfish
- crayfish-houdini
4 changes: 2 additions & 2 deletions roles/internal/Islandora-Devops.drupal-openseadragon/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
set_fact: openseadragon_drush_path="/usr/local/bin/drush"
when: drush_path is not defined and drush_stat.stat.exists

- include: install.yml
- import_tasks: install.yml
tags:
- openseadragon
- openseadragon-install

- include: config.yml
- import_tasks: config.yml
tags:
- openseadragon
- openseadragon-config
6 changes: 3 additions & 3 deletions roles/internal/Islandora-Devops.fcrepo-syn/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---
- include: os-vars.yml
- import_tasks: os-vars.yml
tags:
- fcrepo-syn
- fcrepo-syn-config
- fcrepo-syn-install

- include: install.yml
- import_tasks: install.yml
tags:
- fcrepo-syn
- fcrepo-syn-install

- include: "config-{{ ansible_os_family }}.yml"
- include_tasks: "config-{{ ansible_os_family }}.yml"
tags:
- fcrepo-syn
- fcrepo-syn-config
8 changes: 4 additions & 4 deletions roles/internal/Islandora-Devops.fcrepo/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
- include: install.yml
- import_tasks: install.yml
tags:
- fcrepo
- fcrepo-install

- include: db-mysql.yml
- import_tasks: db-mysql.yml
when: fcrepo_db_type == 'mysql' or fcrepo_persistence == 'jdbc-mysql'
tags:
- fedora
- fedora-install
- fedora-db

- include: db-pgsql.yml
- import_tasks: db-pgsql.yml
when: fcrepo_db_type == 'postgresql' or fcrepo_persistence == 'jdbc-postgresql'
become: yes
tags:
- fedora
- fedora-install
- fedora-db

- include: config.yml
- import_tasks: config.yml
tags:
- fcrepo
- fcrepo-config
8 changes: 4 additions & 4 deletions roles/internal/Islandora-Devops.fits/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@
- name: include OS specific variables
include_vars: "vars/{{ ansible_os_family }}.yml"

- include: install.yml
- import_tasks: install.yml
tags:
- fits
- fits-install

- include: install-ws.yml
- import_tasks: install-ws.yml
tags:
- fits
- fits-ws
- fits-ws-install
when: fits_ws

- include: config-ws.yml
- import_tasks: config-ws.yml
tags:
- fits
- fits-ws
- fits-ws-config
when: fits_ws

- include: build-fits-site.yml
- import_tasks: build-fits-site.yml
tags:
- fits
- fits-install
4 changes: 2 additions & 2 deletions roles/internal/Islandora-Devops.tomcat/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---

- include: "define-home.yml"
- import_tasks: "define-home.yml"
tags:
- tomcat9
- tomcat9-config
- tomcat9-install

- include: "install-{{ ansible_os_family }}.yml"
- include_tasks: "install-{{ ansible_os_family }}.yml"
when: "islandora_build_base_box is defined and islandora_build_base_box|bool == True"
tags:
- tomcat9
Expand Down
8 changes: 4 additions & 4 deletions roles/internal/webserver-app/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@
set_fact: drush_path="/usr/local/bin/drush"
when: drush_path is not defined and drush_stat.stat.exists

- include: apache.yml
- import_tasks: apache.yml
when: webserver_app_apache
tags:
- webserver-app
- webserver-app-apache

- include: drupal.yml
- import_tasks: drupal.yml
when: webserver_app_drupal
tags:
- webserver-app
- webserver-app-drupal

- include: jwt.yml
- import_tasks: jwt.yml
when: webserver_app_jwt
tags:
- webserver-app
- webserver-app-jwt

- include: solr.yml
- import_tasks: solr.yml
when: webserver_app_drupal
tags:
- webserver-app
Expand Down