Changeset 38570 for main

Timestamp:

2024-01-19T11:30:46+13:00 (4 months ago)

Author:

davidb

Message:

Changes after a fresh round of testing. Some work also done on looking to make the playbook work as a different user (e.g. 'greenstone') to the one the user is logged in as (e.g. 'ubuntu'), but beginning to look like this idea doesn't really work out when running playbook as localhost connection

Location:

main/trunk/greenstone3/src/ansible-playbooks

Files:

• _local_config.bash (modified) (2 diffs)
• greenstone3-svn-base-playbook.yml (modified) (5 diffs)
• vars/default-core.yml (modified) (3 diffs)

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

@@ -1 @@
-if [ $# != 1 ] ; then
+
+if [ $# -gt 1 ] || [ "x$1" == "x-help" ] || [ "x$1" == "x--help" ] ; then
     echo "" >&2
     echo "Usage: $0 localhost-username" >&2
@@ -9 +10 @@
 fi
 
-localhost_username=$1
+localhost_username=${1:-greenstone}
+
+echo ""
+echo "####"
+echo "# Away to run the playbook with {{ remote_user }}:"
+echo "#    $localhost_username"
+##echo "# Setting the username to install Greenstone3 as to:"
+##echo "#    $localhost_username"
+echo "####"
+echo ""
+
+if [ ! -d "/home/$localhost_username" ] ; then
+    
+    echo "! Warning: Failed to detect /home/$localhost_username as a home directory" >&2
+    echo "! " >&2
+    echo "! Note: You can control the username used by providing it as a command-line argument" >&2
+    echo "!   when the ansible playbook is run." >&2
+    echo "! " >&2
+    echo "! Or alternatively: consider using 'sudo adduser' (or similar) to create an account" >&2
+    echo "!   for the missing user" >&2
+    echo "" >&2
+fi
+
+echo ""
+echo "Continuing in 5 seconds ..."
+echo "[press <enter> to proceed immediately, or 'q' to quit]"
+read -t 5  continue_answer
+
+if [ $? == 0 ] ; then
+    # keyboard input given
+    
+    if [ "x$continue_answer" == "xq" ] ; then
+    exit 1
+    fi
+fi
+
+
+
+

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

@@ -31 +31 @@
     - debug: msg="gsdl3srchome = {{ hostvars['localhost']['gsdl3srchome'] }}"
     
-    - name: Setting gsdl3port
-      set_fact: gsdl3port="{{ gsdl3port }}"
-    - debug: msg="gsdl3port = {{ hostvars['localhost']['gsdl3port'] }}"
-
-    - name: Setting gsdl3ports
-      set_fact: gsdl3ports="{{ gsdl3ports }}"
-    - debug: msg="gsdl3ports = {{ hostvars['localhost']['gsdl3ports'] }}"
+#    - name: Setting gsdl3port
+#      set_fact: gsdl3port="{{ gsdl3port }}"
+#    - debug: msg="gsdl3port = {{ hostvars['localhost']['gsdl3port'] }}"
+
+#    - name: Setting gsdl3_buildproperties_ports
+#      set_fact: gsdl3_buildproperties_ports="{{ gsdl3_buildproperties_ports }}"
+#    - debug: msg="gsdl3_buildproperties_ports = {{ hostvars['localhost']['gsdl3_buildproperties_ports'] }}"
+
+    - name: Setting Greenstone3 username
+      set_fact: gsdl3_user="{{ ansible_user | default(ansible_env.USER,true) | default('greenstone',true) }}"
+    - debug: msg="gsdl3_user = {{ hostvars['localhost']['gsdl3_user'] }}"
 
 
@@ -58 +62 @@
 
         # As well as using 'unzip', the greenstone3 compile sequence currently uses
-    # 'zip' in a handful of places, such as:
-    #     <gsdl3srchome>/gli/makejar.sh
+        # 'zip' in a handful of places, such as:
+        #     <gsdl3srchome>/gli/makejar.sh
         'zip', 'unzip',
 
@@ -76 +80 @@
   hosts:      localhost
   connection: local
+  become_user: "{{ gsdl3_user }}"
   vars_files:
     - vars/default-core.yml
     
   tasks:
+  - debug: msg="gsdl3_user = {{ gsdl3_user }}, USER={{ ansible_env.USER }}"
   - name: Subversion checkout of Greenstone3
     ansible.builtin.subversion:
@@ -147 +153 @@
 #      path: "{{ gsdl3srchome }}/build.properties"
 #      regexp: '^localhost.port.http='
-#      line: localhost.port.http={{ gsdl3port }}
+#      line: localhost.port.http={{ gsdl3_buildproperties_port }}
 
   - name: Setting ports in build.properties
@@ -153 +159 @@
       path:   "{{ gsdl3srchome }}/build.properties"
       regexp: '^{{ item }}='
-      line:   "{{ item }}={{ hostvars['localhost']['gsdl3ports'][item] }}"
+      #line:   "{{ item }}={{ hostvars['localhost']['gsdl3_buildproperties_ports'][item] }}"
+      line:   "{{ item }}={{ gsdl3_buildproperties_ports[item] }}"      
     with_items:
       - "localhost.port.http"

main/trunk/greenstone3/src/ansible-playbooks/vars/default-core.yml

@@ -2 +2 @@
 # gsdl3srchome: /home/{{ ansible_user }}/greenstone3-svn
 # gsdl3srchome: /mnt/<mydisk>/greenstone3-svn
-gsdl3srchome: /mnt/intermuse/greenstone3-ansible-svn
+#gsdl3srchome: /mnt/intermuse/greenstone3-ansible-svn
+gsdl3srchome: /mnt/intermuse/greenstone3-ansible3-svn
 
 digital_librarian_info: {
@@ -29 +30 @@
 
 gsdl3_buildproperties_ports: {
-  "localhost.port.http":  "{{ gsdl3servlet_internal.explicit_port }}",
+  "localhost.port.http":  "{{ gsdl3servlet_internal.port }}",
 
   #"tomcat.shutdown.port": 8305,
@@ -61 +62 @@
 }
 
+####
 # Using Apache2 as a reverse-proxy server?
+####
 apache2_as_revproxy: true