Changeset 38556

Timestamp:

2024-01-16T16:12:08+13:00 (5 months ago)

Author:

davidb

Message:

Restructuring of cofig vars

Location:

main/trunk/greenstone3/src/ansible-playbooks

Files:

• files/gs3-apache.conf.j2 (modified) (2 diffs)
• filter_plugins (added)
• filter_plugins/gsdl3_filters.py (added)
• reverse-proxy-playbook.yml (modified) (1 diff)
• vars/default-core.yml (modified) (1 diff)

main/trunk/greenstone3/src/ansible-playbooks/files/gs3-apache.conf.j2

@@ -1 @@
-<VirtualHost *:{{ apache2_http_port }}>
+<VirtualHost *:{{ apache2_revproxy_config.http_port }}>
 
-        ServerName {{ apache2_servername_fqdn }}
-
-    ServerAdmin {{ apache2_serveradmin_email }}
+        ServerName   {{ apache2_revproxy_config.webserver_name }}
+    ServerAdmin  {{ apache2_revproxy_config.serveradmin_email }}
         
-    DocumentRoot {{ gsdl3srchome}}/web
+    DocumentRoot {{ gsdl3srchome }}/web
 
         <Directory {{ gsdl3srchome }}/web>
@@ -23 +22 @@
         #LogLevel info ssl:warn
 
-        ErrorLog ${APACHE_LOG_DIR}/{{ apache2_servername }}-error.log
-        CustomLog ${APACHE_LOG_DIR}/{{ apache2_servername }}-access.log combined
+        ErrorLog  ${APACHE_LOG_DIR}/{{ apache2_revproxy_config.config_root_name }}-error.log
+        CustomLog ${APACHE_LOG_DIR}/{{ apache2_revproxy_config.config_root_name }}-access.log combined
 
-        # ProxyPass /greenstone3-xxxx http://localhost:{{ gsdl3ports["localhost.port.http"] }}/greenstone3
-        # ProxyPassReverse /greenstone3-xxxx http://localhost:{{ gsdl3ports["localhost.port.http"] }}/greenstone3
+        # ProxyPass        /{{gsdl3servlet_external.context}} {{gsdl3servlet_internal.protocol}}://{{gsdl3servlet_internal.domain}}:{{gsdl3servlet_internal.port}}/{{gsdl3servlet_internal.context}}
+        # ProxyPassReverse /{{gsdl3servlet_external.context}} {{gsdl3servlet_internal.protocol}}://{{gsdl3servlet_internal.domain}}:{{gsdl3servlet_internal.port}}/{{gsdl3servlet_internal.context}}
 
-        # #<Location /greenstone3-xxxx>
-        # #    ProxyPassReverseCookiePath /greenstone3 /greenstone3-xxxx
-        # #</Location>
+        # <Location /{{ gsdl3servlet_external.context }}>
+        #     ProxyPassReverseCookiePath /{{gsdl3servlet_internal.context}} /{{ gsdl3servlet_external.context }}
+        # </Location>
 
-RewriteEngine on
-    RewriteCond %{SERVER_NAME} ={{apache2_servername_fqdn }}
-    RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
+#RewriteEngine on
+#   RewriteCond %{SERVER_NAME} ={{ apache2_revproxy_config.webserver_name }}
+#   RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
 
 </VirtualHost>

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

@@ -20 +20 @@
       shell: /usr/sbin/a2enmod rewrite headers proxy proxy_http proxy_wstunnel 
 
-    - name: Set up Apache virtualhost
+    - name: Set up Apache2 virtualhost
       template:
         src: "files/gs3-apache.conf.j2"
-        dest: "/etc/apache2/sites-available/{{ apache2_http_conf }}"
+        dest: "/etc/apache2/sites-available/{{ apache2_revproxy_config.config_root_name }}.conf"
+
+    - 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: Enable new site
-      shell: /usr/sbin/a2ensite {{ apache2_http_conf }}
+      shell: /usr/sbin/a2ensite {{ apache2_revproxy_config.config_root_name }}.conf
       notify: Reload Apache
 
-#    - name: "UFW - Allow HTTP on port {{ apache2_http_port }}"
+#    - name: "UFW - Allow HTTP on port {{ gsdl3servlet_external.port | default('80',true) }}"
 #      ufw:
 #        rule: allow
-#        port: "{{ apache2_http_port }}"
+#        port: "{{ gsdl3servlet_external.port | default('80',true) }}"
 #        proto: tcp
 

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

@@ -4 +4 @@
 gsdl3srchome: /mnt/intermuse/greenstone3-ansible-svn
 
-# # gsdl3port:     5353
+digital_librarian_info: {
+  fullname: "Sam Someone",
+  email:    "[email protected]"
+}
 
-gsdl3ports:    { "localhost.port.http":  6363,
-             "tomcat.shutdown.port": 6305,
-         "tomcat.ajp.port":      6309,
-         "derby.server.port":    6327,
-         "tomcat.port.https":    6443 }
+# To allow tech-support to be someone different ...
+tech_support_info: {
+  fullname: "Terry Tother",
+  email:     "[email protected]"
+}
 
-#apache2_serveradmin_email: "[email protected]"
-#apache2_servername:        "mygreenstone-dl"
-#apache2_servername_fqdn:   "{{ apache2_servername }}.mydomain.org"
+gsdl3servlet_internal: {
+  protocol:      "http",
+  domain:        "localhost",
 
-apache2_serveradmin_email: "[email protected]"
-apache2_servername:        "ansible-test"
-apache2_servername_fqdn:   "{{ apache2_servername }}.sowemustthink.space"
+  # For testing purposes, work with a '63' range
+  #port:  "8383",
+  port: "6363",
+  
+  context:  "greenstone3",
+  servlet:  "library"
+}
 
-apache2_http_port: "80"
-apache2_http_conf: "{{ apache2_servername }}.conf"
+
+gsdl3_buildproperties_ports: {
+  "localhost.port.http":  "{{ gsdl3servlet_internal.explicit_port }}",
+
+  #"tomcat.shutdown.port": 8305,
+  #"tomcat.ajp.port":      8309,
+  #"derby.server.port":    8327,
+  #"tomcat.port.https":    8443
+  
+  # For testing purposes, work with a '63' range and 64 for https
+  "tomcat.shutdown.port": 6305,
+  "tomcat.ajp.port":      6309,
+  "derby.server.port":    6327,
+  "tomcat.port.https":    6443
+}
+
+gsdl3servlet_external: {
+  protocol: "http",
+  #protocol: "https",
+  #domain:   "<mygreenstone-dl>.<mydomain.org>",
+  domain:   "ansible-test.sowemustthink.space",
+  #port:     "80",  # only need to set this if using 'http'  and *not* using '80'
+  #port:     "443", # only need to set this if using 'https' and *not* using '443'
+  context:  "greenstone3",
+  servlet:  "library"
+}
+
+# Using Apache2 as a reverse-proxy server?
+apache2_as_revproxy: true
+
+apache2_revproxy_config: {
+  #
+  # The following is typically kept the same as the subdomain part of gsdl3servlet_external.domain
+  # This is done automatically in the following line using default()
+  #
+  # If you want to set this to a different value, then edit '' to include the desired value
+  #
+  config_root_name: "{{ '' | default(gsdl3servlet_external['domain'].split('.') | first(),true) }}",
+
+  serveradmin_email: "{{ tech_support_info.email }}",
+  webserver_name:    "{{ gsdl3servlet_external.domain }}",
+  http_port:         "80",
+  https_port:        "443"
+}
+
+#----
+
+gsdl3_buildproperties_revproxy: {
+  "revproxy.protocol": "{{ gsdl3servlet_external.protocol }}",
+  "revproxy.domain":   "{{ gsdl3servlet_external.domain }}",
+  "revproxy.opt_port": "{{ gsdl3servlet_external.port }}",
+  "revproxy.context":  "{{ gsdl3servlet_external.context }}"
+}
+
+
+#apache2_serveradmin_email: tech_support_info.email
+#apache2_webserver_name:    gsdl3servlet_external.domain
+#
+##apache2_servername:        "mygreenstone-dl"
+##apache2_servername_fqdn:   "{{ apache2_servername }}.mydomain.org"
+#
+#apache2_serveradmin_email: "[email protected]"
+#apache2_servername:        "ansible-test"
+#apache2_servername_fqdn:   "{{ apache2_servername }}.sowemustthink.space"
+
+#apache2_http_port: "80"
+#apache2_http_conf: "{{ apache2_servername }}.conf"
+
+