routes for jchemws and ctsws

quanted · Sep 25, 2023 · 774ba55 · 774ba55
1 parent 2a1c758
commit 774ba55
Showing 1 changed file with 26 additions and 19 deletions.
diff --git a/nginx_ceamdev.conf b/nginx_ceamdev.conf
@@ -88,15 +88,14 @@ server {
     location @uwsgi_django {
         include uwsgi_params;
         uwsgi_pass uwsgi_django:8080;  # 'uwsgi_django' is the hostname given in Docker-Compose YAML 'links' section
-    uwsgi_connect_timeout 180;
+        uwsgi_connect_timeout 180;
         proxy_read_timeout 600;
         proxy_send_timeout 600;
         uwsgi_read_timeout 600s; 
         uwsgi_send_timeout 600s;
-    proxy_set_header Host $host;
+        proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
         # HSTS Policy (max-age=60 == 1 min), 31536000 = 1 year Unknown if proxy_set_header disables inheritance like add_header
         add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
     }
@@ -110,21 +109,11 @@ server {
         proxy_set_header    Host $host;
     }
 
-    # Proxy for marvinsketch iframe webservice requests:
-    # location /webservices/rest-v0/util {
-    #     proxy_pass  http://jchemws:8080/webservices/rest-v0/util;
-    # }
-
-    # Proxy for jchem apidocs:
-    # location /webservices {
-    #     proxy_pass http://jchemws:8080/webservices;
+    # # Proxy for ctsws endpoint:
+    # location /ctsws/rest/isvalidchemical {
+    #     proxy_pass http://ctsws:8080/ctsws/rest/isvalidchemical;
     # }
 
-    # Proxy for ctsws endpoint:
-    location /ctsws/rest/isvalidchemical {
-        proxy_pass http://ctsws:8080/ctsws/rest/isvalidchemical;
-    }
-
     # Cyanweb prevents env.json caching:
     location /cyanweb/assets/env.json {
         expires -1;
@@ -197,19 +186,37 @@ server {
         proxy_pass https://qedlinuxapi.epa.gov/waterbody;
     }
 
+    # # Proxy for marvinsketch iframe webservice requests:
+    # location /webservices/rest-v0/util {
+    #     proxy_pass  http://qed-tomcat:8080/webservices/rest-v0/util;
+    # }
+
+    # Proxy for jchemws endpoints:
+    location /jchemws {
+        proxy_pass http://jchemws:8080/webservices/rest-v0/util;
+    }
+
+    # Proxy for ctsws endpoints:
+    location /ctsws/rest {
+        proxy_pass http://ctsws:8080/ctsws/rest;
+    }
+
+    # # Proxy for ctsws endpoint:
+    # location /ctsws/rest/isvalidchemical {
+    #     proxy_pass http://ctsws:8080/ctsws/rest/isvalidchemical;
+    # }
+
     # EPI Suite Proxy to GDIT Windows Dev box
     location /epi {
-        #proxy_pass http://10.0.8.40/episuite/rest/episuite;  # /estimated and /measured
         proxy_pass http://172.31.29.163/episuite/rest/episuite;  # /estimated and /measured
     }
 
     location /biotransformer {
         proxy_pass http://172.17.0.1:5002/bt/rest/run;
     }
 
+    # OPEARWS on GDIT Windows Dev box
     location /operaws/opera/rest/run {
-        # proxy_pass http://172.17.0.1:3344/opera/rest/run;
-        # proxy_pass http://10.0.8.40:8080/opera/rest/run;
         proxy_pass http://172.31.29.163:8080/opera/rest/run;
     }