Changeset 38535 for main/trunk/greenstone3/src

Timestamp:

2024-01-12T16:39:26+13:00 (5 months ago)

Author:

davidb

Message:

Adding in shared variables to ansible playbook

Location:

main/trunk/greenstone3/src/ansible-playbooks

Files:

• 01-RUN-ANSIBLE-BASE-INSTALL.sh (modified) (1 diff)
• greenstone3-svn-playbook.yml (modified) (5 diffs)

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

@@ -1 +1 @@
 #!/bin/bash
 
-ansible-playbook -l localhost -u $USER greenstone3-svn-playbook.yml
+. ./_local_config.bash
+
+ansible-playbook -l localhost -u $localhost_username greenstone3-svn-playbook.yml

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

@@ -1 +1 @@
 # Self-contained Ansible playbook to install required Unix
 # command-line packages, and then configure, compile and install
-# Greenstone3
+# a basic Greenstone3, running tomcat over http, and accessed
+# directly, e.g. http://localhost:8383/greenstone3/library
+
 
 # Playbook currently designed to be run on computer where the
@@ -23 +25 @@
 
   ####
-  # Edit variable values below as needed
+  # Review and edit as needed the variables in the following file
   ####
-  vars:
-    gsdl3srchome: /home/{{ ansible_user }}/greenstone3-svn
-    # gsdl3srchome: /mnt/<mydisk>/greenstone3-svn
-    # gsdl3srchome: /mnt/intermuse/greenstone3-ansible-svn
-    gsdl3port:     8383
+  vars_files:
+    - vars/default-core.yml
+    
+#  ####
+#  # Edit variable values below as needed
+#  ####
+#  vars:
+#    gsdl3srchome: /home/{{ ansible_user }}/greenstone3-svn
+#    # gsdl3srchome: /mnt/<mydisk>/greenstone3-svn
+#    # gsdl3srchome: /mnt/intermuse/greenstone3-ansible-svn
+#    gsdl3port:     8383
 
   tasks:
@@ -39 +47 @@
       set_fact: gsdl3port="{{ gsdl3port }}"
     - debug: msg="gsdl3port = {{ hostvars['localhost']['gsdl3port'] }}"
-    
+
+    - name: Setting gsdl3ports
+      set_fact: gsdl3ports="{{ gsdl3ports }}"
+    - debug: msg="gsdl3ports = {{ hostvars['localhost']['gsdl3ports'] }}"
 
 - name:       Installing required command-line tools
@@ -76 +87 @@
 - hosts:      localhost
   connection: local
-  vars:
-    # #gsdl3srchome: /home/{{ ansible_user }}/greenstone3-svn
-    # # # gsdl3srchome: /mnt/<mydisk>/greenstone3-svn    
-    # # gsdl3port:     8383
-    # gsdl3srchome: {{ hostvars['localhost']['gsdl3srchome'] }}
-    # gsdl3port:    {{ hostvars['localhost']['gsdl3port'] }}
+  vars_files:
+    - vars/default-core.yml
     
   tasks:
@@ -153 +160 @@
       line: localhost.port.http={{ gsdl3port }}
 
+  - name: Setting ports in build.properties
+    ansible.builtin.lineinfile:
+      path:   "{{ gsdl3srchome }}/build.properties"
+      regexp: '^{{ item }}='
+      line:   "{{ item }}={{ hostvars['localhost']['gsdl3ports'][item] }}"
+    with_items:
+      - "localhost.port.http"
+      - "tomcat.shutdown.port"
+      - "tomcat.ajp.port"
+      - "derby.server.port"
+      - "tomcat.port.https"
+
   - name: Prepare Greenstone3
     ansible.builtin.command: