Issue-268: Changes needed to allow RHEL based builds via Islandora-pl…

…aybook #268 (#273)

.gitignore

@@ -6,3 +6,5 @@ roles/external
 .project
 .github
 islandora_base
+!inventory/vagrant
+inventory/*

ansible.cfg

@@ -17,3 +17,6 @@ deprecation_warnings = False
 
 [ssh_connection]
 pipelining = True
+
+[colors]
+verbose = bright blue

bootstrap.yml

@@ -63,7 +63,9 @@
 
     # Change Selinux to permissive
     - name: change selinux enforcement to permissive
-      command: setenforce permissive
+      selinux:
+        policy: targeted
+        state: permissive
       when: "ansible_os_family == 'RedHat' and disable_selinux and selinux_permissive == 'enforcing' and islandora_build_base_box|bool == True"
 
     # Check if we may be re-running

crayfish.yml

@@ -4,19 +4,19 @@
   become: yes
 
   roles:
-    - name: geerlingguy.repo-remi
-      when: "ansible_os_family == 'RedHat' and islandora_build_box|bool == True"
-    - name: geerlingguy.apache  # Include apache to get the handlers
-    - name: geerlingguy.php-versions
+    - role: geerlingguy.repo-remi
+      when: "ansible_os_family == 'RedHat' and islandora_build_base_box|bool == True"
+    - role: geerlingguy.apache  # Include apache to get the handlers
+    - role: geerlingguy.php-versions
       when: islandora_build_base_box|bool == True
-    - name: geerlingguy.php
+    - role: geerlingguy.php
       when: islandora_build_base_box|bool == True
-    - name: geerlingguy.php-mysql
+    - role: geerlingguy.php-mysql
       when: islandora_build_base_box|bool == True
-    - name: geerlingguy.git
+    - role: geerlingguy.git
       when: islandora_build_base_box|bool == True
-    - name: geerlingguy.composer
+    - role: geerlingguy.composer
       when: islandora_build_base_box|bool == True
 
-    - name: Islandora-Devops.crayfish
+    - role: Islandora-Devops.crayfish
       when: islandora_build_base_box|bool == False

post-install.yml

@@ -22,13 +22,15 @@
         regexp: 'var/cache/cantaloupe/$'
         line: 'ReadWritePaths=/var/cache/cantaloupe/'
         insertafter: EOF
+      when: "ansible_os_family == 'Debian'"
 
     - name: Add Cantaloupe log to Tomcat writable paths
       lineinfile:
         path: "/etc/systemd/system/tomcat9.service.d/override.conf"
         regexp: 'var/log/cantaloupe/$'
         line: 'ReadWritePaths=/var/log/cantaloupe'
         insertafter: EOF
+      when: "ansible_os_family == 'Debian'"
 
     - name: restart daemon service
       ansible.builtin.systemd:

requirements.yml

@@ -5,13 +5,13 @@
   version: 1.2.4
 
 - src: geerlingguy.repo-remi
-  version: 1.2.0
+  version: 2.0.1
 
 - src: geerlingguy.apache
   version: 3.3.0
 
 - src: geerlingguy.php-versions
-  version: 5.0.0
+  version: 5.0.1
 
 - src: geerlingguy.php
   version: 4.8.0
@@ -29,7 +29,7 @@
   version: 1.4.3
 
 - src: geerlingguy.solr
-  version: 5.4.1
+  version: 5.5.0
 
 - src: geerlingguy.java
   version: 2.2.0

roles/internal/Islandora-Devops.activemq/tasks/install.yml

@@ -1,17 +1,32 @@
 ---
 
-- name: Download and unarchive
+- name: Download ActiveMQ
+  get_url:
+    url: http://archive.apache.org/dist/activemq/{{ activemq_version }}/apache-activemq-{{ activemq_version }}-bin.tar.gz
+    dest: "{{ activemq_install_root }}"
+    owner: "{{ activemq_user }}"
+    timeout: 300
+
+- name: Expand ActiveMQ
   unarchive:
-    remote_src: yes
-    src: http://archive.apache.org/dist/activemq/{{ activemq_version }}/apache-activemq-{{ activemq_version }}-bin.tar.gz
+    src: "{{ activemq_install_root }}/apache-activemq-{{ activemq_version }}-bin.tar.gz"
     dest: "{{ activemq_install_root }}"
+    copy: false
     owner: "{{ activemq_user }}"
-    creates: "{{ activemq_install_root }}/activemq"
+    group: "{{ activemq_user }}"
+
+- name: Cleanup ActiveMQ archive file
+  file:
+    path: "{{ activemq_install_root }}/apache-activemq-{{ activemq_version }}-bin.tar.gz"
+    state: absent
 
-- name: Move activemq
-  command: mv "{{ activemq_install_root }}/apache-activemq-{{ activemq_version }}" "{{ activemq_install_root }}/activemq"
-  args:
-    creates: "{{ activemq_install_root }}/activemq"
+- name: Make ActiveMQ symlink
+  file:
+    src: "{{ activemq_install_root }}/apache-activemq-{{ activemq_version }}"
+    dest: "{{ activemq_install_root }}/activemq"
+    owner: "{{ activemq_user }}"
+    group: "{{ activemq_user }}"
+    state: link
 
 # Transitional removal of old-style init.d symlink
 # This task can be removed in the future.

roles/internal/Islandora-Devops.alpaca/templates/startup.sh

@@ -1,15 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ -z "$JAVA_HOME" ]; then
-  if [ -d "/usr/lib/jvm/java-11-openjdk-amd64" ]; then
-    # Make a guess because this is only for Ubuntu
-    export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
-  else
-    echo "Cannot locate JAVA, please define JAVA_HOME."
-    exit 1
-  fi
+    if [ "$(grep -Ei 'debian|buntu|mint' /etc/*release)" ]; then
+        if [ -d "/usr/lib/jvm/java-11-openjdk-amd64" ]; then
+        # Make a guess for Debian based systems.
+            export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+        fi
+    elif [ "$(grep -Ei 'fedora|redhat' /etc/*release)" ]; then
+        if [ -d "/usr/lib/jvm/jre" ] || [ -f "/usr/lib/jvm/jre" ] || [ -L "/usr/lib/jvm/jre" ]; then
+        # Make a guess for RHEL based systems.
+            export JAVA_HOME=/usr/lib/jvm/jre
+        fi
+    else
+        echo "Cannot locate JAVA, please define JAVA_HOME."
+    fi
 fi
+
 # Source the config file.
-. ${ALPACA_HOME}/${ALPACA_CONFIG}
+source ${ALPACA_HOME}/${ALPACA_CONFIG}
 
-${JAVA_HOME}/bin/java -Dislandora.alpaca.log=${ALPACA_LOG_LEVEL} -Xmx${ALPACA_HEAP} -jar ${ALPACA_JAR} -c ${ALPACA_PROPERTIES} > ${ALPACA_LOG_DIR}/alpaca.log &
+${JAVA_HOME}/bin/java -Dislandora.alpaca.log=${ALPACA_LOG_LEVEL} -Xmx${ALPACA_HEAP} -jar ${ALPACA_JAR} -c ${ALPACA_PROPERTIES} > ${ALPACA_LOG_DIR}/alpaca.log &

roles/internal/Islandora-Devops.blazegraph/defaults/main.yml

@@ -3,7 +3,7 @@ blazegraph_user: tomcat
 blazegraph_home_dir: /opt/blazegraph
 blazegraph_war_path: "{{ tomcat9_home }}/webapps/bigdata.war"
 blazegraph_log4j_template: log4j.properties
-blazegraph_log_dir: /var/log/tomcat9/blazegraph
+#blazegraph_log_dir: /var/log/tomcat9/blazegraph -- Moved to vars to allow OS differences.
 blazegraph_log4j_path: "{{ tomcat9_home }}/webapps/bigdata/WEB-INF/classes/log4j.properties"
 blazegraph_webxml_path: "{{ tomcat9_home }}/webapps/bigdata/WEB-INF/web.xml"
 blazegraph_webxml_template: yes

roles/internal/Islandora-Devops.blazegraph/tasks/config-RedHat.yml

@@ -0,0 +1,46 @@
+---
+
+- name: Copy templated blazegraph config files
+  template:
+    src: "{{ item }}"
+    dest: "{{ blazegraph_home_dir }}/conf/{{ item }}"
+    owner: "{{ blazegraph_user }}"
+    group: "{{ blazegraph_user }}"
+  with_items:
+    - RWStore.properties
+  notify: restart tomcat9
+
+- name: Copy blazegraph config files
+  copy:
+    src: "{{ item }}"
+    dest: "{{ blazegraph_home_dir }}/conf/{{ item }}"
+    owner: "{{ blazegraph_user }}"
+    group: "{{ blazegraph_user }}"
+  with_items:
+    - blazegraph.properties
+    - inference.nt
+  notify: restart tomcat9
+
+- name: Drop in templated web.xml file
+  template:
+    src: web.xml.j2
+    dest: "{{ blazegraph_webxml_path }}"
+    owner: "{{ blazegraph_user }}"
+    group: "{{ blazegraph_user }}"
+  notify: restart tomcat9
+  when: blazegraph_webxml_template
+
+- name: Reload systemd daemon
+  systemd:
+    daemon-reload: yes  
+
+- name: Stop tomcat9 service
+  service:
+    name: tomcat9
+    state: stopped
+
+- name: Start tomcat9 service
+  service:
+    name: tomcat9
+    state: started
+

roles/internal/Islandora-Devops.blazegraph/tasks/define-home.yml

@@ -0,0 +1,11 @@
+---
+
+# Include variables and define needed variables.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define blazegraph_log_dir
+  set_fact:
+    blazegraph_log_dir: "{{ __blazegraph_log_dir }}"
+  when: blazegraph_log_dir is not defined
+

roles/internal/Islandora-Devops.blazegraph/tasks/install-RedHat.yml

@@ -0,0 +1,31 @@
+---
+
+- name: Create blazegraph home directory
+  file:
+    path: "{{ blazegraph_home_dir }}"
+    state: directory
+    owner: "{{ blazegraph_user }}"
+    group: "{{ blazegraph_user }}"
+
+- name: Create blazegraph conf directory
+  file:
+    path: "{{ blazegraph_home_dir }}/conf"
+    state: directory
+    owner: "{{ blazegraph_user }}"
+    group: "{{ blazegraph_user }}"
+
+- name: Create blazegraph data directory
+  file:
+    path: "{{ blazegraph_home_dir }}/data"
+    state: directory
+    owner: "{{ blazegraph_user }}"
+    group: "{{ blazegraph_user }}"
+
+- name: Create file with sandbox overrides
+  copy:
+    dest: "/etc/systemd/system/tomcat9.service.d/override.conf"
+    content: |
+      [Service]
+      ReadWritePaths={{ blazegraph_home_dir }}/data/
+    mode: '0644'
+

roles/internal/Islandora-Devops.blazegraph/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
+- include: "define-home.yml"
+  tags:
+    - blazegraph
+    - blazegraph-config
+    - blazegraph-install
 
-- include: install.yml
+- include: "install-{{ ansible_os_family }}.yml"
   tags:
     - blazegraph
     - blazegraph-install
@@ -15,7 +20,7 @@
     - blazegraph
     - blazegraph-logging
 
-- include: config.yml
+- include: "config-{{ ansible_os_family }}.yml"
   tags:
     - blazegraph
     - blazegraph-config

roles/internal/Islandora-Devops.blazegraph/vars/Debian.yml

@@ -0,0 +1,5 @@
+#
+# Set variables for Debian
+#
+__blazegraph_log_dir: /var/log/tomcat9/blazegraph
+

roles/internal/Islandora-Devops.blazegraph/vars/RedHat.yml

@@ -0,0 +1,5 @@
+#
+# Set variables for RedHat
+#
+__blazegraph_log_dir: /opt/tomcat/logs/blazegraph
+

roles/internal/Islandora-Devops.cantaloupe/defaults/main.yml

@@ -7,7 +7,7 @@ cantaloupe_install_root: /opt
 # Target of a symlink from the extracted cantaloupe archive
 cantaloupe_symlink: /opt/cantaloupe
 # Path to cantaloupe logs
-cantaloupe_log_path: /var/log/cantaloupe
+#cantaloupe_log_path: /var/log/cantaloupe -- Moved to vars to allow OS differences.
 # Cantaloupe user
 cantaloupe_user: cantaloupe
 # Cantaloupe group
@@ -753,7 +753,7 @@ cantaloupe_log_application_SyslogAppender_facility: LOCAL0
 
 # N.B.: Don't enable FileAppender and RollingFileAppender simultaneously!
 cantaloupe_log_error_FileAppender_enabled: "true"
-cantaloupe_log_error_FileAppender_pathname: /var/log/cantaloupe/error.log
+#cantaloupe_log_error_FileAppender_pathname: /var/log/cantaloupe/error.log -- Moved to vars to allow OS differences.
 
 cantaloupe_log_error_RollingFileAppender_enabled: "false"
 cantaloupe_log_error_RollingFileAppender_pathname: /path/to/logs/error.log
@@ -768,7 +768,7 @@ cantaloupe_log_error_RollingFileAppender_TimeBasedRollingPolicy_max_history: 30
 cantaloupe_log_access_ConsoleAppender_enabled: "false"
 
 cantaloupe_log_access_FileAppender_enabled: "true"
-cantaloupe_log_access_FileAppender_pathname: /var/log/cantaloupe/access.log
+#cantaloupe_log_access_FileAppender_pathname: /var/log/cantaloupe/access.log -- Moved to vars to allow OS differences.
 
 # RollingFileAppender is an alternative to using something like
 # FileAppender + logrotate.

roles/internal/Islandora-Devops.cantaloupe/tasks/install-RedHat.yml

@@ -0,0 +1,25 @@
+---
+
+- name: Install Cantaloupe
+  unarchive:
+    remote_src: yes
+    src: https://github.com/medusa-project/cantaloupe/releases/download/v{{ cantaloupe_version }}/cantaloupe-{{ cantaloupe_version }}.zip
+    dest: "{{ cantaloupe_install_root }}"
+    owner: "{{ cantaloupe_user }}"
+    group: "{{ cantaloupe_group }}"
+    creates: "{{ cantaloupe_install_root }}/cantaloupe-{{ cantaloupe_version }}"
+
+- name: Create Cantaloupe symlink
+  file:
+    state: link
+    src: "{{ cantaloupe_install_root }}/cantaloupe-{{ cantaloupe_version }}"
+    dest: "{{ cantaloupe_symlink }}"
+    owner: "{{ cantaloupe_user }}"
+    group: "{{ cantaloupe_group }}"
+
+- name: Create Cantaloupe log path
+  file:
+    state: directory
+    path: "{{ cantaloupe_log_path }}"
+    owner: "{{ cantaloupe_user }}"
+    group: "{{ cantaloupe_group }}"

roles/internal/Islandora-Devops.cantaloupe/tasks/main.yml

@@ -1,6 +1,12 @@
 ---
 
-- include: install.yml
+- include: os-vars.yml
+  tags:
+    - cantaloupe
+    - cantaloupe-config
+    - cantaloupe-install
+
+- include: "install-{{ ansible_os_family }}.yml"
   tags:
     - cantaloupe
     - cantaloupe-install

roles/internal/Islandora-Devops.cantaloupe/tasks/os-vars.yml

@@ -0,0 +1,22 @@
+---
+
+# Include variables and define needed variables.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define cantaloupe_log_path
+  set_fact:
+    cantaloupe_log_path: "{{ __cantaloupe_log_path }}"
+  when: cantaloupe_log_path is not defined
+
+- name: Define cantaloupe_log_error_FileAppender_pathname
+  set_fact:
+    cantaloupe_log_error_FileAppender_pathname: "{{ __cantaloupe_log_error_FileAppender_pathname }}"
+  when: cantaloupe_log_error_FileAppender_pathname is not defined
+
+- name: Define cantaloupe_log_access_FileAppender_pathname
+  set_fact:
+    cantaloupe_log_access_FileAppender_pathname: "{{ __cantaloupe_log_access_FileAppender_pathname }}"
+  when: cantaloupe_log_access_FileAppender_pathname is not defined
+
+