Changeset 38526 for main/trunk/greenstone3/src

Timestamp:

2024-01-12T11:48:43+13:00 (5 months ago)

Author:

davidb

Message:

Further refinements

File:

• main/trunk/greenstone3/src/ansible-playbooks/greenstone3-svn-playbook.yml (modified) (5 diffs)

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

@@ -89 +89 @@
       checkout: yes
       update: no
-      dest: '{{ gsdl3srchome }}'
+      dest: "{{ gsdl3srchome }}"
 
-  - name: Downloading and unpacking self-contained command-line tools for Greenstone3 (JDK)
+  - name: Downloading and unpacking self-contained command-line tools for Greenstone3 (JDK, Apache Ant)
     ansible.builtin.shell:
-      # executable: /bin/bash
       chdir:     "{{ gsdl3srchome }}/ext-cli"
       cmd:       "./get-selfcontained-jdk.sh && ./get-selfcontained-ant.sh"
@@ -116 +115 @@
   - name: Source Greenstone3's SETUP.bash
     ansible.builtin.shell:
-      # executable: /bin/bash
+      executable: /bin/bash
       chdir:      "{{ gsdl3srchome }}"      
       cmd:        . ./SETUP.bash 1>/dev/null 2>&1 && env
@@ -137 +136 @@
     ansible.builtin.command:
       chdir: "{{ gsdl3srchome }}"
-      #cmd:   ". ./SETUP.bash && ant"
       cmd:   ant
     environment: "{{ env_vars }}"
-      
-#  - name: Prepare Greenstone3 (Compliated appoach using 'expect')
-#    ansible.builtin.expect:
-#      chdir:       "{{ gsdl3srchome }}"
-#      command:     ant prepare
-#      timeout:     null
-#      responses:
-#        "\\[input\\]\\s+\\(y, n\\)": "y"
-#    environment: "{{ env_vars }}"
 
+  - name: Setting localhost.port.http in build.properties
+    ansible.builtin.lineinfile:
+      path: {{ gsdl3srchome }}/build.properties
+      regexp: '^localhost.port.http='
+      line: localhost.port.http={{ gsdl3port }}
 
   - name: Prepare Greenstone3
@@ -159 +153 @@
     environment: "{{ env_vars }}"
 
+#  - name: Prepare Greenstone3 (A more complicated approach using 'expect')
+#    ansible.builtin.expect:
+#      chdir:       "{{ gsdl3srchome }}"
+#      command:     ant prepare
+#      timeout:     null
+#      responses:
+#        "\\[input\\]\\s+\\(y, n\\)": "y"
+#    environment: "{{ env_vars }}"
 
-
-#  - name: Prepare Greenstone3 II (untested)
+#  - name: Prepare Greenstone3 II (untested, and even more complicated, requiring 'expect' to be installed)
 #    ansible.builtin.shell: |
 #      cd {{ gsdl3srchome }}
@@ -174 +175 @@
 
 
+  - name: Compile and Install Greenstone3 (command)
+    ansible.builtin.command:
+      chdir: "{{ gsdl3srchome }}"
+      cmd:   ant install
+    environment: "{{ env_vars }}"
 
-  - name: Compile and Install Greenstone3
-    ansible.builtin.shell:
-      chdir: "{{ gsdl3srchome }}"
-      cmd:   . ./SETUP.bash && ant install
+#  - name: Compile and Install Greenstone3 (shell)
+#    ansible.builtin.shell:
+#      chdir: "{{ gsdl3srchome }}"
+#      cmd:   . ./SETUP.bash && ant install