Changeset 38563 for main

Timestamp:

2024-01-16T22:19:42+13:00 (5 months ago)

Author:

davidb

Message:

Additional lines of config needed

File:

• main/trunk/greenstone3/src/ansible-playbooks/files/gs3-apache.conf.j2 (modified) (2 diffs)

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

@@ -25 +25 @@
         CustomLog ${APACHE_LOG_DIR}/{{ apache2_revproxy_config.config_root_name }}-access.log combined
 
+
+    # To run as a Reverse Proxy, ProxyRequests needs to be off
+        # While this is the default for Apache2, let's be explicitly clear
+        ProxyRequests Off
+
+        # Needed so baseURL set correctly in LibraryMain.java
+        ProxyPreserveHost On
+
+        # Done to allow the proxied web server (localhost, Tomcat in our case)
+        # to have this header information passed on to it
+        # RequestHeader set X-Forwarded-Proto expr=%{REQUEST_SCHEME}
+        #HTTPS# RequestHeader set X-Forwarded-SSL expr=%{HTTPS}
+
+
         # 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}}
@@ -32 +46 @@
         # </Location>
 
-#RewriteEngine on
-#   RewriteCond %{SERVER_NAME} ={{ apache2_revproxy_config.webserver_name }}
-#   RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
+#HTTP-to-HTTPS# RewriteEngine on
+#HTTP-to-HTTPS# RewriteCond %{SERVER_NAME} ={{ apache2_revproxy_config.webserver_name }}
+#HTTP-to-HTTPS# RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
 
 </VirtualHost>