Fix.

pulibrary · Mar 7, 2025 · a71ef7c · a71ef7c
1 parent 7f6bf0d
commit a71ef7c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/nomad/traefik-wall/deploy/sites/pulfalight-production.yml b/nomad/traefik-wall/deploy/sites/pulfalight-production.yml
@@ -23,4 +23,4 @@ http:
     findingaids-qa:
       loadBalancer:
         servers:
-          - url: http://pulfalight-qa1.princeton.edu:80
+          - url: http://pulfalight-qa-web1.princeton.edu:80
diff --git a/roles/nginxplus/files/conf/http/pulfalight-prod.conf b/roles/nginxplus/files/conf/http/pulfalight-prod.conf
@@ -5,10 +5,10 @@ upstream pulfalight-prod {
     least_time last_byte inflight;
     zone pulfalight-prod 64k;
     # lowchallenge challenges after 20 requests from xx.xx.<>.<>.<>
-    server service.consul service=lowchallenge.traefik-wall-staging resolve max_fails=0;
+    server service.consul service=lowchallenge.traefik-wall-production resolve max_fails=0;
     # highchallenge challenges everyone. Comment above and uncomment
     # this when you're being swarmed by bots.
-    # server service.consul service=highchallenge.traefik-wall-staging resolve max_fails=0;
+    # server service.consul service=highchallenge.traefik-wall-production resolve max_fails=0;
     # If Traefik crashes, fall down to the box directly.
     server pulfalight-jammy-prod1.princeton.edu resolve max_fails=0 backup;
     server pulfalight-jammy-prod2.princeton.edu resolve max_fails=3 backup;

diff --git a/roles/nginxplus/files/conf/http/pulfalight-qa.conf b/roles/nginxplus/files/conf/http/pulfalight-qa.conf
@@ -4,10 +4,10 @@ proxy_cache_path /var/cache/nginx/pulfalight-qa/ keys_zone=pulfalight-qacache:10
 upstream pulfalight-qa {
     zone pulfalight-qa 64k;
     # lowchallenge challenges after 20 requests from xx.xx.<>.<>.<>
-    server service.consul service=lowchallenge.traefik-wall-staging resolve max_fails=0;
+    server service.consul service=lowchallenge.traefik-wall-production resolve max_fails=0;
     # highchallenge challenges everyone. Comment above and uncomment
     # this when you're being swarmed by bots.
-    # server service.consul service=highchallenge.traefik-wall-staging resolve max_fails=0;
+    # server service.consul service=highchallenge.traefik-wall-production resolve max_fails=0;
     # If Traefik crashes, fall down to the box directly.
     server pulfalight-qa-web1.princeton.edu resolve backup;
     sticky learn
@@ -42,6 +42,8 @@ server {
        proxy_pass http://pulfalight-qa;
        proxy_set_header X-Forwarded-Host $host;
        proxy_set_header X-Forwarded-Proto https;
+       proxy_set_header X-Forwarded-For $remote_addr;
+       proxy_set_header X-Real-IP $remote_addr;
        proxy_cache pulfalight-qacache;
        proxy_connect_timeout      2h;
        proxy_send_timeout         2h;