Changeset 38573 for main

Timestamp:

2024-01-19T13:51:25+13:00 (5 months ago)

Author:

davidb

Message:

Copy tidy up, removing commented out blocks

Location:

main/trunk/greenstone3/src/ansible-playbooks

Files:

• greenstone3-svn-base-playbook.yml (modified) (7 diffs)
• reverse-proxy-https-tasks.yml (modified) (1 diff)
• reverse-proxy-playbook.yml (modified) (2 diffs)

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

@@ -8 +8 @@
 # Greenstone installation is to occur (i.e., localhost)
 
-# To run this playbook to svn checkout Greenstone3 and compile it up:
+# To directly run this playbook to svn checkout Greenstone3 and compile it up:
 #
 #     ansible-playbook -l localhost -u $USER ./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 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) }}"
@@ -116 +108 @@
     register:   env_file_result
 
-#  - name: Source Greenstone3's SETUP.bash  using newer ./SETUP-ENV.sh (Ultimately new appoach not needed)
-#    ansible.builtin.command: ./SETUP-ENV.sh
-#    args:
-#      chdir:      "{{ gsdl3srchome }}"      
-#    register:   env_file_result
-
-#  - name: Deprecated 'source' Greenstone3's SETUP.bash (command)
-#    ansible.builtin.command:
-#      # executable: /bin/bash
-#      chdir:      "{{ gsdl3srchome }}"      
-#      cmd:        ./SETUP-ENV.sh
-#    register:   env_file_result
-
-
-#    #- debug: var=env_file_result.stdout_lines
+  #- debug: var=env_file_result.stdout_lines
 
   - name: Parse Greenstone3 environment variables
@@ -136 +114 @@
       env_vars: "{{ ('{' + env_file_result.stdout_lines | map('regex_replace', '([^=]*)=(.*)', '\"\\1\": \"\\2\"') | join(',') + '}') | from_json }}"
 
-#  - name: Display environment variables
-#    command: env
-#    environment: "{{ env_vars }}"
-
-   #- debug: var=env_vars
-
+  #- debug: var=env_vars
 
   - name: Generate build.properties for Greenstone3
@@ -149 +122 @@
     environment: "{{ env_vars }}"
 
-#  - name: Deprecated Setting localhost.port.http in build.properties (only changes 1 value)
-#    ansible.builtin.lineinfile:
-#      path: "{{ gsdl3srchome }}/build.properties"
-#      regexp: '^localhost.port.http='
-#      line: localhost.port.http={{ gsdl3_buildproperties_port }}
-
   - name: Setting ports in build.properties
     ansible.builtin.lineinfile:
       path:   "{{ gsdl3srchome }}/build.properties"
       regexp: '^{{ item }}='
-      #line:   "{{ item }}={{ hostvars['localhost']['gsdl3_buildproperties_ports'][item] }}"
       line:   "{{ item }}={{ gsdl3_buildproperties_ports[item] }}"      
     with_items:
@@ -176 +142 @@
     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, and even more complicated, requiring 'expect' to be installed)
-#    ansible.builtin.shell: |
-#      cd {{ gsdl3srchome }}
-#      . ./SETUP.bash
-#      spawn ant prepare
-#      expect "[input]      (y, n):"
-#      send "y\n"
-#
-#      exit 0
-#    args:
-#      executable: /usr/bin/expect
-
-
   - name: Compile and Install Greenstone3 (command)
     ansible.builtin.command:
@@ -204 +148 @@
     environment: "{{ env_vars }}"
 
-#  - name: Compile and Install Greenstone3 (shell)
-#    ansible.builtin.shell:
-#      chdir: "{{ gsdl3srchome }}"
-#      cmd:   . ./SETUP.bash && ant install
-    

main/trunk/greenstone3/src/ansible-playbooks/reverse-proxy-https-tasks.yml

@@ -26 +26 @@
 
 
-  #- name: Adjusting Greenstone3 installations index.html to work in Apache2 DocumentRoot
-  #  ansible.builtin.replace:
-  #    path:   "{{ gsdl3srchome }}/web/index.html"
-  #    regexp:  'href="(?!http://|/)'
-  #    replace: 'href="/{{ gsdl3servlet_external.context }}/'
-
-
 #    - name: "UFW - Allow HTTPS on port {{ gsdl3servlet_external.port | default('443',true) }}"
 #      ufw:

main/trunk/greenstone3/src/ansible-playbooks/reverse-proxy-playbook.yml

@@ -38 +38 @@
         gsdl3servlet_external: "{{ gsdl3servlet_external | combine ({'domain_url': gsdl3servlet_external_domain_url}) }}"
 
-    # Apache2
+    #
+    # Apache2 http setup
+    #
     - include_tasks: reverse-proxy-http-tasks.yml
 
@@ -76 +78 @@
       when: apache2_as_revproxy != true
 
-
+    #
+    # Apache2 https setup
+    #
     - include_tasks: reverse-proxy-https-tasks.yml
       when: apache2_revproxy_config.https_port is defined