From c52bf08ca13ec17f6b90acdeed5f01b97a0e3f86 Mon Sep 17 00:00:00 2001
From: Francis Kayiwa <kayiwa@users.noreply.github.com>
Date: Thu, 23 May 2024 05:30:36 -0500
Subject: [PATCH] [cdh] derridas-margins (#4973)

* allow complete 301 to https

* add derrida nfs mount
---
 group_vars/nfsserver/production.yml           | 32 +++++++++++++++++++
 .../files/conf/http/cdh_prod_derrida.conf     |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/group_vars/nfsserver/production.yml b/group_vars/nfsserver/production.yml
index b190f960ea..227002c56a 100644
--- a/group_vars/nfsserver/production.yml
+++ b/group_vars/nfsserver/production.yml
@@ -8,6 +8,10 @@ bibdata_prod1: "128.112.201.179"
 bibdata_prod2: "128.112.203.79"
 bibdata_worker_prod1: "128.112.203.105"
 bibdata_worker_prod2: "128.112.203.109"
+cdh_derrida1: "128.112.201.61"
+cdh_derrida2: "128.112.201.111"
+cdh_derrida_crawl1: "128.112.202.19"
+cdh_derrida_crawl2: "128.112.202.104"
 cdh_geniza1: "128.112.203.246"
 cdh_geniza2: "128.112.200.119"
 cdh_prosody1: "128.112.204.83"
@@ -86,6 +90,34 @@ nfsserver_exports:
           - no_wdelay
   - share: "{{ cdh_fileshare_mount }}"
     hosts:
+      - name: "{{ cdh_derrida1 }}"
+        options:
+          - rw
+          - sync
+          - no_subtree_check
+          - no_root_squash
+          - no_wdelay
+      - name: "{{ cdh_derrida2 }}"
+        options:
+          - rw
+          - sync
+          - no_subtree_check
+          - no_root_squash
+          - no_wdelay
+      - name: "{{ cdh_derrida_crawl1 }}"
+        options:
+          - rw
+          - sync
+          - no_subtree_check
+          - no_root_squash
+          - no_wdelay
+      - name: "{{ cdh_derrida_crawl2 }}"
+        options:
+          - rw
+          - sync
+          - no_subtree_check
+          - no_root_squash
+          - no_wdelay
       - name: "{{ cdh_geniza1 }}"
         options:
           - rw
diff --git a/roles/nginxplus/files/conf/http/cdh_prod_derrida.conf b/roles/nginxplus/files/conf/http/cdh_prod_derrida.conf
index 971d67781e..71faaa8559 100644
--- a/roles/nginxplus/files/conf/http/cdh_prod_derrida.conf
+++ b/roles/nginxplus/files/conf/http/cdh_prod_derrida.conf
@@ -16,7 +16,7 @@ server {
     server_name derridas-margins-beta.princeton.edu;
 
     location / {
-        return 301 https://derrida-margins-beta.princeton.edu$request_uri;
+        return 301 https://derridas-margins-beta.princeton.edu$request_uri;
     }
 }