Changeset 38565 for main

Timestamp:

2024-01-16T22:21:26+13:00 (4 months ago)

Author:

davidb

Message:

Additional tasks added to target commenting/uncomments revproxy lines in build.properties

Location:

main/trunk/greenstone3/src/ansible-playbooks

Files:

• reverse-proxy-playbook.yml (modified) (2 diffs)
• vars/default-core.yml (modified) (1 diff)

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

@@ -9 +9 @@
     - name: Upgrading Ansible to use 'aptitute' as package installation manager
       apt: name=aptitude update_cache=yes state=latest force_apt_get=yes
-
-    - name: Install prerequisites
-      apt: name={{ item }} update_cache=yes state=latest
-      loop: [ 'python3-certbot-apache' ]
 
     - name: Install Apache2
@@ -36 +32 @@
         gsdl3servlet_external: "{{ gsdl3servlet_external | combine ({'domain_url': gsdl3servlet_external_domain_url}) }}"
 
-    - name: Set up Apache2 virtualhost
-      template:
-        src: "files/gs3-apache.conf.j2"
-        dest: "/etc/apache2/sites-available/{{ apache2_revproxy_config.config_root_name }}.conf"
+    # Apache2
+    - include_tasks: reverse-proxy-http-tasks.yml
 
-    - name: Adjusting Greenstone3 installations index.html to work in Apache2 DocumentRoot
-      ansible.builtin.replace:
-        path:   "{{ gsdl3srchome }}/web/index.html"
-        #regexp: 'href="'
-        #line:   'href="{{ gsdl3servlet_external.context }}/'
-        #regexp:  'href="(?!http://|/{{gsdl3servlet_external.context}}/)'
-        regexp:  'href="(?!http://|/)'
-        replace: 'href="/{{ gsdl3servlet_external.context }}/'
-        ## dest: "/etc/apache2/sites-available/{{ apache2_revproxy_config.config_root_name }}.conf"
+    - name: Activating revproxy properties in build.properties
+      set_fact:
+        build_properties_revproxy:
+          - "revproxy.protocol"
+          - "revproxy.domain"
 
-    - name: Enable new site
-      shell: /usr/sbin/a2ensite {{ apache2_revproxy_config.config_root_name }}.conf
-      notify: Reload Apache
+    - name: Appending reproxy.opt_port
+      set_fact:
+        build_properties_revproxy: "{{ build_properties_revproxy + [ 'revproxy.opt_port' ] }}"
+      when: gsdl3servlet_external.port is defined
 
-#    - name: "UFW - Allow HTTP on port {{ gsdl3servlet_external.port | default('80',true) }}"
-#      ufw:
-#        rule: allow
-#        port: "{{ gsdl3servlet_external.port | default('80',true) }}"
-#        proto: tcp
+    - name: Appending reproxy.context
+      set_fact:
+        build_properties_revproxy: "{{ build_properties_revproxy + [ 'revproxy.context' ] }}"
+      when: gsdl3servlet_external.context is defined
+
+    - debug:
+        var: build_properties_revproxy
+
+    - name: Setting revproxy property values in build.properties if apache2_as_revproxy is True
+      ansible.builtin.lineinfile:
+        path:   "{{ gsdl3srchome }}/build.properties"
+        regexp: '^#*{{ item }}='
+        line:   "{{ item }}={{ gsdl3_buildproperties_revproxy[item] }}"
+      with_items: "{{ build_properties_revproxy }}"
+      when: apache2_as_revproxy == true
+
+    - name: Commenting out revproxy property values in build.properties if apache2_as_revproxy is False
+      ansible.builtin.lineinfile:
+        path:   "{{ gsdl3srchome }}/build.properties"
+        regexp: '^#*{{ item }}='
+        line:   "#{{ item }}={{ gsdl3_buildproperties_revproxy[item] }}"
+      with_items: "{{ gsdl3_buildproperties_revproxy.keys() | list }}"
+      when: apache2_as_revproxy != true
+
+
+    - include_tasks: reverse-proxy-https-tasks.yml
+      when: apache2_revproxy_config.https_port is defined
 
   handlers:

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

@@ -77 +77 @@
   "revproxy.protocol": "{{ gsdl3servlet_external.protocol }}",
   "revproxy.domain":   "{{ gsdl3servlet_external.domain }}",
-  "revproxy.opt_port": "{{ gsdl3servlet_external.port }}",
-  "revproxy.context":  "{{ gsdl3servlet_external.context }}"
+  "revproxy.opt_port": "{{ gsdl3servlet_external.port | default('') }}",
+  "revproxy.context":  "{{ '/'+gsdl3servlet_external.context | default('') }}"
 }