Changeset 38653 for main/trunk/greenstone3

Timestamp:

2024-01-31T17:20:23+13:00 (4 months ago)

Author:

davidb

Message:

Changes after testing on Redhat 8

Location:

main/trunk/greenstone3/src/ansible-playbooks

Files:

• 01-RUN-ANSIBLE-BASE-INSTALL.sh (modified) (1 diff)
• _local_config.bash (modified) (1 diff)
• greenstone3-svn-base-centos-task.yml (added)
• greenstone3-svn-base-debian-task.yml (added)
• greenstone3-svn-base-playbook.yml (modified) (3 diffs)

main/trunk/greenstone3/src/ansible-playbooks/01-RUN-ANSIBLE-BASE-INSTALL.sh

@@ -3 +3 @@
 . ./_local_config.bash
 
-ansible-playbook -l localhost -u $localhost_username greenstone3-svn-base-playbook.yml
+
+
+
+ansible-playbook -l localhost -u $localhost_username \
+    $ap_extra_args $@ \
+    greenstone3-svn-base-playbook.yml

main/trunk/greenstone3/src/ansible-playbooks/_local_config.bash

@@ -11 +11 @@
 
 localhost_username=${1:-greenstone}
+shift
+
+ap_extra_args=""
+echo ""
+echo "####"
+echo "# Checking to see if user can 'sudo' without password"
+
+if sudo -n true 2>/dev/null; then 
+    echo "#  => yes"
+else
+    echo "#  => no"
+    ap_extra_args="$ap_extra_args    --ask-become-pass"
+fi
+
+echo "####"
+echo ""
+
 
 echo ""

main/trunk/greenstone3/src/ansible-playbooks/greenstone3-svn-base-playbook.yml

@@ -36 +36 @@
 
 
-- name: Installing required command-line tools
+- name: Installing distribution specific required command-line tools
   hosts:      localhost
   connection: local
@@ -42 +42 @@
 
   tasks:
-    - name: Changing Ansible to use 'aptitude' as package installation manager
-      apt: name=aptitude update_cache=yes state=latest force_apt_get=yes
+  #- debug: msg="ansible_ditribution = {{ ansible_distribution }}"
+  #
+  - name: Debian/Ubuntu command-line tools
+    include_tasks: greenstone3-svn-base-debian-task.yml
+    when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
 
-    - name: Ensure that existing packages are up-to-date (within last 30 mins)
-      apt: update_cache=yes state=latest force_apt_get=yes cache_valid_time=1800
-
-    - name: Install prerequisites
-      apt: name={{ item }} update_cache=yes state=latest
-      loop: [
-        'subversion', 'build-essential', 'wget',
-
-        # As well as using 'unzip', the greenstone3 compile sequence currently uses
-        # 'zip' in a handful of places, such as:
-        #     <gsdl3srchome>/gli/makejar.sh
-        'zip', 'unzip',
-
-        # Choosing to install the latest, rather than work with the one included
-        # as an Greenstone3 extension, as that latter is getting a bit old
-        'imagemagick',
-        
-        # The following needed for WebSwing on a headless server
-        'libxrender1', 'libxtst6', 'libxi6', 'xvfb',
-
-        # The following are nice to have in general
-        'plocate', 'emacs-nox' 
-      ]
+  - name: CentOS/Red Hat command-line tools
+    include_tasks: greenstone3-svn-base-centos-task.yml
+    when: ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat'
 
 - name: Checking out Greenstone3 code from svn, configure and installing base system
@@ -104 +87 @@
     ansible.builtin.shell:
       executable: /bin/bash
-      chdir:      "{{ gsdl3srchome }}"      
-      cmd:        . ./SETUP.bash 1>/dev/null 2>&1 && env
+      chdir:      "{{ gsdl3srchome }}"
+      # RHEL8.5 introduces a weirdly environemnt variable BASH_FUNC_which%% set to a multi-line JSON value
+      # => use 'sed' to delete this form 'env' output
+      cmd:        . ./SETUP.bash 1>/dev/null 2>&1 && env | sed '/^BASH_FUNC_which%%=() {.*$/,/^}$/d'
     register:   env_file_result